From ee03b526152d335dd1e42bc01a1f717d1205204c Mon Sep 17 00:00:00 2001
From: zxl <763096477@qq.com>
Date: 星期一, 26 五月 2025 15:27:04 +0800
Subject: [PATCH] (部级录像可用率,重点录像可用率,录像可用率)计算可用率bug修复,hk接口bug修复,

---
 ycl-server/src/main/java/com/ycl/task/UYTask.java |  227 ++++++++++++++++++++++++++++++++++++++++++--------------
 1 files changed, 170 insertions(+), 57 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 5504f50..1014aee 100644
--- a/ycl-server/src/main/java/com/ycl/task/UYTask.java
+++ b/ycl-server/src/main/java/com/ycl/task/UYTask.java
@@ -5,15 +5,18 @@
 import com.ycl.feign.UYClient;
 import com.ycl.platform.domain.entity.TMonitor;
 import com.ycl.platform.domain.entity.WorkOrder;
-import com.ycl.platform.domain.entity.YwPoint;
-import com.ycl.platform.domain.param.UY.*;
+import com.ycl.platform.domain.param.UY.ImageDetectionParam;
+import com.ycl.platform.domain.param.UY.MonitorQualifyParam;
+import com.ycl.platform.domain.param.UY.RecordMetaDSumParam;
+import com.ycl.platform.domain.param.UY.VideoOnlineParam;
 import com.ycl.platform.domain.result.SYS.TMonitorResult;
+import com.ycl.platform.domain.result.UY.ImageDetectionResult;
+import com.ycl.platform.domain.result.UY.MonitorQualifyResult;
 import com.ycl.platform.domain.result.UY.RecordMetaDSumResult;
-import com.ycl.platform.domain.result.UY.*;
-import com.ycl.platform.domain.vo.OnlineThreadVO;
-import com.ycl.platform.domain.vo.TMonitorVO;
+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;
@@ -22,43 +25,42 @@
 import com.ycl.thread.OnlineCheckThread;
 import com.ycl.utils.CheckPointUtil;
 import com.ycl.utils.DateUtils;
-import com.ycl.utils.http.HttpUtils;
-import com.ycl.utils.http.SelfHttpUtil;
 import constant.ApiConstants;
+import constant.CheckConstants;
 import constant.RedisConstant;
+import enumeration.ErrorType;
+import enumeration.general.WorkOrderStatusEnum;
 import lombok.RequiredArgsConstructor;
 import lombok.extern.slf4j.Slf4j;
+import org.apache.commons.lang3.StringUtils;
+import org.springframework.beans.BeanUtils;
 import org.springframework.beans.factory.annotation.Value;
 import org.springframework.data.mongodb.core.MongoTemplate;
 import org.springframework.data.mongodb.core.query.Criteria;
 import org.springframework.data.mongodb.core.query.Query;
 import org.springframework.data.redis.core.RedisTemplate;
-import org.springframework.http.HttpStatus;
-import org.springframework.http.HttpStatusCode;
-import org.springframework.http.ResponseEntity;
 import org.springframework.stereotype.Component;
 import org.springframework.util.CollectionUtils;
 
-import java.io.IOException;
-import java.net.InetAddress;
 import java.text.SimpleDateFormat;
 import java.util.*;
 import java.util.concurrent.*;
+import java.util.function.Function;
 import java.util.stream.Collectors;
-import java.util.stream.Stream;
 
 //浼樹簯瀵规帴鏁版嵁浠诲姟
 @Slf4j
 @Component("UYTask")
 @RequiredArgsConstructor
 public class UYTask {
-
+    private final RedisTemplate redisTemplate;
     private final MongoTemplate mongoTemplate;
     private final UYClient uyClient;
     private final UYErrorTypeCheckService uyErrorTypeCheckService;
     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}")
@@ -73,8 +75,8 @@
     private String passwd;
 
     private static final ExecutorService executorService = new ThreadPoolExecutor(16,
-            128,
-            5000,
+            64,
+            60,
             TimeUnit.SECONDS,
             new ArrayBlockingQueue<>(1000),
             new ThreadPoolExecutor.CallerRunsPolicy()
@@ -105,7 +107,7 @@
                                 item.setNo(item.getDeviceId());
                             }
                         });
-                        pointService.setDeviceTagByGB(records);
+                        pointService.setDeviceTagByGB(records, CheckConstants.Rule_Category_Video);
                         //瀛樻斁鍦╩ongo涓�
                         mongoTemplate.insertAll(records);
                         // 宸ュ崟鐢熸垚
@@ -154,7 +156,7 @@
                                 item.setNo(item.getSerialNumber().getShowValue());
                             }
                         });
