From 47b307f8eaaec7c9eb359416753d548b9b7c01a3 Mon Sep 17 00:00:00 2001
From: zss <zss@example.com>
Date: 星期三, 11 十二月 2024 17:14:54 +0800
Subject: [PATCH] 电路报告优化
---
inspect-server/src/main/java/com/yuanchu/mom/utils/WordUtils.java | 74 +++++++++++++++++++------------------
1 files changed, 38 insertions(+), 36 deletions(-)
diff --git a/inspect-server/src/main/java/com/yuanchu/mom/utils/WordUtils.java b/inspect-server/src/main/java/com/yuanchu/mom/utils/WordUtils.java
index 8924bde..2ab885a 100644
--- a/inspect-server/src/main/java/com/yuanchu/mom/utils/WordUtils.java
+++ b/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;
--
Gitblit v1.9.3