From f962534ae431779f3e341365af2e30fdd0afeb0f Mon Sep 17 00:00:00 2001 From: fuliqi <fuliqi@qq.com> Date: 星期日, 13 十月 2024 16:20:13 +0800 Subject: [PATCH] 点位在线率恢复为取优云和海康数据 --- ycl-server/src/main/java/com/ycl/task/UYTask.java | 14 ++++++++++---- 1 files changed, 10 insertions(+), 4 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 b610016..a196083 100644 --- a/ycl-server/src/main/java/com/ycl/task/UYTask.java +++ b/ycl-server/src/main/java/com/ycl/task/UYTask.java @@ -174,6 +174,7 @@ /** * 鐐逛綅鍦ㄧ嚎妫�娴� */ + //TODO锛氳棰戠绾挎鏁般�佺洃娴嬫鏁帮紙淇敼閫昏緫鍙拡瀵瑰伐鍗曪紝妫�娴嬪湪绾跨殑锛� public void pointOnline() throws ExecutionException, InterruptedException { log.info("寮�濮嬫娴嬬偣浣嶅湪绾�"); Integer times = 2; @@ -203,12 +204,12 @@ OnlineCheckThread thread = new OnlineCheckThread(monitor, checkPointUtil, time); return thread.call(); // 鍋囪 OnlineCheckThread 瀹炵幇浜� Callable 鎺ュ彛 }, executorService) - .orTimeout(30, TimeUnit.SECONDS) + .orTimeout(40, 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; @@ -241,6 +242,8 @@ allOf.get(35, TimeUnit.SECONDS); // 缁欎簣棰濆鐨�5绉掓潵鏀堕泦缁撴灉 } catch (TimeoutException e) { log.warn("閮ㄥ垎浠诲姟鏈湪鎸囧畾鏃堕棿鍐呭畬鎴�"); + } catch (Exception e2){ + log.error("鏁版嵁鏀堕泦寮傚父"+e2); } dataList = futureList.stream() @@ -276,7 +279,7 @@ log.info("鐐逛綅鍦ㄧ嚎鐩戞祴瀹屾垚"); } - //锛堝純鐢級鐐逛綅鍦ㄧ嚎鐜� + //鐐逛綅鍦ㄧ嚎鐜囷紙浼樹簯锛� public void videoOnlineTask() { //瑙嗛鍥惧儚璐ㄩ噺 log.info("寮�濮嬫墽琛岀偣浣嶅湪绾挎暟鎹悓姝�"); @@ -298,6 +301,8 @@ Query query = new Query(Criteria .where("mongoCreateTime").gte(DateUtils.getDayStart(new Date())).lt(DateUtils.getDayEnd(new Date()))); DeleteResult result = mongoTemplate.remove(query, VideoOnlineResult.class); + //鎵撴爣绛� + pointService.setDeviceTagByGB(records); //瀛樻斁鍦╩ongo涓� mongoTemplate.insertAll(records); // 宸ュ崟鐢熸垚 @@ -346,6 +351,7 @@ item.setNo(item.getDeviceId()); } }); + //鎵撴爣绛� pointService.setDeviceTagByGB(records); //瀛樻斁鍦╩ongo涓� mongoTemplate.insertAll(records); -- Gitblit v1.8.0