From da699eeefe93f58c70a876fa76213b939fb362ac Mon Sep 17 00:00:00 2001
From: zss <zss@example.com>
Date: 星期三, 26 二月 2025 11:54:46 +0800
Subject: [PATCH] 要求值比较支持中文的＞和＜+添加幅度和相位的电路报告+检验报告的判定依据
---
inspect-server/src/main/java/com/yuanchu/mom/utils/DianLuUtils.java | 61 ++++++++++++++++--------------
1 files changed, 32 insertions(+), 29 deletions(-)
diff --git a/inspect-server/src/main/java/com/yuanchu/mom/utils/DianLuUtils.java b/inspect-server/src/main/java/com/yuanchu/mom/utils/DianLuUtils.java
index ea0419d..dbc463b 100644
--- a/inspect-server/src/main/java/com/yuanchu/mom/utils/DianLuUtils.java
+++ b/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()) {
@@ -340,6 +344,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);
}
}
@@ -381,11 +386,10 @@
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());//棰戞
- insProductResult2.setAngle("0掳");//瑙掑害
insProductResult2.setNum(orderStates.get(0).getNum());//娆℃暟
//鑾峰彇绔彛
String port = entry.getValue().stream().map(TianXianData::getPort).collect(Collectors.joining(","));
@@ -397,11 +401,10 @@
}
else if (entry.getKey().contains("闅旂搴�")) {
if (products2.size() <= 0) {
- throw new ErrorException("闅旂搴﹂」鐩湭鎵惧埌");
+ continue;
}
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(","));
@@ -413,11 +416,10 @@
}
else if (entry.getKey().contains("鎻掑叆鎹熻��")) {
if (products3.size() <= 0) {
- throw new ErrorException("鎻掑叆鎹熻�楅」鐩湭鎵惧埌");
+ continue;
}
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(","));
@@ -429,11 +431,10 @@
}
else if (entry.getKey().contains("甯﹀唴娉㈠姩")) {
if (products4.size() <= 0) {
- throw new ErrorException("甯﹀唴娉㈠姩椤圭洰鏈壘鍒�");
+ continue;
}
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(","));
@@ -445,11 +446,10 @@
}
else if (entry.getKey().contains("甯﹀鎶戝埗")) {
if (products5.size() <= 0) {
- throw new ErrorException("甯﹀鎶戝埗椤圭洰鏈壘鍒�");
+ continue;
}
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(","));
@@ -461,16 +461,14 @@
}
else if (entry.getKey().contains("鑰﹀悎搴�")) {
if (products6.size() <= 0 || products7.size()<=0) {
- throw new ErrorException("鑰﹀悎搴﹂」鐩湭鎵惧埌");
+ continue;
}
+ /*鏈�澶ц�﹀悎搴�*/
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 +478,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 +511,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);
}
}
--
Gitblit v1.9.3