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 | 145 +++++++++++++++++++++++++++---------------------
1 files changed, 82 insertions(+), 63 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..c1a3fe2 100644
--- a/ycl-server/src/main/java/com/ycl/task/MonitorTask.java
+++ b/ycl-server/src/main/java/com/ycl/task/MonitorTask.java
@@ -21,6 +21,7 @@
import com.ycl.system.service.ISysDictDataService;
import com.ycl.utils.DateUtils;
import com.ycl.utils.StringUtils;
+import constant.ApiConstants;
import constant.CheckConstants;
import constant.RedisConstant;
import enumeration.general.AreaDeptEnum;
@@ -28,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;
@@ -60,9 +62,12 @@
private YwPointMapper ywPointMapper;
@Autowired
private RedisTemplate redisTemplate;
-
+ @Value("${DH.userName}")
+ public String userName;
+ @Value("${DH.password}")
+ public String password;
//鍚屾鐐逛綅鍦ㄧ嚎鐜囧埌mongo(寮冪敤)
- public void siteOnline() {
+// public void siteOnline() {
// log.info("寮�濮嬪悓姝ョ偣浣嶅湪绾跨巼鍒癿ongo");
// List<TMonitorResult> tMonitorResults = monitorMapper.selectMonitorResult(null);
// if (!CollectionUtils.isEmpty(tMonitorResults)) {
@@ -73,7 +78,7 @@
// mongoTemplate.insertAll(tMonitorResults);
// log.info("缁撴潫鍚屾鐐逛綅鍦ㄧ嚎鐜囧埌mongo");
// }
- }
+// }
//鍚屾mongodb涓�鏈轰竴妗ｅ埌鏁版嵁搴�
@Transactional(rollbackFor = Exception.class)
@@ -82,72 +87,75 @@
// Date yesterday = DateUtils.addDays(new Date(), -1);
Query query = new Query(Criteria.where("mongoCreateTime").gte(DateUtils.getDayStart(new Date())).lt(DateUtils.getDayEnd(new Date())));
List<MonitorQualifyResult> oneMachineFileResults = mongoTemplate.find(query, MonitorQualifyResult.class);
- //mongo鍝佺墝鏁版嵁
- Query OSDQuery = new Query(Criteria.where("mongoCreateTime").gte(DateUtils.getDayStart(new Date())).lt(DateUtils.getDayEnd(new Date())));
- Map<String, OsdCheckResult> osdMap = mongoTemplate.find(query, OsdCheckResult.class).stream().collect(Collectors.toMap(OsdCheckResult::getDeviceNo, Function.identity()));
- //鏁版嵁搴搈onitor琛ㄦ暟鎹�
- Map<String, TMonitorVO> monitorVOMap = monitorMapper.selectMonitorVOList().stream().collect(Collectors.toMap(TMonitorVO::getSerialNumber, Function.identity()));
- //鐐逛綅鏁版嵁
- Map<String, YwPoint> pointMap = ywPointService.list(new QueryWrapper<YwPoint>()).stream().collect(Collectors.toMap(YwPoint::getSerialNumber, Function.identity()));
+ if(!CollectionUtils.isEmpty(oneMachineFileResults)) {
+ //mongo鍝佺墝鏁版嵁
+ Query OSDQuery = new Query(Criteria.where("mongoCreateTime").gte(DateUtils.getDayStart(new Date())).lt(DateUtils.getDayEnd(new Date())));
+ Map<String, OsdCheckResult> osdMap = mongoTemplate.find(query, OsdCheckResult.class).stream().collect(Collectors.toMap(OsdCheckResult::getDeviceNo, Function.identity()));
+ //鏁版嵁搴搈onitor琛ㄦ暟鎹�
+ Map<String, TMonitorVO> monitorVOMap = monitorMapper.selectMonitorVOList().stream().collect(Collectors.toMap(TMonitorVO::getSerialNumber, Function.identity()));
+ //鐐逛綅鏁版嵁
+ Map<String, YwPoint> pointMap = ywPointService.list(new QueryWrapper<YwPoint>()).stream().collect(Collectors.toMap(YwPoint::getSerialNumber, Function.identity()));
- //閲嶇偣鐐逛綅闆嗗悎瀛楀吀(瑙ｆ瀽SXJCJQY瀛楁)
- SysDictData sysDictData = new SysDictData();
- sysDictData.setDictType("platform_important_site");
- List<SysDictData> DictDataList = dictDataService.selectDictDataList(sysDictData);
- //閲囬泦鍖哄煙涓洪噸鐐圭偣浣嶇殑闆嗗悎
- List<String> importantSite = DictDataList.stream().map(SysDictData::getDictValue).collect(Collectors.toList());
+ //閲嶇偣鐐逛綅闆嗗悎瀛楀吀(瑙ｆ瀽SXJCJQY瀛楁)
+ SysDictData sysDictData = new SysDictData();
+ sysDictData.setDictType("platform_important_site");
+ List<SysDictData> DictDataList = dictDataService.selectDictDataList(sysDictData);
+ //閲囬泦鍖哄煙涓洪噸鐐圭偣浣嶇殑闆嗗悎
+ List<String> importantSite = DictDataList.stream().map(SysDictData::getDictValue).collect(Collectors.toList());
- //鍑嗗鎻掑叆璁惧琛ㄧ殑鏁版嵁
- List<TMonitor> monitorList = new ArrayList<>();
- //鍑嗗鎻掑叆鐐逛綅琛ㄧ殑鏁版嵁
- List<YwPoint> ywPointList = new ArrayList<>();
- //鏂扮殑鏁版嵁锛屽師鏁版嵁搴撲腑涓嶅瓨鍦ㄧ殑鏁版嵁
- Set<TMonitor> newMonitorList = new HashSet<>();
+ //鍑嗗鎻掑叆璁惧琛ㄧ殑鏁版嵁
+ List<TMonitor> monitorList = new ArrayList<>();
+ //鍑嗗鎻掑叆鐐逛綅琛ㄧ殑鏁版嵁
+ List<YwPoint> ywPointList = new ArrayList<>();
- //鍏ㄥ勾鐣欏瓨
- for (MonitorQualifyResult result : oneMachineFileResults) {
- TMonitor monitor = getMonitor(result, monitorVOMap, osdMap);
- 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());
- monitorVOMap.forEach((key, value) -> {
- if (!numbers.contains(key)) {
- TMonitor monitor = new TMonitor();
- BeanUtils.copyProperties(value, monitor);
- //濉ˉ鍝佺墝
- OsdCheckResult osdCheckResult = osdMap.get(key);
- if (osdCheckResult != null) {
- monitor.setDeviceType(osdCheckResult.getDeviceBrand());
- }
+ //鍏ㄥ勾鐣欏瓨
+ for (MonitorQualifyResult result : oneMachineFileResults) {
+ TMonitor monitor = getMonitor(result, monitorVOMap, osdMap);
+ YwPoint point = getPoint(result, pointMap, importantSite);
monitorList.add(monitor);
+ ywPointList.add(point);
}
- });
- List<String> points = CollectionUtils.isEmpty(ywPointList) ? new ArrayList<>() : ywPointList.stream().map(YwPoint::getSerialNumber).collect(Collectors.toList());
- pointMap.forEach((key, value) -> {
- if (!points.contains(key)) {
- ywPointList.add(value);
- }
- });
- log.info("result闆嗗悎{},璁惧闆嗗悎{},鐐逛綅闆嗗悎{}", oneMachineFileResults.size(), monitorList.size(), ywPointList.size());
- //鎻掑叆鏁版嵁搴�
- if (!CollectionUtils.isEmpty(monitorList)) {
- monitorMapper.deleteAll();
- monitorService.saveBatch(monitorList);
- }
- if (!CollectionUtils.isEmpty(ywPointList)) {
- ywPointMapper.deleteAll();
- ywPointService.saveBatch(ywPointList);
- }
- //鏂扮殑鏁版嵁鏀惧叆Redis涓瓑寰呰�冩牳鎸囨爣浠诲姟浣跨敤(寮冪敤锛屾敼涓烘爣绛惧舰寮�)
+ //娣诲姞鑰佹暟鎹�
+ List<String> numbers = CollectionUtils.isEmpty(monitorList) ? new ArrayList<>() : monitorList.stream().map(TMonitor::getSerialNumber).collect(Collectors.toList());
+ monitorVOMap.forEach((key, value) -> {
+ if (!numbers.contains(key)) {
+ TMonitor monitor = new TMonitor();
+ BeanUtils.copyProperties(value, monitor);
+ //濉ˉ鍝佺墝
+ OsdCheckResult osdCheckResult = osdMap.get(key);
+ 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);
+ //鍗曚綅璁剧疆涓虹┖
+ value.setUnitId(null);
+ ywPointList.add(value);
+ }
+ });
+
+ log.info("result闆嗗悎{},璁惧闆嗗悎{},鐐逛綅闆嗗悎{}", oneMachineFileResults.size(), monitorList.size(), ywPointList.size());
+ //鎻掑叆鏁版嵁搴�
+ if (!CollectionUtils.isEmpty(monitorList)) {
+ monitorMapper.deleteAll();
+ monitorService.saveBatch(monitorList);
+ }
+ if (!CollectionUtils.isEmpty(ywPointList)) {
+ ywPointMapper.deleteAll();
+ ywPointService.saveBatch(ywPointList);
+ }
+ //鏂扮殑鏁版嵁鏀惧叆Redis涓瓑寰呰�冩牳鎸囨爣浠诲姟浣跨敤(寮冪敤锛屾敼涓烘爣绛惧舰寮�)
// redisTemplate.opsForValue().set(RedisConstant.New_Monitor_Set, JSONArray.toJSONString(newMonitorList));
+ }
log.info("缁撴潫鍚屾mongodb涓�鏈轰竴妗ｅ埌鏁版嵁搴�");
}
@@ -155,16 +163,27 @@
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());
ywPoint.setSerialNumber(result.getSerialNumber().getValue());
ywPoint.setImportantTag(Boolean.FALSE);
- ywPoint.setProvinceTag(Boolean.FALSE);
+ ywPoint.setProvinceTagVideo(Boolean.FALSE);
+ ywPoint.setProvinceTagCar(Boolean.FALSE);
+ ywPoint.setProvinceTagFace(Boolean.FALSE);
ywPoint.setImportantCommandImageTag(Boolean.FALSE);
ywPoint.setCreateTime(new Date());
ywPoint.setUpdateTime(new Date());
+ ywPoint.setOnline(ApiConstants.UY_OnlineSite_Unknown);
+ ywPoint.setUsername(userName);
+ ywPoint.setPassword(password);
}
+ //鐘舵�佽缃负鑰冩牳璁惧
+ ywPoint.setExamineStatus(Boolean.TRUE);
//姣斿鏄惁鏄噸鐐圭偣浣�
if (importantSite.contains(result.getSxjcjqy().getValue())) {
ywPoint.setImportantTag(Boolean.TRUE);
--
Gitblit v1.8.0