From 4497f5b1e322eba5ec519ebc1955317ed656aa8e Mon Sep 17 00:00:00 2001
From: zss <zss@example.com>
Date: 星期四, 26 十二月 2024 14:31:15 +0800
Subject: [PATCH] Merge branch 'master' into cnas
---
inspect-server/src/main/java/com/yuanchu/mom/utils/DianLuUtils.java | 54 ++++++++++++++++++++++++++++++++++++++++++++++--------
1 files changed, 46 insertions(+), 8 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 3542482..387ec5e 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
@@ -106,14 +106,18 @@
for (String s : list) {
String[] mHzs = s.split("MHz")[0].split("-");
//鍐嶅垽鏂繖涓鐐规槸鍚﹀湪棰戞鐨勮寖鍥村唴
- if (Integer.parseInt(stringListEntry.getKey()) <= Integer.parseInt(mHzs[1]) && Integer.parseInt(stringListEntry.getKey()) >= Integer.parseInt(mHzs[0])) {
+ if (stringListEntry.getKey().equals("700")){
+ insProductResult2.setFrequency("703-803MHz");
+ break;
+ }
+ else if (Integer.parseInt(stringListEntry.getKey()) <= Integer.parseInt(mHzs[1]) && Integer.parseInt(stringListEntry.getKey()) >= Integer.parseInt(mHzs[0])) {
insProductResult2.setFrequency(s);
break;
}
}
- if (ObjectUtils.isEmpty(insProductResult2.getFrequency())) {
- throw new ErrorException("娌℃湁鎵惧埌" + stringListEntry.getKey() + "瀵瑰簲鐨勯娈�");
- }
+ }
+ if (ObjectUtils.isEmpty(insProductResult2.getFrequency())) {
+ throw new ErrorException("娌℃湁鎵惧埌" + stringListEntry.getKey() + "瀵瑰簲鐨勯娈典俊鎭�,璇峰厛閫夋嫨棰戞淇℃伅杩涜淇濆瓨");
}
insProductResult2s.add(insProductResult2);
}
@@ -136,6 +140,10 @@
List<InsProduct> products1 = products.stream().filter(insProduct -> insProduct.getInspectionItemSubclass().equals("鐢靛帇椹绘尝姣�")).collect(Collectors.toList());
//鏌ヨ璇ユ牱鍝佺殑鍚屾瀬鍖栭殧绂诲害椤圭洰id
List<InsProduct> products2 = products.stream().filter(insProduct -> insProduct.getInspectionItemSubclass().equals("鍚屾瀬鍖栭殧绂诲害")).collect(Collectors.toList());
+ //鏌ヨ璇ユ牱鍝佺殑闅旂搴﹂」鐩甶d
+ List<InsProduct> products6 = products.stream().filter(insProduct -> insProduct.getInspectionItemSubclass().equals("鍚屽垪闅旂搴�")).collect(Collectors.toList());
+ //鏌ヨ璇ユ牱鍝佺殑绔彛闂撮殧绂诲害椤圭洰id
+ List<InsProduct> products7 = products.stream().filter(insProduct -> insProduct.getInspectionItemSubclass().equals("绔彛闂撮殧绂诲害")).collect(Collectors.toList());
//鏌ヨ璇ユ牱鍝佺殑寮傛瀬鍖栭殧绂诲害椤圭洰id
List<InsProduct> products3 = products.stream().filter(insProduct -> insProduct.getInspectionItemSubclass().equals("寮傛瀬鍖栭殧绂诲害")).collect(Collectors.toList());
//鏌ヨ璇ユ牱鍝佺殑骞呭害鍋忓樊椤圭洰id
@@ -164,7 +172,38 @@
String value = entry.getValue().stream().map(tianXianData1 -> "\"" + tianXianData1.getValue() + "\"").collect(Collectors.joining(","));
insProductResult2.setValue("[[" + value + "]]");//鍊�
insProductResult2s.add(insProductResult2);
- } else if (entry.getKey().contains("鍚屾瀬鍖栭殧绂�") || entry.getKey().contains("鍚屽垪闅旂")) {
+ } else if (entry.getKey().contains("鍚屽垪闅旂")) {
+ if (products6.size() <= 0) {
+ throw new ErrorException("闅旂搴﹂」鐩湭鎵惧埌");
+ }
+ insProductResult2.setInsProductId(products6.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(","));
+ insProductResult2.setPort(port);//绔彛
+ //鑾峰彇妫�楠屽��
+ String value = entry.getValue().stream().map(tianXianData1 -> "\"" + tianXianData1.getValue() + "\"").collect(Collectors.joining(","));
+ insProductResult2.setValue("[[" + value + "]]");//鍊�
+ insProductResult2s.add(insProductResult2);
+ } else if (entry.getKey().contains("绔彛闂撮殧绂�")) {
+ if (products7.size() <= 0) {
+ throw new ErrorException("绔彛闂撮殧绂婚」鐩湭鎵惧埌");
+ }
+ insProductResult2.setInsProductId(products7.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(","));
+ insProductResult2.setPort(port);//绔彛
+ //鑾峰彇妫�楠屽��
+ String value = entry.getValue().stream().map(tianXianData1 -> "\"" + tianXianData1.getValue() + "\"").collect(Collectors.joining(","));
+ insProductResult2.setValue("[[" + value + "]]");//鍊�
+ insProductResult2s.add(insProductResult2);
+ }
+ else if (entry.getKey().contains("鍚屾瀬鍖栭殧绂�")) {
if (products2.size() <= 0) {
throw new ErrorException("鍚屾瀬鍖栭殧绂婚」鐩湭鎵惧埌");
}
@@ -179,7 +218,7 @@
String value = entry.getValue().stream().map(tianXianData1 -> "\"" + tianXianData1.getValue() + "\"").collect(Collectors.joining(","));
insProductResult2.setValue("[[" + value + "]]");//鍊�
insProductResult2s.add(insProductResult2);
- } else if (entry.getKey().contains("寮傛瀬鍖栭殧绂�") || entry.getKey().contains("绔彛闂撮殧绂�")) {
+ } else if (entry.getKey().contains("寮傛瀬鍖栭殧绂�")) {
if (products3.size() <= 0) {
throw new ErrorException("寮傛瀬鍖栭殧绂婚」鐩湭鎵惧埌");
}
@@ -303,8 +342,7 @@
filteredList.add(result2);
}
}
- System.out.println(filteredList);
- //insProductResult2Service.saveBatch(filteredList);
+ insProductResult2Service.saveBatch(filteredList);
}
--
Gitblit v1.9.3