From 35d325f87d78d942d78a538dd36d5317f0876313 Mon Sep 17 00:00:00 2001 From: fuliqi <fuliqi@qq.com> Date: 星期二, 15 十月 2024 19:03:55 +0800 Subject: [PATCH] 异常恢复的统计数bug --- ycl-server/src/main/java/com/ycl/task/UYTask.java | 60 +++++++++++++++++++++++++++++++++++------------------------- 1 files changed, 35 insertions(+), 25 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..49ea8ea 100644 --- a/ycl-server/src/main/java/com/ycl/task/UYTask.java +++ b/ycl-server/src/main/java/com/ycl/task/UYTask.java @@ -172,8 +172,9 @@ } /** - * 鐐逛綅鍦ㄧ嚎妫�娴� + * 鐐逛綅鍦ㄧ嚎PING妫�娴� */ + //TODO锛氱偣浣嶅湪绾匡紙淇敼閫昏緫鍙拡瀵瑰伐鍗曪級 public void pointOnline() throws ExecutionException, InterruptedException { log.info("寮�濮嬫娴嬬偣浣嶅湪绾�"); Integer times = 2; @@ -185,40 +186,30 @@ } else { log.error("璇烽厤缃绾挎鏁帮紝姝ゆ璁剧疆涓洪粯璁ゅ��2"); } - // 鍏堟煡鍑鸿澶嘔P闆嗗悎 + // 鍏堟煡鍑哄湪绾跨殑璁惧IP闆嗗悎,鍓旈櫎鎺夊湪绾挎儏鍐垫槸鏈煡鐨�,骞朵笖鍙娴嬫鍦ㄨ�冩牳鐨勮澶囬伩鍏嶅浣欏伐鍗� List<TMonitorResult> monitorList = monitorMapper.getDistinctIP(); -// List<Future<TMonitorResult>> futureList = new ArrayList<>(48); 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); } 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.setPingOnline(Boolean.FALSE); monitor.setCheckCount(checkTimes); monitor.setOffLineCount(offLineTimes); if (monitor.getOffLineCount() >= time) { @@ -239,7 +230,7 @@ futureList.toArray(new CompletableFuture[0]) ); try { - allOf.get(35, TimeUnit.SECONDS); // 缁欎簣棰濆鐨�5绉掓潵鏀堕泦缁撴灉 + allOf.get(60, TimeUnit.SECONDS); // 缁欎簣棰濆鐨�5绉掓潵鏀堕泦缁撴灉 } catch (TimeoutException e) { log.warn("閮ㄥ垎浠诲姟鏈湪鎸囧畾鏃堕棿鍐呭畬鎴�"); } catch (Exception e2){ @@ -248,19 +239,19 @@ 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> willUpdateList = dataList.stream().filter(result->!result.getPingOnline()).map(item -> { UpdateOnlineVO vo = new UpdateOnlineVO(); - vo.setOnline(item.getOnline()); + vo.setOnline(item.getPingOnline()?ApiConstants.UY_OnlineSite_Online: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) @@ -279,7 +270,7 @@ log.info("鐐逛綅鍦ㄧ嚎鐩戞祴瀹屾垚"); } - //锛堝純鐢級鐐逛綅鍦ㄧ嚎鐜� + //鐐逛綅鍦ㄧ嚎鐜囷紙浼樹簯锛� public void videoOnlineTask() { //瑙嗛鍥惧儚璐ㄩ噺 log.info("寮�濮嬫墽琛岀偣浣嶅湪绾挎暟鎹悓姝�"); @@ -301,10 +292,28 @@ 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); + //绂荤嚎鐢熸垚宸ュ崟 + List<VideoOnlineResult> workOrders = records.stream().filter(item -> ApiConstants.UY_OnlineSite_Offline.equals(item.getStatus())).collect(Collectors.toList()); + uyErrorTypeCheckService.videoOnlineCheck(workOrders); } else { log.error("鐐逛綅鍦ㄧ嚎缁撴灉鏁版嵁涓虹┖{}", data); } @@ -349,6 +358,7 @@ item.setNo(item.getDeviceId()); } }); + //鎵撴爣绛� pointService.setDeviceTagByGB(records); //瀛樻斁鍦╩ongo涓� mongoTemplate.insertAll(records); -- Gitblit v1.8.0