要求值比较支持中文的＞和＜+添加幅度和相位的电路报告+检验报告的判定依据

zss

2025-02-26 da699eeefe93f58c70a876fa76213b939fb362ac

 inspect-server/src/main/java/com/yuanchu/mom/utils/DianLuUtils.java

@@ -160,7 +160,7 @@
                InsProductResult2 insProductResult2 = new InsProductResult2();
                if (entry.getKey().contains("驻波")) {
                    if (products1.size() <= 0) {
                        throw new ErrorException("电压驻波比项目未找到");
                        continue;
                    }
                    insProductResult2.setInsProductId(products1.get(0).getId());//电压驻波比
                    insProductResult2.setFrequency(listEntry.getKey());//频段
@@ -173,9 +173,10 @@
                    String value = entry.getValue().stream().map(tianXianData1 -> "\"" + tianXianData1.getValue() + "\"").collect(Collectors.joining(","));
                    insProductResult2.setValue("[[" + value + "]]");//值
                    insProductResult2s.add(insProductResult2);
                } else if (entry.getKey().contains("同列隔离")) {
                }
                else if (entry.getKey().contains("同列隔离")) {
                    if (products6.size() <= 0) {
                        throw new ErrorException("隔离度项目未找到");
                        continue;
                    }
                    insProductResult2.setInsProductId(products6.get(0).getId());//同列隔离
                    insProductResult2.setFrequency(listEntry.getKey());//频段
@@ -188,9 +189,10 @@
                    String value = entry.getValue().stream().map(tianXianData1 -> "\"" + tianXianData1.getValue() + "\"").collect(Collectors.joining(","));
                    insProductResult2.setValue("[[" + value + "]]");//值
                    insProductResult2s.add(insProductResult2);
                } else if (entry.getKey().contains("端口间隔离")) {
                }
                else if (entry.getKey().contains("端口间隔离")) {
                    if (products7.size() <= 0) {
                        throw new ErrorException("端口间隔离项目未找到");
                       continue;
                    }
                    insProductResult2.setInsProductId(products7.get(0).getId());//端口间隔离
                    insProductResult2.setFrequency(listEntry.getKey());//频段
@@ -206,7 +208,7 @@
                }
                else if (entry.getKey().contains("同极化隔离")) {
                    if (products2.size() <= 0) {
                        throw new ErrorException("同极化隔离项目未找到");
                        continue;
                    }
                    insProductResult2.setInsProductId(products2.get(0).getId());//同极化隔离
                    insProductResult2.setFrequency(listEntry.getKey());//频段
@@ -219,9 +221,10 @@
                    String value = entry.getValue().stream().map(tianXianData1 -> "\"" + tianXianData1.getValue() + "\"").collect(Collectors.joining(","));
                    insProductResult2.setValue("[[" + value + "]]");//值
                    insProductResult2s.add(insProductResult2);
                } else if (entry.getKey().contains("异极化隔离")) {
                }
                else if (entry.getKey().contains("异极化隔离")) {
                    if (products3.size() <= 0) {
                        throw new ErrorException("异极化隔离项目未找到");
                       continue;
                    }
                    insProductResult2.setInsProductId(products3.get(0).getId());//异极化隔离
                    insProductResult2.setFrequency(listEntry.getKey());//频段
@@ -245,7 +248,7 @@
        for (Map.Entry<String, List<TianXianData>> entry : collect.entrySet()) {
            if (entry.getKey().contains("幅度")) {
                if (products4.size() <= 0) {
                    throw new ErrorException("幅度偏差项目未找到");
                    continue;
                }
                Map<String, List<TianXianData>> listHashMap = new HashMap<>();
                for (TianXianData xianData : entry.getValue()) {
@@ -281,9 +284,10 @@
                    insProductResult2.setValue("[[" + value + "]]");//值
                    insProductResult2s.add(insProductResult2);
                }
            } else if (entry.getKey().contains("相位")) {
            }
            else if (entry.getKey().contains("相位")) {
                if (products5.size() <= 0) {
                    throw new ErrorException("最大相位偏差项目未找到");
                    continue;
                }
                Map<String, List<TianXianData>> listHashMap = new HashMap<>();
                for (TianXianData xianData : entry.getValue()) {
@@ -382,7 +386,7 @@
                InsProductResult2 insProductResult2 = new InsProductResult2();
                if (entry.getKey().contains("驻波")) {
                    if (products1.size() <= 0) {
                        throw new ErrorException("电压驻波比项目未找到");
                        continue;
                    }
                    insProductResult2.setInsProductId(products1.get(0).getId());//电压驻波比
                    insProductResult2.setFrequency(listEntry.getKey());//频段
@@ -397,7 +401,7 @@
                }
                else if (entry.getKey().contains("隔离度")) {
                    if (products2.size() <= 0) {
                        throw new ErrorException("隔离度项目未找到");
                        continue;
                    }
                    insProductResult2.setInsProductId(products2.get(0).getId());//无源器件隔离度
                    insProductResult2.setFrequency(listEntry.getKey());//频段
@@ -412,7 +416,7 @@
                }
                else if (entry.getKey().contains("插入损耗")) {
                    if (products3.size() <= 0) {
                        throw new ErrorException("插入损耗项目未找到");
                        continue;
                    }
                    insProductResult2.setInsProductId(products3.get(0).getId());//插入损耗
                    insProductResult2.setFrequency(listEntry.getKey());//频段
@@ -427,7 +431,7 @@
                }
                else if (entry.getKey().contains("带内波动")) {
                    if (products4.size() <= 0) {
                        throw new ErrorException("带内波动项目未找到");
                       continue;
                    }
                    insProductResult2.setInsProductId(products4.get(0).getId());//带内波动
                    insProductResult2.setFrequency(listEntry.getKey());//频段
@@ -442,7 +446,7 @@
                }
                else if (entry.getKey().contains("带外抑制")) {
                    if (products5.size() <= 0) {
                        throw new ErrorException("带外抑制项目未找到");
                        continue;
                    }
                    insProductResult2.setInsProductId(products5.get(0).getId());//带外抑制
                    insProductResult2.setFrequency(listEntry.getKey());//频段
@@ -457,7 +461,7 @@
                }
                else if (entry.getKey().contains("耦合度")) {
                    if (products6.size() <= 0 || products7.size()<=0) {
                        throw new ErrorException("耦合度项目未找到");
                        continue;
                    }
                    /*最大耦合度*/
                    insProductResult2.setFrequency(listEntry.getKey());//频段