From 2150b0b87de4ec80a9d3f968c6de947f361ca19f Mon Sep 17 00:00:00 2001 From: fuliqi <fuliqi@qq.com> Date: 星期五, 15 十一月 2024 11:36:06 +0800 Subject: [PATCH] 在线监测对于纯车辆人脸可以恢复在线状态 --- ycl-server/src/main/java/com/ycl/task/UYTask.java | 158 ++++++++++++++++++++++++++++++++++------------------ 1 files changed, 103 insertions(+), 55 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 3afaece..7527055 100644 --- a/ycl-server/src/main/java/com/ycl/task/UYTask.java +++ b/ycl-server/src/main/java/com/ycl/task/UYTask.java @@ -40,6 +40,7 @@ import java.text.SimpleDateFormat; import java.util.*; import java.util.concurrent.*; +import java.util.function.Function; import java.util.stream.Collectors; //浼樹簯瀵规帴鏁版嵁浠诲姟 @@ -172,7 +173,7 @@ } /** - * 鐐逛綅鍦ㄧ嚎妫�娴� + * 鐐逛綅鍦ㄧ嚎PING妫�娴� */ public void pointOnline() throws ExecutionException, InterruptedException { log.info("寮�濮嬫娴嬬偣浣嶅湪绾�"); @@ -185,52 +186,63 @@ } 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())); + 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 -// } 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(30, TimeUnit.SECONDS) + .orTimeout(60, TimeUnit.SECONDS) .exceptionally(ex -> { if (ex instanceof TimeoutException) { - log.error("浠诲姟鎵ц瓒呮椂:"); + log.error("浠诲姟鎵ц瓒呮椂:"+monitor.getIp()); } else { - log.error("浠诲姟鎵ц寮傚父:" + ex); + log.error("浠诲姟鎵ц寮傚父:"+monitor.getIp() +ex); + ex.printStackTrace(); } - int checkTimes = 1; - int offLineTimes = 1; - //TODO:BUG - Map<String, Object> map = (Map<String, Object>) redisTemplate.opsForHash().get(RedisConstant.ONLINE_KEY, monitor.getIp()); - if (!CollectionUtils.isEmpty(map)) { - checkTimes = (Integer) map.get("checkTimes") + 1; - offLineTimes = (Integer) map.get("offLineTimes"); - } - monitor.setOnline(Boolean.FALSE); - monitor.setCheckCount(checkTimes); - monitor.setOffLineCount(offLineTimes); - if (monitor.getOffLineCount() >= time) { - WorkOrder workOrder = new WorkOrder(); - workOrder.setSerialNumber(monitor.getNo()); - List<String> errList = new ArrayList<>(); - errList.add(ErrorType.DEVICE_OFFLINE.getValue()); - workOrder.setErrorTypeList(errList); - workOrder.setStatus(WorkOrderStatusEnum.DISTRIBUTED); - monitor.setWorkOrder(workOrder); - } - return monitor; // 杩斿洖澶辫触鐨勭粨鏋� + return null; +// int checkTimes = 1; +// int offLineTimes = 1; +// Map<String, Object> map = (Map<String, Object>) redisTemplate.opsForHash().get(RedisConstant.ONLINE_KEY, monitor.getNo()); +// if (!CollectionUtils.isEmpty(map)) { +// checkTimes = (Integer) map.get("checkTimes") + 1; +// offLineTimes = (Integer) map.get("offLineTimes"); +// }else { +// map = new HashMap<>(); +// } +// monitor.setPingOnline(Boolean.FALSE); +// monitor.setCheckCount(checkTimes); +// monitor.setOffLineCount(offLineTimes); +// List<Date> offLineTime = monitor.getOffLineTime(); +// if(CollectionUtils.isEmpty(offLineTime)) offLineTime = new ArrayList<>(); +// offLineTime.add(new Date()); +// monitor.setOffLineTime(offLineTime); +// if (monitor.getOffLineCount() >= time) { +// WorkOrder workOrder = new WorkOrder(); +// workOrder.setSerialNumber(monitor.getNo()); +// List<String> errList = new ArrayList<>(); +// errList.add(ErrorType.DEVICE_OFFLINE.getValue()); +// workOrder.setErrorTypeList(errList); +// workOrder.setStatus(WorkOrderStatusEnum.DISTRIBUTED); +// monitor.setWorkOrder(workOrder); +// } +// map.put("checkTimes", checkTimes); +// map.put("offLineTimes", offLineTimes); +// redisTemplate.opsForHash().put(RedisConstant.ONLINE_KEY, monitor.getNo(), map); +// return monitor; // 杩斿洖澶辫触鐨勭粨鏋� + })) .collect(Collectors.toList()); @@ -239,35 +251,31 @@ futureList.toArray(new CompletableFuture[0]) ); try { - allOf.get(35, TimeUnit.SECONDS); // 缁欎簣棰濆鐨�5绉掓潵鏀堕泦缁撴灉 + allOf.get(60, TimeUnit.SECONDS); // 缁欎簣棰濆鐨�5绉掓潵鏀堕泦缁撴灉 } catch (TimeoutException e) { - log.warn("閮ㄥ垎浠诲姟鏈湪鎸囧畾鏃堕棿鍐呭畬鎴�"); + log.error("閮ㄥ垎浠诲姟鏈湪鎸囧畾鏃堕棿鍐呭畬鎴�"); } catch (Exception e2){ log.error("鏁版嵁鏀堕泦寮傚父"+e2); } dataList = futureList.stream() .map(CompletableFuture::join) - .filter(result -> result != null) + .filter(Objects::nonNull) .collect(Collectors.toList()); - // 鏇存柊point琛ㄧ殑鍦ㄧ嚎鏍囪瘑 + //绛涢�夊嚭ping绂荤嚎鐨勮澶囷紝鏇存敼鏁版嵁搴撲负绂荤嚎锛屽苟涓旀洿鏂扮函杞﹁締鎴栫函浜鸿劯鐨勮澶囩殑鍦ㄧ嚎鐘舵��(杩欓儴鍒嗚澶囦笉浼氭媺娴佹娴�) Date now = new Date(); - List<UpdateOnlineVO> willUpdateList = dataList.stream().map(item -> { + List<UpdateOnlineVO> onlineUpdateList = dataList.stream().map(item -> { UpdateOnlineVO vo = new UpdateOnlineVO(); - vo.setOnline(item.getOnline()); + if(item.getPingOnline()) { + vo.setOnline(ApiConstants.UY_OnlineSite_Online); + }else if(!item.getPingOnline()){ + vo.setOnline(ApiConstants.UY_OnlineSite_Offline); + } 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) - .collect(Collectors.toList()); - if (!CollectionUtils.isEmpty(workOrderList)) { - workOrderService.innerAddWorkOrder(workOrderList); - } + monitorMapper.updateOnline(onlineUpdateList); //瀛樻斁鍒癿ongo if (!CollectionUtils.isEmpty(dataList)) { //濡傛灉瀛樺湪涔嬪墠鐨勬暟鎹厛鍒犻櫎 @@ -276,10 +284,25 @@ //瀛樻斁鍦╩ongo涓� mongoTemplate.insertAll(dataList); } + //宸ュ崟锛堝悓涓�IP鍙敓鎴愪竴涓伐鍗曪級 + List<WorkOrder> workOrderList = dataList.stream() + .filter(item -> Objects.nonNull(item.getWorkOrder())) + .collect(Collectors.toMap( + TMonitorResult::getIp, + Function.identity(), + (existing, replacement) -> existing // 濡傛灉閬囧埌鐩稿悓鐨� IP锛屼繚鐣欑涓�涓� TMonitorResult 瀵硅薄 + )) + .values() + .stream() + .map(TMonitorResult::getWorkOrder) + .collect(Collectors.toList()); + if (!CollectionUtils.isEmpty(workOrderList)) { + workOrderService.innerAddWorkOrder(workOrderList); + } log.info("鐐逛綅鍦ㄧ嚎鐩戞祴瀹屾垚"); } - //锛堝純鐢級鐐逛綅鍦ㄧ嚎鐜� + //鐐逛綅鍦ㄧ嚎鐜囷紙浼樹簯锛� public void videoOnlineTask() { //瑙嗛鍥惧儚璐ㄩ噺 log.info("寮�濮嬫墽琛岀偣浣嶅湪绾挎暟鎹悓姝�"); @@ -301,10 +324,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); //瀛樻斁鍦╩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.updateOnline(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); } @@ -349,11 +396,12 @@ item.setNo(item.getDeviceId()); } }); + //鎵撴爣绛� pointService.setDeviceTagByGB(records); //瀛樻斁鍦╩ongo涓� mongoTemplate.insertAll(records); - // 宸ュ崟鐢熸垚 - uyErrorTypeCheckService.recordMetaDSumCheck(records); +// // 宸ュ崟鐢熸垚 +// uyErrorTypeCheckService.recordMetaDSumCheck(records); } } else { log.error("褰曞儚鍙敤鏁版嵁涓虹┖{}", jsonObject); -- Gitblit v1.8.0