From 7b73755e320f1bec9254b86a0f078c5f7969880d Mon Sep 17 00:00:00 2001
From: fuliqi <fuliqi@qq.com>
Date: 星期四, 19 十二月 2024 10:06:47 +0800
Subject: [PATCH] 接入海康成绩
---
ycl-server/src/main/java/com/ycl/task/MonitorTask.java | 118 ++++++++++++++++++++++++++++++-----------------------------
1 files changed, 60 insertions(+), 58 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 c7b3be9..b57ea36 100644
--- a/ycl-server/src/main/java/com/ycl/task/MonitorTask.java
+++ b/ycl-server/src/main/java/com/ycl/task/MonitorTask.java
@@ -83,72 +83,74 @@
// 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<>();
+ //鍑嗗鎻掑叆璁惧琛ㄧ殑鏁版嵁
+ 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);
- }
- //娣诲姞鑰佹暟鎹�
- 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)) {
- value.setExamineStatus(Boolean.FALSE);
- //鍗曚綅璁剧疆涓虹┖
- value.setUnitId(null);
- ywPointList.add(value);
- }
- });
+ //娣诲姞鑰佹暟鎹�
+ 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());
+ }
- 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涓瓑寰呰�冩牳鎸囨爣浠诲姟浣跨敤(寮冪敤锛屾敼涓烘爣绛惧舰寮�)
+ monitorList.add(monitor);
+ }
+ });
+ 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);
+ //鍗曚綅璁剧疆涓虹┖锛圱ODO锛氫负鍟ワ級
+ 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涓�鏈轰竴妗ｅ埌鏁版嵁搴�");
}
--
Gitblit v1.8.0