From 3b0516a2959e25576e4f3fda697a3b025d06c8c9 Mon Sep 17 00:00:00 2001
From: zxl <763096477@qq.com>
Date: 星期二, 24 六月 2025 14:09:07 +0800
Subject: [PATCH] 每日录像可用指标添加日志，修改大屏为查看当前月平均
---
ycl-server/src/main/java/com/ycl/task/MonitorTask.java | 19 +++++++++++++++----
1 files changed, 15 insertions(+), 4 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 b57ea36..c1a3fe2 100644
--- a/ycl-server/src/main/java/com/ycl/task/MonitorTask.java
+++ b/ycl-server/src/main/java/com/ycl/task/MonitorTask.java
@@ -29,6 +29,7 @@
import lombok.extern.slf4j.Slf4j;
import org.springframework.beans.BeanUtils;
import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.beans.factory.annotation.Value;
import org.springframework.data.mongodb.core.MongoTemplate;
import org.springframework.data.mongodb.core.query.Criteria;
import org.springframework.data.mongodb.core.query.Query;
@@ -61,7 +62,10 @@
private YwPointMapper ywPointMapper;
@Autowired
private RedisTemplate redisTemplate;
-
+ @Value("${DH.userName}")
+ public String userName;
+ @Value("${DH.password}")
+ public String password;
//鍚屾鐐逛綅鍦ㄧ嚎鐜囧埌mongo(寮冪敤)
// public void siteOnline() {
// log.info("寮�濮嬪悓姝ョ偣浣嶅湪绾跨巼鍒癿ongo");
@@ -104,7 +108,6 @@
//鍑嗗鎻掑叆鐐逛綅琛ㄧ殑鏁版嵁
List<YwPoint> ywPointList = new ArrayList<>();
-
//鍏ㄥ勾鐣欏瓨
for (MonitorQualifyResult result : oneMachineFileResults) {
TMonitor monitor = getMonitor(result, monitorVOMap, osdMap);
@@ -112,6 +115,7 @@
monitorList.add(monitor);
ywPointList.add(point);
}
+
//娣诲姞鑰佹暟鎹�
List<String> numbers = CollectionUtils.isEmpty(monitorList) ? new ArrayList<>() : monitorList.stream().map(TMonitor::getSerialNumber).collect(Collectors.toList());
monitorVOMap.forEach((key, value) -> {
@@ -123,16 +127,17 @@
if (osdCheckResult != null) {
monitor.setDeviceType(osdCheckResult.getDeviceBrand());
}
-
monitorList.add(monitor);
}
});
+ //杞崲
List<String> points = CollectionUtils.isEmpty(ywPointList) ? new ArrayList<>() : ywPointList.stream().map(YwPoint::getSerialNumber).collect(Collectors.toList());
+ //pointMap鐐逛綅鏃ф暟鎹� 璁惧鐮乵ap
pointMap.forEach((key, value) -> {
//鑰佽澶囩姸鎬佹敼涓轰笉鍙備笌鑰冩牳
if (!points.contains(key)) {
value.setExamineStatus(Boolean.FALSE);
- //鍗曚綅璁剧疆涓虹┖锛圱ODO锛氫负鍟ワ級
+ //鍗曚綅璁剧疆涓虹┖
value.setUnitId(null);
ywPointList.add(value);
}
@@ -158,6 +163,10 @@
YwPoint ywPoint = new YwPoint();
if (pointMap.containsKey(result.getSerialNumber().getValue())) {
ywPoint = pointMap.get(result.getSerialNumber().getValue());
+ //鏇存柊瀹氫綅鍚�
+ if (ywPoint != null) {
+ ywPoint.setPointName(result.getName().getValue());
+ }
} else {
ywPoint.setPointName(result.getName().getValue());
ywPoint.setStatus(PointStatus.WAIT.getDesc());
@@ -170,6 +179,8 @@
ywPoint.setCreateTime(new Date());
ywPoint.setUpdateTime(new Date());
ywPoint.setOnline(ApiConstants.UY_OnlineSite_Unknown);
+ ywPoint.setUsername(userName);
+ ywPoint.setPassword(password);
}
//鐘舵�佽缃负鑰冩牳璁惧
ywPoint.setExamineStatus(Boolean.TRUE);
--
Gitblit v1.8.0