From c1b7868762ef7d596325877627720ca75e45ba09 Mon Sep 17 00:00:00 2001
From: Crunchy <3114200645@qq.com>
Date: 星期五, 26 七月 2024 11:23:05 +0800
Subject: [PATCH] 数采bug调整
---
inspect-server/src/main/java/com/yuanchu/mom/service/impl/InsOrderPlanServiceImpl.java | 8 ++++++--
1 files changed, 6 insertions(+), 2 deletions(-)
diff --git a/inspect-server/src/main/java/com/yuanchu/mom/service/impl/InsOrderPlanServiceImpl.java b/inspect-server/src/main/java/com/yuanchu/mom/service/impl/InsOrderPlanServiceImpl.java
index b2f303d..f0b03f6 100644
--- a/inspect-server/src/main/java/com/yuanchu/mom/service/impl/InsOrderPlanServiceImpl.java
+++ b/inspect-server/src/main/java/com/yuanchu/mom/service/impl/InsOrderPlanServiceImpl.java
@@ -227,9 +227,12 @@
// 闃叉鍥炵幆鍦板潃鍙樹负IPv6
String ip = ipAddress.equals("0:0:0:0:0:0:0:1") ? "127.0.0.1" : ipAddress;
insProducts.forEach(i -> {
- Map<String, Object> devices = baseMapper.getDeviceMessage(ip, i.getInspectionItem(), i.getInspectionItemSubclass());
- if (ObjectUtils.isNotEmpty(devices) && (ObjectUtils.isNotEmpty(devices.get("file_type")) || ObjectUtils.isNotEmpty(devices.get("collect_url")))) {
+ Map<String, Object> devices = baseMapper.getDeviceMessage(ip, i.getInspectionItem(), i.getInspectionItemSubclass(), i.getSampleType());
+ if (ObjectUtils.isNotEmpty(devices) && ObjectUtils.isNotEmpty(devices.get("file_type")) && ObjectUtils.isNotEmpty(devices.get("collect_url"))) {
InsProductResult insProductResult = i.getInsProductResult();
+ if (ObjectUtils.isEmpty(insProductResult)) {
+ insProductResult = new InsProductResult();
+ }
List<Object> list = new ArrayList<>();
Map<Object, Object> hashMap = new HashMap<>();
hashMap.put("v", devices.get("device_name"));
@@ -241,6 +244,7 @@
listValue.add(hashMapValue);
insProductResult.setEquipName(JSON.toJSON(list).toString());
insProductResult.setEquipValue(JSON.toJSON(listValue).toString());
+ i.setInsProductResult(insProductResult);
}
});
return insProducts;
--
Gitblit v1.9.3