From d268f82d25c25ebdc7a1ea30614f6cda6d3a9ae3 Mon Sep 17 00:00:00 2001
From: fuliqi <fuliqi@qq.com>
Date: 星期四, 10 十月 2024 16:31:41 +0800
Subject: [PATCH] win库+大屏考核指标查询bug
---
ycl-server/src/main/java/com/ycl/task/MonitorTask.java | 42 ++++++++++++++++++++++++++++++------------
1 files changed, 30 insertions(+), 12 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 f7a9515..1426343 100644
--- a/ycl-server/src/main/java/com/ycl/task/MonitorTask.java
+++ b/ycl-server/src/main/java/com/ycl/task/MonitorTask.java
@@ -4,8 +4,11 @@
import com.alibaba.druid.support.json.JSONUtils;
import com.alibaba.fastjson2.JSONArray;
import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
+import com.mongodb.client.result.DeleteResult;
import com.ycl.platform.domain.entity.TMonitor;
import com.ycl.platform.domain.entity.YwPoint;
+import com.ycl.platform.domain.result.HK.VehicleDeviceInspectionResult;
+import com.ycl.platform.domain.result.SYS.TMonitorResult;
import com.ycl.platform.domain.result.UY.MonitorQualifyResult;
import com.ycl.platform.domain.result.UY.OneMachineFileResult;
import com.ycl.platform.domain.result.UY.OsdCheckResult;
@@ -18,6 +21,7 @@
import com.ycl.system.service.ISysDictDataService;
import com.ycl.utils.DateUtils;
import com.ycl.utils.StringUtils;
+import constant.CheckConstants;
import constant.RedisConstant;
import enumeration.general.AreaDeptEnum;
import enumeration.general.PointStatus;
@@ -57,14 +61,28 @@
@Autowired
private RedisTemplate redisTemplate;
+ //鍚屾鐐逛綅鍦ㄧ嚎鐜囧埌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");
+// }
+ }
+
//鍚屾mongodb涓�鏈轰竴妗ｅ埌鏁版嵁搴�
+ @Transactional(rollbackFor = Exception.class)
public void synchronize() {
log.info("寮�濮嬪悓姝ongodb涓�鏈轰竴妗ｅ埌鏁版嵁搴�");
- Date yesterday = DateUtils.addDays(new Date(), -1);
- Query query = new Query(Criteria.where("mongoCreateTime").gte(DateUtils.getDayStart(yesterday)).lt(DateUtils.getDayEnd(yesterday)));
+// 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鍝佺墝鏁版嵁
- //TODO:娴嬭瘯鏀逛负浠婂ぉ
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琛ㄦ暟鎹�
@@ -88,7 +106,7 @@
//鍏ㄥ勾鐣欏瓨
for (MonitorQualifyResult result : oneMachineFileResults) {
- TMonitor monitor = getMonitor(result, monitorVOMap,osdMap);
+ TMonitor monitor = getMonitor(result, monitorVOMap, osdMap);
YwPoint point = getPoint(result, pointMap, importantSite);
monitorList.add(monitor);
ywPointList.add(point);
@@ -100,12 +118,12 @@
//娣诲姞鑰佹暟鎹�
List<String> numbers = CollectionUtils.isEmpty(monitorList) ? new ArrayList<>() : monitorList.stream().map(TMonitor::getSerialNumber).collect(Collectors.toList());
monitorVOMap.forEach((key, value) -> {
- if (!numbers.contains(key)){
+ if (!numbers.contains(key)) {
TMonitor monitor = new TMonitor();
- BeanUtils.copyProperties(value,monitor);
+ BeanUtils.copyProperties(value, monitor);
//濉ˉ鍝佺墝
OsdCheckResult osdCheckResult = osdMap.get(key);
- if(osdCheckResult!=null) {
+ if (osdCheckResult != null) {
monitor.setDeviceType(osdCheckResult.getDeviceBrand());
}
monitorList.add(monitor);
@@ -113,7 +131,7 @@
});
List<String> points = CollectionUtils.isEmpty(ywPointList) ? new ArrayList<>() : ywPointList.stream().map(YwPoint::getSerialNumber).collect(Collectors.toList());
pointMap.forEach((key, value) -> {
- if (!points.contains(key)){
+ if (!points.contains(key)) {
ywPointList.add(value);
}
});
@@ -128,8 +146,8 @@
ywPointMapper.deleteAll();
ywPointService.saveBatch(ywPointList);
}
- //鏂扮殑鏁版嵁鏀惧叆Redis涓瓑寰呰�冩牳鎸囨爣浠诲姟浣跨敤
- redisTemplate.opsForValue().set(RedisConstant.New_Monitor_Set, JSONArray.toJSONString(newMonitorList));
+ //鏂扮殑鏁版嵁鏀惧叆Redis涓瓑寰呰�冩牳鎸囨爣浠诲姟浣跨敤(寮冪敤锛屾敼涓烘爣绛惧舰寮�)
+// redisTemplate.opsForValue().set(RedisConstant.New_Monitor_Set, JSONArray.toJSONString(newMonitorList));
log.info("缁撴潫鍚屾mongodb涓�鏈轰竴妗ｅ埌鏁版嵁搴�");
}
@@ -167,13 +185,13 @@
return ywPoint;
}
- private TMonitor getMonitor(MonitorQualifyResult result, Map<String, TMonitorVO> monitorVOMap, Map<String, OsdCheckResult> osdMap) {
+ private TMonitor getMonitor(MonitorQualifyResult result, Map<String, TMonitorVO> monitorVOMap, Map<String, OsdCheckResult> osdMap) {
TMonitor monitor = new TMonitor();
if (monitorVOMap.containsKey(result.getSerialNumber().getValue())) {
monitor.setId(monitorVOMap.get(result.getSerialNumber().getValue()).getId());
//鏇存柊鍝佺墝
OsdCheckResult osdCheckResult = osdMap.get(result.getSerialNumber().getValue());
- if(osdCheckResult!=null) {
+ if (osdCheckResult != null) {
monitor.setDeviceType(osdCheckResult.getDeviceBrand());
}
}
--
Gitblit v1.8.0