From 98a45e34ab4a6740f95980040fa9207a779b2529 Mon Sep 17 00:00:00 2001
From: fuliqi <fuliqi@qq.com>
Date: 星期六, 12 十月 2024 16:31:18 +0800
Subject: [PATCH] 点位在线web修复+点位考核状态字段
---
ycl-server/src/main/java/com/ycl/task/MonitorTask.java | 31 +++++++++++++++----------------
1 files changed, 15 insertions(+), 16 deletions(-)
diff --git a/ycl-server/src/main/java/com/ycl/task/MonitorTask.java b/ycl-server/src/main/java/com/ycl/task/MonitorTask.java
index 1426343..7026520 100644
--- a/ycl-server/src/main/java/com/ycl/task/MonitorTask.java
+++ b/ycl-server/src/main/java/com/ycl/task/MonitorTask.java
@@ -63,16 +63,16 @@
//鍚屾鐐逛綅鍦ㄧ嚎鐜囧埌mongo(寮冪敤)
public void siteOnline() {
-// log.info("寮�濮嬪悓姝ョ偣浣嶅湪绾跨巼鍒癿ongo");
-// List<TMonitorResult> tMonitorResults = monitorMapper.selectMonitorResult(null);
-// if (!CollectionUtils.isEmpty(tMonitorResults)) {
-// //濡傛灉瀛樺湪涔嬪墠鐨勬暟鎹厛鍒犻櫎
-// Query query = new Query(Criteria.where("mongoCreateTime").gte(DateUtils.getDayStart(new Date())).lt(DateUtils.getDayEnd(new Date())));
-// DeleteResult result = mongoTemplate.remove(query, TMonitorResult.class);
-// //瀛樻斁鍦╩ongo涓�
-// mongoTemplate.insertAll(tMonitorResults);
-// log.info("缁撴潫鍚屾鐐逛綅鍦ㄧ嚎鐜囧埌mongo");
-// }
+ log.info("寮�濮嬪悓姝ョ偣浣嶅湪绾跨巼鍒癿ongo");
+ List<TMonitorResult> tMonitorResults = monitorMapper.selectMonitorResult(null);
+ if (!CollectionUtils.isEmpty(tMonitorResults)) {
+ //濡傛灉瀛樺湪涔嬪墠鐨勬暟鎹厛鍒犻櫎
+ Query query = new Query(Criteria.where("mongoCreateTime").gte(DateUtils.getDayStart(new Date())).lt(DateUtils.getDayEnd(new Date())));
+ DeleteResult result = mongoTemplate.remove(query, TMonitorResult.class);
+ //瀛樻斁鍦╩ongo涓�
+ mongoTemplate.insertAll(tMonitorResults);
+ log.info("缁撴潫鍚屾鐐逛綅鍦ㄧ嚎鐜囧埌mongo");
+ }
}
//鍚屾mongodb涓�鏈轰竴妗ｅ埌鏁版嵁搴�
@@ -101,8 +101,7 @@
List<TMonitor> monitorList = new ArrayList<>();
//鍑嗗鎻掑叆鐐逛綅琛ㄧ殑鏁版嵁
List<YwPoint> ywPointList = new ArrayList<>();
- //鏂扮殑鏁版嵁锛屽師鏁版嵁搴撲腑涓嶅瓨鍦ㄧ殑鏁版嵁
- Set<TMonitor> newMonitorList = new HashSet<>();
+
//鍏ㄥ勾鐣欏瓨
for (MonitorQualifyResult result : oneMachineFileResults) {
@@ -110,10 +109,6 @@
YwPoint point = getPoint(result, pointMap, importantSite);
monitorList.add(monitor);
ywPointList.add(point);
- //姣斿绛涢�夊嚭鏂扮殑鏁版嵁
- if (!CollectionUtils.isEmpty(monitorVOMap) && !monitorVOMap.containsKey(result.getSerialNumber().getValue())) {
- newMonitorList.add(monitor);
- }
}
//娣诲姞鑰佹暟鎹�
List<String> numbers = CollectionUtils.isEmpty(monitorList) ? new ArrayList<>() : monitorList.stream().map(TMonitor::getSerialNumber).collect(Collectors.toList());
@@ -131,7 +126,9 @@
});
List<String> points = CollectionUtils.isEmpty(ywPointList) ? new ArrayList<>() : ywPointList.stream().map(YwPoint::getSerialNumber).collect(Collectors.toList());
pointMap.forEach((key, value) -> {
+ //鑰佽澶囩姸鎬佹敼涓轰笉鍙備笌鑰冩牳
if (!points.contains(key)) {
+ value.setExamineStatus(Boolean.FALSE);
ywPointList.add(value);
}
});
@@ -165,6 +162,8 @@
ywPoint.setCreateTime(new Date());
ywPoint.setUpdateTime(new Date());
}
+ //鐘舵�佽缃负鑰冩牳璁惧
+ ywPoint.setExamineStatus(Boolean.TRUE);
//姣斿鏄惁鏄噸鐐圭偣浣�
if (importantSite.contains(result.getSxjcjqy().getValue())) {
ywPoint.setImportantTag(Boolean.TRUE);
--
Gitblit v1.8.0