通信LIMS后端
上一版本: 9b2837d4 | 补丁 | 提交 | 忽略空白
zss
2024-12-11 47b307f8eaaec7c9eb359416753d548b9b7c01a3 
电路报告优化
已修改1个文件
74 ■■■■■ 文件已修改
inspect-server/src/main/java/com/yuanchu/mom/utils/WordUtils.java 74 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史 
 inspect-server/src/main/java/com/yuanchu/mom/utils/WordUtils.java


@@ -117,7 +117,8 @@


        frequencys.forEach(s -> {


            int ports = 0;//端口数


            int angles = 0;//角度数


            for (InsProductResult2 insProductResult2 : insProductResult2s) {


            List<InsProductResult2> productResult2s = insProductResult2s.stream().filter(insProductResult2 -> insProductResult2.getFrequency().equals(s)).collect(Collectors.toList());


            for (InsProductResult2 insProductResult2 : productResult2s) {


                if (insProductMapper.selectById(insProductResult2.getInsProductId()).getInspectionItemSubclass().equals("电压驻波比") && insProductResult2.getPort().split(",").length > ports) {


                    ports = insProductResult2.getPort().split(",").length;


                }


@@ -126,7 +127,7 @@


                }


            }


            //频点数


            long often = insProductResult2s.stream().filter(insProductResult2 -> insProductResult2.getFrequency().equals(s))


            long often = productResult2s.stream().filter(insProductResult2 -> insProductResult2.getFrequency().equals(s))


                    .filter(insProductResult2 ->


                            insProductMapper.selectById(insProductResult2.getInsProductId()).getInspectionItemSubclass().equals("互调")


                    ).filter(insProductResult2 -> ObjectUtils.isNotEmpty(insProductResult2.getOften())).distinct().count();


@@ -153,7 +154,7 @@


                    aa += (angles + 1) * portRow;


                }


                if (inspectionItemSubclass.contains("同极化隔离度")) {


                    List<InsProductResult2> result2s = insProductResult2s.stream().filter(insProductResult2 ->


                    List<InsProductResult2> result2s = productResult2s.stream().filter(insProductResult2 ->


                            insProductMapper.selectById(insProductResult2.getInsProductId())


                                    .getInspectionItemSubclass().equals("同极化隔离度") && insProductResult2.getFrequency().equals(s)


                    ).collect(Collectors.toList());


@@ -161,7 +162,7 @@


                    aa += (angles + 1) * (length % (ports > 8 ? 4 : (ports + 1) / 2) == 0 ? length / (ports > 8 ? 4 : (ports + 1) / 2) : length / (ports > 8 ? 4 : (ports + 1) / 2) + 1);


                }


                if (inspectionItemSubclass.contains("异极化隔离度")) {


                    List<InsProductResult2> result2s = insProductResult2s.stream().filter(insProductResult2 ->


                    List<InsProductResult2> result2s = productResult2s.stream().filter(insProductResult2 ->


                            insProductMapper.selectById(insProductResult2.getInsProductId())


                                    .getInspectionItemSubclass().equals("异极化隔离度") && insProductResult2.getFrequency().equals(s)


                    ).collect(Collectors.toList());


@@ -178,7 +179,7 @@


                    aa += (angles + 1);


                }


                if (inspectionItemSubclass.contains("幅度偏差")) {


                    List<InsProductResult2> result2s = insProductResult2s.stream().filter(insProductResult2 ->


                    List<InsProductResult2> result2s = productResult2s.stream().filter(insProductResult2 ->


                            insProductMapper.selectById(insProductResult2.getInsProductId())


                                    .getInspectionItemSubclass().equals("幅度偏差")&& insProductResult2.getFrequency().equals(s)


                    ).collect(Collectors.toList());


@@ -186,7 +187,7 @@


                    aa += (angles + 1) * (length % 8 == 0 ? length / 8 : length / 8 + 1);


                }


                if (inspectionItemSubclass.contains("最大相位偏差")) {


                    List<InsProductResult2> result2s = insProductResult2s.stream().filter(insProductResult2 ->


                    List<InsProductResult2> result2s = productResult2s.stream().filter(insProductResult2 ->


                            insProductMapper.selectById(insProductResult2.getInsProductId())


                                    .getInspectionItemSubclass().equals("最大相位偏差")&& insProductResult2.getFrequency().equals(s)


                    ).collect(Collectors.toList());


@@ -245,7 +246,7 @@


                                    index.getAndIncrement();


                                }


                                List<InsProduct> products = insProducts.stream().filter(insProduct -> insProduct.getInspectionItemSubclass().equals("电压驻波比")).collect(Collectors.toList());


                                List<InsProductResult2> result2s = insProductResult2s.stream()


                                List<InsProductResult2> result2s = productResult2s.stream()


                                        .filter(insProductResult2 -> insProductResult2.getFrequency().equals(s) && insProductResult2.getInsProductId().equals(products.get(0).getId()))


                                        .collect(Collectors.toList());


                                //电压驻波比所在行


@@ -347,7 +348,7 @@


                                List<InsProduct> products = insProducts.stream()


                                        .filter(insProduct -> insProduct.getInspectionItemSubclass().equals("同极化隔离度"))


                                        .collect(Collectors.toList());


                                List<InsProductResult2> result2s = insProductResult2s.stream()


                                List<InsProductResult2> result2s = productResult2s.stream()


                                        .filter(insProductResult2 -> insProductResult2.getFrequency().equals(s) && insProductResult2.getInsProductId().equals(products.get(0).getId()))


                                        .collect(Collectors.toList());


                                //同极化隔离度所在行


@@ -439,7 +440,7 @@


                                List<InsProduct> products = insProducts.stream()


                                        .filter(insProduct -> insProduct.getInspectionItemSubclass().equals("异极化隔离度"))


                                        .collect(Collectors.toList());


                                List<InsProductResult2> result2s = insProductResult2s.stream()


                                List<InsProductResult2> result2s = productResult2s.stream()


                                        .filter(insProductResult2 -> insProductResult2.getFrequency().equals(s) && insProductResult2.getInsProductId().equals(products.get(0).getId()))


                                        .collect(Collectors.toList());


                                //异极化隔离度所在行


@@ -530,7 +531,7 @@


                                List<InsProduct> products = insProducts.stream()


                                        .filter(insProduct -> insProduct.getInspectionItemSubclass().equals("互调"))


                                        .collect(Collectors.toList());


                                List<InsProductResult2> result2s = insProductResult2s.stream()


                                List<InsProductResult2> result2s = productResult2s.stream()


                                        .filter(insProductResult2 -> insProductResult2.getFrequency().equals(s) && insProductResult2.getInsProductId().equals(products.get(0).getId()))


                                        .collect(Collectors.toList());


                                //互调所在行


@@ -623,7 +624,7 @@


                                    index.getAndIncrement();


                                }


                                List<InsProduct> products = insProducts.stream().filter(insProduct -> insProduct.getInspectionItemSubclass().equals("电压驻波比")).collect(Collectors.toList());


                                List<InsProductResult2> result2s = insProductResult2s.stream()


                                List<InsProductResult2> result2s = productResult2s.stream()


                                        .filter(insProductResult2 -> insProductResult2.getFrequency().equals(s) && insProductResult2.getInsProductId().equals(products.get(0).getId()))


                                        .collect(Collectors.toList());


                                //电压驻波比所在行


@@ -720,7 +721,7 @@


                            }


                            if (inspectionItemSubclass.contains("同极化隔离度")) {


                                List<InsProduct> products = insProducts.stream().filter(insProduct -> insProduct.getInspectionItemSubclass().equals("同极化隔离度")).collect(Collectors.toList());


                                List<InsProductResult2> result2s = insProductResult2s.stream()


                                List<InsProductResult2> result2s = productResult2s.stream()


                                        .filter(insProductResult2 -> insProductResult2.getFrequency().equals(s) && insProductResult2.getInsProductId().equals(products.get(0).getId()))


                                        .collect(Collectors.toList());


                                int length = result2s.get(0).getPort().split(",").length;


@@ -843,7 +844,7 @@


                            }


                            if (inspectionItemSubclass.contains("异极化隔离度")) {


                                List<InsProduct> products = insProducts.stream().filter(insProduct -> insProduct.getInspectionItemSubclass().equals("异极化隔离度")).collect(Collectors.toList());


                                List<InsProductResult2> result2s = insProductResult2s.stream()


                                List<InsProductResult2> result2s = productResult2s.stream()


                                        .filter(insProductResult2 -> insProductResult2.getFrequency().equals(s) && insProductResult2.getInsProductId().equals(products.get(0).getId()))


                                        .collect(Collectors.toList());


                                int length = result2s.get(0).getPort().split(",").length;


@@ -969,7 +970,7 @@


                                        index.getAndIncrement();


                                    }


                                    List<InsProduct> products = insProducts.stream().filter(insProduct -> insProduct.getInspectionItemSubclass().equals("互调")).collect(Collectors.toList());


                                    List<InsProductResult2> result2s = insProductResult2s.stream()


                                    List<InsProductResult2> result2s = productResult2s.stream()


                                            .filter(insProductResult2 -> insProductResult2.getFrequency().equals(s) && insProductResult2.getInsProductId().equals(products.get(0).getId()))


                                            .collect(Collectors.toList());


                                    //互调所在行


@@ -1066,7 +1067,7 @@


                                        index.getAndIncrement();


                                    }


                                    List<InsProduct> products = insProducts.stream().filter(insProduct -> insProduct.getInspectionItemSubclass().equals("最大耦合度")).collect(Collectors.toList());


                                    List<InsProductResult2> result2s = insProductResult2s.stream()


                                    List<InsProductResult2> result2s = productResult2s.stream()


                                            .filter(insProductResult2 -> insProductResult2.getFrequency().equals(s) && insProductResult2.getInsProductId().equals(products.get(0).getId()))


                                            .collect(Collectors.toList());


                                    //最大耦合度所在行


@@ -1159,7 +1160,7 @@


                                        index.getAndIncrement();


                                    }


                                    List<InsProduct> products = insProducts.stream().filter(insProduct -> insProduct.getInspectionItemSubclass().equals("最小耦合度")).collect(Collectors.toList());


                                    List<InsProductResult2> result2s = insProductResult2s.stream()


                                    List<InsProductResult2> result2s = productResult2s.stream()


                                            .filter(insProductResult2 -> insProductResult2.getFrequency().equals(s) && insProductResult2.getInsProductId().equals(products.get(0).getId()))


                                            .collect(Collectors.toList());


                                    //最小耦合度所在行


@@ -1248,7 +1249,7 @@


                                }


                            if (inspectionItemSubclass.contains("幅度偏差")) {


                                    List<InsProduct> products = insProducts.stream().filter(insProduct -> insProduct.getInspectionItemSubclass().equals("幅度偏差")).collect(Collectors.toList());


                                    List<InsProductResult2> result2s = insProductResult2s.stream()


                                    List<InsProductResult2> result2s = productResult2s.stream()


                                            .filter(insProductResult2 -> insProductResult2.getFrequency().equals(s) && insProductResult2.getInsProductId().equals(products.get(0).getId()))


                                            .collect(Collectors.toList());


                                    int length = result2s.get(0).getPort().split(",").length;


@@ -1354,7 +1355,7 @@


                                }


                            if (inspectionItemSubclass.contains("最大相位偏差")) {


                                    List<InsProduct> products = insProducts.stream().filter(insProduct -> insProduct.getInspectionItemSubclass().equals("最大相位偏差")).collect(Collectors.toList());


                                    List<InsProductResult2> result2s = insProductResult2s.stream()


                                    List<InsProductResult2> result2s = productResult2s.stream()


                                            .filter(insProductResult2 -> insProductResult2.getFrequency().equals(s) && insProductResult2.getInsProductId().equals(products.get(0).getId()))


                                            .collect(Collectors.toList());


                                    int length = result2s.get(0).getPort().split(",").length;


@@ -2347,7 +2348,8 @@


            frequencys.forEach(s -> {


                int ports = 0;//端口数


                int angles = 0;//角度数


                for (InsProductResult2 insProductResult2 : insProductResult2s) {


                List<InsProductResult2> productResult2s = insProductResult2s.stream().filter(insProductResult2 -> insProductResult2.getFrequency().equals(s)).collect(Collectors.toList());


                for (InsProductResult2 insProductResult2 : productResult2s) {


                    if (insProductMapper.selectById(insProductResult2.getInsProductId()).getInspectionItemSubclass().equals("电压驻波比") && insProductResult2.getPort().split(",").length > ports) {


                        ports = insProductResult2.getPort().split(",").length;


                    }


@@ -2356,7 +2358,7 @@


                    }


                }


                //频点数


                long often = insProductResult2s.stream().filter(insProductResult2 -> insProductResult2.getFrequency().equals(s))


                long often = productResult2s.stream().filter(insProductResult2 -> insProductResult2.getFrequency().equals(s))


                        .filter(insProductResult2 ->


                                insProductMapper.selectById(insProductResult2.getInsProductId()).getInspectionItemSubclass().equals("互调")


                        ).filter(insProductResult2 -> ObjectUtils.isNotEmpty(insProductResult2.getOften())).distinct().count();


@@ -2383,7 +2385,7 @@


                        aa += (angles + 1) * portRow;


                    }


                    if (inspectionItemSubclass.contains("同极化隔离度")) {


                        List<InsProductResult2> result2s = insProductResult2s.stream().filter(insProductResult2 ->


                        List<InsProductResult2> result2s = productResult2s.stream().filter(insProductResult2 ->


                                insProductMapper.selectById(insProductResult2.getInsProductId())


                                        .getInspectionItemSubclass().equals("同极化隔离度")&& insProductResult2.getFrequency().equals(s)


                        ).collect(Collectors.toList());


@@ -2391,7 +2393,7 @@


                        aa += (angles + 1) * (length % (ports > 8 ? 4 : (ports + 1) / 2) == 0 ? length / (ports > 8 ? 4 : (ports + 1) / 2) : length / (ports > 8 ? 4 : (ports + 1) / 2) + 1);


                    }


                    if (inspectionItemSubclass.contains("异极化隔离度")) {


                        List<InsProductResult2> result2s = insProductResult2s.stream().filter(insProductResult2 ->


                        List<InsProductResult2> result2s = productResult2s.stream().filter(insProductResult2 ->


                                insProductMapper.selectById(insProductResult2.getInsProductId())


                                        .getInspectionItemSubclass().equals("异极化隔离度")&& insProductResult2.getFrequency().equals(s)


                        ).collect(Collectors.toList());


@@ -2408,7 +2410,7 @@


                        aa += (angles + 1);


                    }


                    if (inspectionItemSubclass.contains("幅度偏差")) {


                        List<InsProductResult2> result2s = insProductResult2s.stream().filter(insProductResult2 ->


                        List<InsProductResult2> result2s = productResult2s.stream().filter(insProductResult2 ->


                                insProductMapper.selectById(insProductResult2.getInsProductId())


                                        .getInspectionItemSubclass().equals("幅度偏差")&& insProductResult2.getFrequency().equals(s)


                        ).collect(Collectors.toList());


@@ -2416,7 +2418,7 @@


                        aa += (angles + 1) * (length % 8 == 0 ? length / 8 : length / 8 + 1);


                    }


                    if (inspectionItemSubclass.contains("最大相位偏差")) {


                        List<InsProductResult2> result2s = insProductResult2s.stream().filter(insProductResult2 ->


                        List<InsProductResult2> result2s = productResult2s.stream().filter(insProductResult2 ->


                                insProductMapper.selectById(insProductResult2.getInsProductId())


                                        .getInspectionItemSubclass().equals("最大相位偏差")&& insProductResult2.getFrequency().equals(s)


                        ).collect(Collectors.toList());


@@ -2475,7 +2477,7 @@


                                        index.getAndIncrement();


                                    }


                                    List<InsProduct> products = insProducts.stream().filter(insProduct -> insProduct.getInspectionItemSubclass().equals("电压驻波比")).collect(Collectors.toList());


                                    List<InsProductResult2> result2s = insProductResult2s.stream()


                                    List<InsProductResult2> result2s = productResult2s.stream()


                                            .filter(insProductResult2 -> insProductResult2.getFrequency().equals(s) && insProductResult2.getInsProductId().equals(products.get(0).getId()))


                                            .collect(Collectors.toList());


                                    //电压驻波比所在行


@@ -2577,7 +2579,7 @@


                                    List<InsProduct> products = insProducts.stream()


                                            .filter(insProduct -> insProduct.getInspectionItemSubclass().equals("同极化隔离度"))


                                            .collect(Collectors.toList());


                                    List<InsProductResult2> result2s = insProductResult2s.stream()


                                    List<InsProductResult2> result2s = productResult2s.stream()


                                            .filter(insProductResult2 -> insProductResult2.getFrequency().equals(s) && insProductResult2.getInsProductId().equals(products.get(0).getId()))


                                            .collect(Collectors.toList());


                                    //同极化隔离度所在行


@@ -2669,7 +2671,7 @@


                                    List<InsProduct> products = insProducts.stream()


                                            .filter(insProduct -> insProduct.getInspectionItemSubclass().equals("异极化隔离度"))


                                            .collect(Collectors.toList());


                                    List<InsProductResult2> result2s = insProductResult2s.stream()


                                    List<InsProductResult2> result2s = productResult2s.stream()


                                            .filter(insProductResult2 -> insProductResult2.getFrequency().equals(s) && insProductResult2.getInsProductId().equals(products.get(0).getId()))


                                            .collect(Collectors.toList());


                                    //异极化隔离度所在行


@@ -2760,7 +2762,7 @@


                                    List<InsProduct> products = insProducts.stream()


                                            .filter(insProduct -> insProduct.getInspectionItemSubclass().equals("互调"))


                                            .collect(Collectors.toList());


                                    List<InsProductResult2> result2s = insProductResult2s.stream()


                                    List<InsProductResult2> result2s = productResult2s.stream()


                                            .filter(insProductResult2 -> insProductResult2.getFrequency().equals(s) && insProductResult2.getInsProductId().equals(products.get(0).getId()))


                                            .collect(Collectors.toList());


                                    //互调所在行


@@ -2853,7 +2855,7 @@


                                        index.getAndIncrement();


                                    }


                                    List<InsProduct> products = insProducts.stream().filter(insProduct -> insProduct.getInspectionItemSubclass().equals("电压驻波比")).collect(Collectors.toList());


                                    List<InsProductResult2> result2s = insProductResult2s.stream()


                                    List<InsProductResult2> result2s = productResult2s.stream()


                                            .filter(insProductResult2 -> insProductResult2.getFrequency().equals(s) && insProductResult2.getInsProductId().equals(products.get(0).getId()))


                                            .collect(Collectors.toList());


                                    //电压驻波比所在行


@@ -2950,7 +2952,7 @@


                                }


                                if (inspectionItemSubclass.contains("同极化隔离度")) {


                                    List<InsProduct> products = insProducts.stream().filter(insProduct -> insProduct.getInspectionItemSubclass().equals("同极化隔离度")).collect(Collectors.toList());


                                    List<InsProductResult2> result2s = insProductResult2s.stream()


                                    List<InsProductResult2> result2s = productResult2s.stream()


                                            .filter(insProductResult2 -> insProductResult2.getFrequency().equals(s) && insProductResult2.getInsProductId().equals(products.get(0).getId()))


                                            .collect(Collectors.toList());


                                    int length = result2s.get(0).getPort().split(",").length;


@@ -3073,7 +3075,7 @@


                                }


                                if (inspectionItemSubclass.contains("异极化隔离度")) {


                                    List<InsProduct> products = insProducts.stream().filter(insProduct -> insProduct.getInspectionItemSubclass().equals("异极化隔离度")).collect(Collectors.toList());


                                    List<InsProductResult2> result2s = insProductResult2s.stream()


                                    List<InsProductResult2> result2s = productResult2s.stream()


                                            .filter(insProductResult2 -> insProductResult2.getFrequency().equals(s) && insProductResult2.getInsProductId().equals(products.get(0).getId()))


                                            .collect(Collectors.toList());


                                    int length = result2s.get(0).getPort().split(",").length;


@@ -3199,7 +3201,7 @@


                                        index.getAndIncrement();


                                    }


                                    List<InsProduct> products = insProducts.stream().filter(insProduct -> insProduct.getInspectionItemSubclass().equals("互调")).collect(Collectors.toList());


                                    List<InsProductResult2> result2s = insProductResult2s.stream()


                                    List<InsProductResult2> result2s = productResult2s.stream()


                                            .filter(insProductResult2 -> insProductResult2.getFrequency().equals(s) && insProductResult2.getInsProductId().equals(products.get(0).getId()))


                                            .collect(Collectors.toList());


                                    //互调所在行


@@ -3296,7 +3298,7 @@


                                        index.getAndIncrement();


                                    }


                                    List<InsProduct> products = insProducts.stream().filter(insProduct -> insProduct.getInspectionItemSubclass().equals("最大耦合度")).collect(Collectors.toList());


                                    List<InsProductResult2> result2s = insProductResult2s.stream()


                                    List<InsProductResult2> result2s = productResult2s.stream()


                                            .filter(insProductResult2 -> insProductResult2.getFrequency().equals(s) && insProductResult2.getInsProductId().equals(products.get(0).getId()))


                                            .collect(Collectors.toList());


                                    //最大耦合度所在行


@@ -3389,7 +3391,7 @@


                                        index.getAndIncrement();


                                    }


                                    List<InsProduct> products = insProducts.stream().filter(insProduct -> insProduct.getInspectionItemSubclass().equals("最小耦合度")).collect(Collectors.toList());


                                    List<InsProductResult2> result2s = insProductResult2s.stream()


                                    List<InsProductResult2> result2s = productResult2s.stream()


                                            .filter(insProductResult2 -> insProductResult2.getFrequency().equals(s) && insProductResult2.getInsProductId().equals(products.get(0).getId()))


                                            .collect(Collectors.toList());


                                    //最小耦合度所在行


@@ -3478,7 +3480,7 @@


                                }


                                if (inspectionItemSubclass.contains("幅度偏差")) {


                                    List<InsProduct> products = insProducts.stream().filter(insProduct -> insProduct.getInspectionItemSubclass().equals("幅度偏差")).collect(Collectors.toList());


                                    List<InsProductResult2> result2s = insProductResult2s.stream()


                                    List<InsProductResult2> result2s = productResult2s.stream()


                                            .filter(insProductResult2 -> insProductResult2.getFrequency().equals(s) && insProductResult2.getInsProductId().equals(products.get(0).getId()))


                                            .collect(Collectors.toList());


                                    int length = result2s.get(0).getPort().split(",").length;


@@ -3584,7 +3586,7 @@


                                }


                                if (inspectionItemSubclass.contains("最大相位偏差")) {


                                    List<InsProduct> products = insProducts.stream().filter(insProduct -> insProduct.getInspectionItemSubclass().equals("最大相位偏差")).collect(Collectors.toList());


                                    List<InsProductResult2> result2s = insProductResult2s.stream()


                                    List<InsProductResult2> result2s = productResult2s.stream()


                                            .filter(insProductResult2 -> insProductResult2.getFrequency().equals(s) && insProductResult2.getInsProductId().equals(products.get(0).getId()))


                                            .collect(Collectors.toList());


                                    int length = result2s.get(0).getPort().split(",").length;