-                        pointService.setDeviceTagByGB(records);
+                        pointService.setDeviceTagByGB(records,CheckConstants.Rule_Category_Or);
                         pointService.setNew(records);
                         //瀛樻斁鍦╩ongo涓�
                         mongoTemplate.insertAll(records);
@@ -177,7 +179,9 @@
     }
 
     /**
-     * 鐐逛綅鍦ㄧ嚎妫�娴�
+     * 鐐逛綅鍦ㄧ嚎PING妫�娴�
+     * 浠诲姟浼氬厛鎵ц涓�娆′紭浜戝悓姝ワ紝鐒跺悗鎵цping妫�娴�
+     * online瀛楁鏉ヨ嚜浜庝紭浜戯紝pingOnline涓轰富鍔╬ing妫�娴嬬殑銆傚瓨鍏ongo缁欐暟鎹腑蹇冩煡闃�
      */
     public void pointOnline() throws ExecutionException, InterruptedException {
         log.info("寮�濮嬫娴嬬偣浣嶅湪绾�");
@@ -190,52 +194,137 @@
         } else {
             log.error("璇烽厤缃绾挎鏁帮紝姝ゆ璁剧疆涓洪粯璁ゅ��2");
         }
-        // 鍏堟煡鍑鸿澶嘔P闆嗗悎
+
+
+        // 鍏堟煡鍑鸿澶嘔P闆嗗悎,鍓旈櫎鎺夊湪绾挎儏鍐垫槸鏈煡鐨�,骞朵笖鍙娴嬫鍦ㄨ�冩牳鐨勮澶囬伩鍏嶅浣欏伐鍗�
         List<TMonitorResult> monitorList = monitorMapper.getDistinctIP();
-        List<Future<TMonitorResult>> futureList = new ArrayList<>(48);
+        //琛ュ厖閿欒鏃堕棿鐐�
+        Query onlineQuery = new Query(Criteria.where("mongoCreateTime").gte(DateUtils.getDayStart(new Date())).lt(DateUtils.getDayEnd(new Date())));
+        Map<String, TMonitorResult> mongoMap = mongoTemplate.find(onlineQuery, TMonitorResult.class)
+                .stream()
+                .collect(Collectors.toMap(TMonitorResult::getNo, Function.identity(), (existing, replacement) -> replacement));
+        for (TMonitorResult result : monitorList) {
+            TMonitorResult mongoData = mongoMap.get(result.getNo());
+            if(mongoData!=null){
+                result.setOffLineTimeStr(mongoData.getOffLineTimeStr());
+            }
+        }
         List<TMonitorResult> dataList = new ArrayList<>(48);
-        for (TMonitorResult monitor : monitorList) {
-            OnlineCheckThread thread = new OnlineCheckThread(monitor,checkPointUtil,times);
-            Future<TMonitorResult> future = executorService.submit(thread);
-            futureList.add(future);
-        }
-        for (Future<TMonitorResult> future : futureList) {
-            dataList.add(future.get()); // get鏂规硶浼氶樆濉烇紝鐭ラ亾鎷垮埌缁撴灉鎵嶇户缁墽琛宖or
-        }
-
-        // 鏇存柊point琛ㄧ殑鍦ㄧ嚎鏍囪瘑
-        Date now = new Date();
-        List<UpdateOnlineVO> willUpdateList = dataList.stream().map(item -> {
-            UpdateOnlineVO vo = new UpdateOnlineVO();
-            vo.setOnline(item.getOnline());
-            vo.setIp(item.getIp());
-            vo.setUpdateTime(now);
-            return vo;
-        }).collect(Collectors.toList());
-        monitorMapper.updateOnline(willUpdateList);
-
-        // 宸ュ崟
-        List<WorkOrder> workOrderList = dataList.stream()
-                .filter(item -> Objects.nonNull(item.getWorkOrder()))
-                .map(TMonitorResult::getWorkOrder)
+        Integer time = times;
+        List<CompletableFuture<TMonitorResult>> futureList = monitorList.stream()
+                .map(monitor -> CompletableFuture.supplyAsync(() -> {
+                            OnlineCheckThread thread = new OnlineCheckThread(monitor, checkPointUtil, time);
+                            return thread.call(); // 鍋囪 OnlineCheckThread 瀹炵幇浜� Callable 鎺ュ彛
+                        }, executorService)
+                        .orTimeout(180, TimeUnit.SECONDS)
+                        .exceptionally(ex -> {
+                            if (ex instanceof TimeoutException) {
+                                log.error("浠诲姟鎵ц瓒呮椂:"+monitor.getIp());
+                            } else {
+                                log.error("浠诲姟鎵ц寮傚父:"+monitor.getIp() +ex);
+                                ex.printStackTrace();
+                            }
+                            return null;
+                        }))
                 .collect(Collectors.toList());
