From dbf1793b62b69f824a401242cfd5430dd4992fa8 Mon Sep 17 00:00:00 2001
From: fuliqi <fuliqi@qq.com>
Date: 星期一, 18 十一月 2024 12:01:14 +0800
Subject: [PATCH] 运行监控导出

---
 ycl-server/src/main/java/com/ycl/task/MonitorTask.java |   29 +++++++++++++++++------------
 1 files changed, 17 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 7026520..91c191c 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;
@@ -62,18 +63,18 @@
     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");
-        }
-    }
+//    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涓�鏈轰竴妗e埌鏁版嵁搴�
     @Transactional(rollbackFor = Exception.class)
@@ -121,6 +122,7 @@
                 if (osdCheckResult != null) {
                     monitor.setDeviceType(osdCheckResult.getDeviceBrand());
                 }
+
                 monitorList.add(monitor);
             }
         });
@@ -129,6 +131,8 @@
             //鑰佽澶囩姸鎬佹敼涓轰笉鍙備笌鑰冩牳
             if (!points.contains(key)) {
                 value.setExamineStatus(Boolean.FALSE);
+                //鍗曚綅璁剧疆涓虹┖
+                value.setUnitId(null);
                 ywPointList.add(value);
             }
         });
@@ -161,6 +165,7 @@
             ywPoint.setImportantCommandImageTag(Boolean.FALSE);
             ywPoint.setCreateTime(new Date());
             ywPoint.setUpdateTime(new Date());
+            ywPoint.setOnline(ApiConstants.UY_OnlineSite_Unknown);
         }
         //鐘舵�佽缃负鑰冩牳璁惧
         ywPoint.setExamineStatus(Boolean.TRUE);

--
Gitblit v1.8.0