From 087991c76f078defe5eb55d84223021b4199fb3d Mon Sep 17 00:00:00 2001
From: zss <zss@example.com>
Date: 星期一, 17 二月 2025 11:22:50 +0800
Subject: [PATCH] 设备模块修改bug
---
inspect-server/src/main/java/com/yuanchu/mom/utils/DianLuUtils.java | 23 +++++++++++------------
1 files changed, 11 insertions(+), 12 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..35d5e7f 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
@@ -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);
}
}
--
Gitblit v1.9.3