-        if (CollectionUtils.isEmpty(workOrderList)) {
-            return;
+
+        // 绛夊緟鎵�鏈変换鍔″畬鎴愶紝浣嗕笉浼氭棤闄愭湡绛夊緟
+        CompletableFuture<Void> allOf = CompletableFuture.allOf(
+                futureList.toArray(new CompletableFuture[0])
+        );
+
+        try {
+            allOf.get(60, TimeUnit.SECONDS); // 缁欎簣棰濆鐨�5绉掓潵鏀堕泦缁撴灉
+        } catch (TimeoutException e) {
+            log.error("閮ㄥ垎浠诲姟鏈湪鎸囧畾鏃堕棿鍐呭畬鎴�");
+        } catch (Exception e2){
+            log.error("鏁版嵁鏀堕泦寮傚父"+e2);
         }
-        workOrderService.innerAddWorkOrder(workOrderList);
+
+        dataList = futureList.stream()
+                .map(CompletableFuture::join)
+                .filter(Objects::nonNull)
+                .collect(Collectors.toList());
+
+
+        Date now = new Date();
+        List<String> offLineList = new ArrayList<>();
+        List<String> onLineList = new ArrayList<>();
+        List<String> unKnownList = new ArrayList<>();
+        //鏌ュ嚭鏁版嵁搴撶函杞﹁締鎴栫函浜鸿劯璁惧
+//        List<String> serialNumbers = monitorMapper.selectCarOrFace().stream().map(TMonitor::getSerialNumber).collect(Collectors.toList());
+        dataList.forEach(item->{
+            if(item.getPingOnline()) {
+                onLineList.add(item.getIp());
+            } else if(!item.getPingOnline()) {
+                //绛涢�夊嚭ping绂荤嚎鐨勮澶囷紝鏇存敼鏁版嵁搴撲负绂荤嚎
+                offLineList.add(item.getIp());
+            }else {
+                unKnownList.add(item.getIp());
+            }
+        });
+        log.error("unKnownList:{}",unKnownList);
+        if(!CollectionUtils.isEmpty(offLineList)) {
+            log.error("淇敼绂荤嚎鐨勭偣浣嶉泦鍚�:{}",offLineList);
+            monitorMapper.batchUpdateOnline(offLineList, now, ApiConstants.UY_OnlineSite_Offline);
+        }
+        if(!CollectionUtils.isEmpty(onLineList)) {
+            log.error("淇敼鍦ㄧ嚎鐨勭偣浣嶉泦鍚�:{}",onLineList);
+            monitorMapper.batchUpdateOnline(onLineList, now, ApiConstants.UY_OnlineSite_Online);
+        }
         //瀛樻斁鍒癿ongo
         if (!CollectionUtils.isEmpty(dataList)) {
+            List<TMonitorResult> mongoList = new ArrayList<>();
+            dataList.forEach(item->{
+                String monitorType = item.getMonitorType();
+                //鍚屼竴涓澶囧涓被鍨嬫瘡涓被鍨嬪瓨涓�鏉℃暟鎹紝浠ユ鍦ㄤ繚鐣欐暟鎹殑鎯呭喌涓嬪尯鍒嗙渷鍘呮爣绛�
+                if(StringUtils.isNotEmpty(monitorType)){
+                    String[] monitors = monitorType.split("/");
+                    for (String type : monitors) {
+                        TMonitorResult mongoData = new TMonitorResult();
+                        BeanUtils.copyProperties(item,mongoData);
+                        mongoData.setMonitorType(type);
+                        if("1".equals(type)){
+                            mongoData.setProvinceTag(mongoData.getProvinceTagVideo());
+                        }else if("2".equals(type)){
+                            mongoData.setProvinceTag(mongoData.getProvinceTagCar());
+                        }else if("3".equals(type)){
+                            mongoData.setProvinceTag(mongoData.getProvinceTagFace());
+                        }
+                        mongoList.add(mongoData);
+                    }
+                }
+            });
             //濡傛灉瀛樺湪涔嬪墠鐨勬暟鎹厛鍒犻櫎
             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(dataList);
-            log.info("缁撴潫鍚屾鐐逛綅鍦ㄧ嚎鐜囧埌mongo");
+
+            log.error("瀛樺叆鍚屾鍦ㄧ嚎mongo鏁版嵁{}" , mongoList );
+            mongoTemplate.insertAll(mongoList);
+        }
+        //宸ュ崟锛堝悓涓�IP鍙敓鎴愪竴涓伐鍗曪級
+        //鏌ヨ鏁版嵁搴撳凡瀛樺湪鐨勭绾垮伐鍗曡幏鍙杋p闆嗗悎锛屽墧闄�
+        List<String> ips = workOrderMapper.getOfflineWorkOrder();
+        List<WorkOrder> workOrderList = dataList.stream()
+                .filter(item -> Objects.nonNull(item.getWorkOrder()) && (CollectionUtils.isEmpty(ips) || !ips.contains(item.getIp())))
+                .collect(Collectors.toMap(
+                        TMonitorResult::getIp,
+                        Function.identity(),
+                        (existing, replacement) -> existing // 濡傛灉閬囧埌鐩稿悓鐨� IP锛屼繚鐣欑涓�涓� TMonitorResult 瀵硅薄
+                ))
+                .values()
+                .stream()
+                .map(TMonitorResult::getWorkOrder)
+                .collect(Collectors.toList());
+        if (!CollectionUtils.isEmpty(workOrderList)) {
+            log.error("pointOnline鑾峰緱鎻掑叆宸ュ崟:{}",workOrderList);
+            workOrderService.innerAddWorkOrder(workOrderList);
         }
         log.info("鐐逛綅鍦ㄧ嚎鐩戞祴瀹屾垚");
     }
 
