From 71972694f7d5f23cf42226366a9ddaad4b72b89f Mon Sep 17 00:00:00 2001
From: xiangpei <xiangpei@timesnew.cn>
Date: 星期五, 20 九月 2024 09:33:06 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'

---
 ycl-server/src/main/java/com/ycl/task/MonitorTask.java |   36 ++++++++++++++++++++++++++++--------
 1 files changed, 28 insertions(+), 8 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 51ea36f..c22d088 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,30 @@
     @Autowired
     private RedisTemplate redisTemplate;
 
+    //鍚屾鐐逛綅鍦ㄧ嚎鐜囧埌mongo
+    //TODO锛氬姞瀹氭椂浠诲姟12.杩囧紑濮�
+    public void siteOnline() {
+        log.info("寮�濮嬪悓姝ョ偣浣嶅湪绾跨巼鍒癿ongo");
+        List<TMonitorResult> tMonitorResults = monitorMapper.selectMonitorResult(null,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)));
         List<MonitorQualifyResult> oneMachineFileResults = mongoTemplate.find(query, MonitorQualifyResult.class);
         //mongo鍝佺墝鏁版嵁
-        Query OSDQuery = new Query(Criteria.where("mongoCreateTime").gte(DateUtils.getDayStart(yesterday)).lt(DateUtils.getDayEnd(yesterday))));
+        Query OSDQuery = new Query(Criteria.where("mongoCreateTime").gte(DateUtils.getDayStart(yesterday)).lt(DateUtils.getDayEnd(yesterday)));
         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()));
@@ -87,7 +107,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);
@@ -99,12 +119,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);
@@ -112,7 +132,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);
             }
         });
@@ -166,13 +186,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