zss
2024-12-31 e22d3ca089ad03cc33a7b5f440a67415283f75d1
inspect-server/src/main/java/com/yuanchu/mom/utils/DianLuUtils.java
@@ -340,6 +340,7 @@
                result2.setValue("[[" + value + "]]");
                result2.setAngle("0°");
                result2.setOften(entry.getValue().stream().map(InsProductResult2::getOften).collect(Collectors.joining(",")));
                result2.setNum(orderStates.get(0).getNum());
                filteredList.add(result2);
            }
        }
@@ -385,7 +386,6 @@
                    }
                    insProductResult2.setInsProductId(products1.get(0).getId());//电压驻波比
                    insProductResult2.setFrequency(listEntry.getKey());//频段
                    insProductResult2.setAngle("0°");//角度
                    insProductResult2.setNum(orderStates.get(0).getNum());//次数
                    //获取端口
                    String port = entry.getValue().stream().map(TianXianData::getPort).collect(Collectors.joining(","));
@@ -401,7 +401,6 @@
                    }
                    insProductResult2.setInsProductId(products2.get(0).getId());//无源器件隔离度
                    insProductResult2.setFrequency(listEntry.getKey());//频段
                    insProductResult2.setAngle("0°");//角度
                    insProductResult2.setNum(orderStates.get(0).getNum());//次数
                    //获取端口
                    String port = entry.getValue().stream().map(TianXianData::getPort).collect(Collectors.joining(","));
@@ -417,7 +416,6 @@
                    }
                    insProductResult2.setInsProductId(products3.get(0).getId());//插入损耗
                    insProductResult2.setFrequency(listEntry.getKey());//频段
                    insProductResult2.setAngle("0°");//角度
                    insProductResult2.setNum(orderStates.get(0).getNum());//次数
                    //获取端口
                    String port = entry.getValue().stream().map(TianXianData::getPort).collect(Collectors.joining(","));
@@ -433,7 +431,6 @@
                    }
                    insProductResult2.setInsProductId(products4.get(0).getId());//带内波动
                    insProductResult2.setFrequency(listEntry.getKey());//频段
                    insProductResult2.setAngle("0°");//角度
                    insProductResult2.setNum(orderStates.get(0).getNum());//次数
                    //获取端口
                    String port = entry.getValue().stream().map(TianXianData::getPort).collect(Collectors.joining(","));
@@ -449,7 +446,6 @@
                    }
                    insProductResult2.setInsProductId(products5.get(0).getId());//带外抑制
                    insProductResult2.setFrequency(listEntry.getKey());//频段
                    insProductResult2.setAngle("0°");//角度
                    insProductResult2.setNum(orderStates.get(0).getNum());//次数
                    //获取端口
                    String port = entry.getValue().stream().map(TianXianData::getPort).collect(Collectors.joining(","));
@@ -463,14 +459,12 @@
                    if (products6.size() <= 0 || products7.size()<=0) {
                        throw new ErrorException("耦合度项目未找到");
                    }
                    /*最大耦合度*/
                    insProductResult2.setFrequency(listEntry.getKey());//频段
                    insProductResult2.setAngle("0°");//角度
                    insProductResult2.setNum(orderStates.get(0).getNum());//次数
                    //获取端口
                    String port = entry.getValue().stream().map(TianXianData::getPort).collect(Collectors.joining(","));
                    insProductResult2.setPort(port);//端口
                    /*最大耦合度*/
                    insProductResult2.setInsProductId(products6.get(0).getId());//最大耦合度
                    //获取检验值
                    String value = entry.getValue().stream().map(tianXianData1 -> {
@@ -480,13 +474,18 @@
                    insProductResult2.setValue("[[" + value + "]]");//值
                    insProductResult2s.add(insProductResult2);
                    /*最小耦合度*/
                    insProductResult2.setInsProductId(products7.get(0).getId());//最小耦合度
                    InsProductResult2 insProductResult22 = new InsProductResult2();
                    insProductResult22.setFrequency(listEntry.getKey());//频段
                    insProductResult22.setNum(orderStates.get(0).getNum());//次数
                    //获取端口
                    insProductResult22.setPort(port);//端口
                    insProductResult22.setInsProductId(products7.get(0).getId());//最小耦合度
                    String value1 = entry.getValue().stream().map(tianXianData1 -> {
                        String input = tianXianData1.getValue().replace("[", "").replace("]", "");
                        String[] parts = input.split("--");
                        return "\"" +parts[0] + "\"" ; }).collect(Collectors.joining(","));
                    insProductResult2.setValue("[[" + value1 + "]]");//值
                    insProductResult2s.add(insProductResult2);
                    insProductResult22.setValue("[[" + value1 + "]]");//值
                    insProductResult2s.add(insProductResult22);
                }
            }
        }
@@ -508,8 +507,8 @@
                    return insProductResult2.getValue().replace("[[", "").replace("]]", "");
                }).collect(Collectors.joining(","));
                result2.setValue("[[" + value + "]]");
                result2.setAngle("0°");
                result2.setOften(entry.getValue().stream().map(InsProductResult2::getOften).collect(Collectors.joining(",")));
                result2.setNum(orderStates.get(0).getNum());
                filteredList.add(result2);
            }
        }