-    //锛堝純鐢級鐐逛綅鍦ㄧ嚎鐜�
+    //鐐逛綅鍦ㄧ嚎鐜囷紙浼樹簯锛�
     public void videoOnlineTask() {
         //瑙嗛鍥惧儚璐ㄩ噺
         log.info("寮�濮嬫墽琛岀偣浣嶅湪绾挎暟鎹悓姝�");
@@ -257,10 +346,34 @@
                         Query query = new Query(Criteria
                                 .where("mongoCreateTime").gte(DateUtils.getDayStart(new Date())).lt(DateUtils.getDayEnd(new Date())));
                         DeleteResult result = mongoTemplate.remove(query, VideoOnlineResult.class);
+                        //鎵撴爣绛�
+                        records.forEach(item -> {
+                            if (Objects.nonNull(item.getDeviceId())) {
+                                item.setNo(item.getDeviceId());
+                            }
+                        });
+                        pointService.setDeviceTagByGB(records,CheckConstants.Rule_Category_Video);
                         //瀛樻斁鍦╩ongo涓�
                         mongoTemplate.insertAll(records);
-                        // 宸ュ崟鐢熸垚
-                        uyErrorTypeCheckService.videoOnlineCheck(records);
+                        //鏇存柊point琛ㄥ湪绾跨姸鎬�
+                        Date now = new Date();
+                        List<UpdateOnlineVO> willUpdateList = records.stream().map(item -> {
+                            UpdateOnlineVO vo = new UpdateOnlineVO();
+                            vo.setOnline(item.getStatus());
+                            vo.setIp(item.getIpAddr());
+                            vo.setUpdateTime(now);
+                            return vo;
+                        }).collect(Collectors.toList());
+                        monitorMapper.updateOnlineFromUyOrHk(willUpdateList);
+                        //绂荤嚎鐢熸垚宸ュ崟,涓�涓猧p鍙敓鎴愪竴涓伐鍗�
+                        List<VideoOnlineResult> workOrders = new ArrayList<>(records.stream()
+                                .filter(item -> ApiConstants.UY_OnlineSite_Offline.equals(item.getStatus()))
+                                .collect(Collectors.toMap(
+                                        VideoOnlineResult::getIpAddr,
+                                        Function.identity(),
+                                        (existing, replacement) -> existing // 濡傛灉閬囧埌鐩稿悓鐨� IP锛屼繚鐣欑涓�涓紙existing锛�
+                                )).values());
+                        uyErrorTypeCheckService.videoOnlineCheck(workOrders);
                     } else {
                         log.error("鐐逛綅鍦ㄧ嚎缁撴灉鏁版嵁涓虹┖{}", data);
                     }
@@ -305,11 +418,12 @@
                             item.setNo(item.getDeviceId());
                         }
                     });
-                    pointService.setDeviceTagByGB(records);
+                    //鎵撴爣绛�
+                    pointService.setDeviceTagByGB(records,CheckConstants.Rule_Category_Video);
                     //瀛樻斁鍦╩ongo涓�
                     mongoTemplate.insertAll(records);
-                    // 宸ュ崟鐢熸垚
-                    uyErrorTypeCheckService.recordMetaDSumCheck(records);
+//                    // 宸ュ崟鐢熸垚
+//                    uyErrorTypeCheckService.recordMetaDSumCheck(records);
                 }
             } else {
                 log.error("褰曞儚鍙敤鏁版嵁涓虹┖{}", jsonObject);
@@ -320,7 +434,6 @@
 //        uyErrorTypeCheckService.recordMetaDSumCheck(mongoTemplate.find(query, RecordMetaDSumResult.class));
         log.info("缁撴潫鎵ц褰曞儚鍙敤鏁版嵁鍚屾");
     }
-
 
 
 }

--
Gitblit v1.8.0