From 642e72cfc130d1871d959552d791ecab52493949 Mon Sep 17 00:00:00 2001
From: fuliqi <fuliqi@qq.com>
Date: 星期一, 09 十二月 2024 02:19:33 +0800
Subject: [PATCH] mysql online拆分

---
 ycl-server/src/main/java/com/ycl/task/UYTask.java |    9 ++++++---
 1 files changed, 6 insertions(+), 3 deletions(-)

diff --git a/ycl-server/src/main/java/com/ycl/task/UYTask.java b/ycl-server/src/main/java/com/ycl/task/UYTask.java
index a0a9369..227626a 100644
--- a/ycl-server/src/main/java/com/ycl/task/UYTask.java
+++ b/ycl-server/src/main/java/com/ycl/task/UYTask.java
@@ -16,6 +16,7 @@
 import com.ycl.platform.domain.result.UY.VideoOnlineResult;
 import com.ycl.platform.domain.vo.UpdateOnlineVO;
 import com.ycl.platform.mapper.TMonitorMapper;
+import com.ycl.platform.mapper.WorkOrderMapper;
 import com.ycl.platform.service.UYErrorTypeCheckService;
 import com.ycl.platform.service.WorkOrderService;
 import com.ycl.platform.service.YwPointService;
@@ -59,6 +60,7 @@
     private final YwPointService pointService;
     private final TMonitorMapper monitorMapper;
     private final WorkOrderService workOrderService;
+    private final WorkOrderMapper workOrderMapper;
     private final SysConfigMapper sysConfigMapper;
     private final CheckPointUtil checkPointUtil;
     @Value("${youYun.tenantId}")
@@ -193,7 +195,6 @@
             log.error("璇烽厤缃绾挎鏁帮紝姝ゆ璁剧疆涓洪粯璁ゅ��2");
         }
         // 鍏堟煡鍑鸿澶嘔P闆嗗悎,鍓旈櫎鎺夊湪绾挎儏鍐垫槸鏈煡鐨�,骞朵笖鍙娴嬫鍦ㄨ�冩牳鐨勮澶囬伩鍏嶅浣欏伐鍗�
-        //TODO锛氶渶瑕佹妸娴峰悍鍜屼紭浜戠殑浠诲姟鐨勬椂闂磋皟鍒皃ing涔嬪墠
         List<TMonitorResult> monitorList = monitorMapper.getDistinctIP();
         //琛ュ厖閿欒鏃堕棿鐐�
         Query onlineQuery = new Query(Criteria.where("mongoCreateTime").gte(DateUtils.getDayStart(new Date())).lt(DateUtils.getDayEnd(new Date())));
@@ -292,8 +293,10 @@
             mongoTemplate.insertAll(mongoList);
         }
         //宸ュ崟锛堝悓涓�IP鍙敓鎴愪竴涓伐鍗曪級
+        //鏌ヨ鏁版嵁搴撳凡瀛樺湪鐨勭绾垮伐鍗曡幏鍙杋p闆嗗悎锛屽墧闄�
+        List<String> ips = workOrderMapper.getOfflineWorkOrder();
         List<WorkOrder> workOrderList = dataList.stream()
-                .filter(item -> Objects.nonNull(item.getWorkOrder()))
+                .filter(item -> Objects.nonNull(item.getWorkOrder()) && (CollectionUtils.isEmpty(ips) || !ips.contains(item.getIp())))
                 .collect(Collectors.toMap(
                         TMonitorResult::getIp,
                         Function.identity(),
@@ -350,7 +353,7 @@
                             vo.setUpdateTime(now);
                             return vo;
                         }).collect(Collectors.toList());
-                        monitorMapper.updateOnline(willUpdateList);
+                        monitorMapper.updateOnlineFromUyOrHk(willUpdateList);
                         //绂荤嚎鐢熸垚宸ュ崟,涓�涓猧p鍙敓鎴愪竴涓伐鍗�
                         List<VideoOnlineResult> workOrders = new ArrayList<>(records.stream()
                                 .filter(item -> ApiConstants.UY_OnlineSite_Offline.equals(item.getStatus()))

--
Gitblit v1.8.0