From 98a45e34ab4a6740f95980040fa9207a779b2529 Mon Sep 17 00:00:00 2001
From: fuliqi <fuliqi@qq.com>
Date: 星期六, 12 十月 2024 16:31:18 +0800
Subject: [PATCH] 点位在线web修复+点位考核状态字段

---
 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 b610016..a97d502 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()

--
Gitblit v1.8.0