From 6707cf22587cba66f79a29145cc735a7c029dd05 Mon Sep 17 00:00:00 2001
From: xiangpei <xiangpei@timesnew.cn>
Date: 星期一, 09 九月 2024 13:35:02 +0800
Subject: [PATCH] 设置新设备bug
---
ycl-pojo/src/main/java/com/ycl/platform/domain/result/BaseResult.java | 2 +-
ycl-server/src/main/java/com/ycl/platform/service/impl/YwPointServiceImpl.java | 8 +++-----
2 files changed, 4 insertions(+), 6 deletions(-)
diff --git a/ycl-pojo/src/main/java/com/ycl/platform/domain/result/BaseResult.java b/ycl-pojo/src/main/java/com/ycl/platform/domain/result/BaseResult.java
index bbc1af6..4e13bc9 100644
--- a/ycl-pojo/src/main/java/com/ycl/platform/domain/result/BaseResult.java
+++ b/ycl-pojo/src/main/java/com/ycl/platform/domain/result/BaseResult.java
@@ -44,7 +44,7 @@
private Boolean importantCommandImageTag;
/**
- * 鏂拌澶�
+ * 鏂拌澶�, true浠ｈ〃鏂拌澶囷紝false鍜宯ull涓嶆槸鏂拌澶�
*/
private Boolean newDevice;
}
diff --git a/ycl-server/src/main/java/com/ycl/platform/service/impl/YwPointServiceImpl.java b/ycl-server/src/main/java/com/ycl/platform/service/impl/YwPointServiceImpl.java
index 1350934..bd593f7 100644
--- a/ycl-server/src/main/java/com/ycl/platform/service/impl/YwPointServiceImpl.java
+++ b/ycl-server/src/main/java/com/ycl/platform/service/impl/YwPointServiceImpl.java
@@ -324,11 +324,9 @@
List<String> gbList = dataList.stream().map(BaseResult::getNo).collect(Collectors.toList());
Map<String, BaseResult> pointMap = dataList.stream().collect(Collectors.toMap(BaseResult::getNo, item -> item));
List<String> dbGBList = monitorMapper.getGBbyGB(gbList);
- for (String gb : dbGBList) {
- BaseResult data = pointMap.get(gb);
- if (Objects.nonNull(data)) {
- data.setNewDevice(Boolean.TRUE);
- }
+ for (String s : gbList) {
+ BaseResult baseResult = pointMap.get(s);
+ baseResult.setNewDevice(!dbGBList.contains(s));
}
}
}
--
Gitblit v1.8.0