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 | 8 +++++++-
1 files changed, 7 insertions(+), 1 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 b13a2cd..c1a3fe2 100644
--- a/ycl-server/src/main/java/com/ycl/task/MonitorTask.java
+++ b/ycl-server/src/main/java/com/ycl/task/MonitorTask.java
@@ -115,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) -> {
@@ -126,11 +127,12 @@
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)) {
@@ -161,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());
--
Gitblit v1.8.0