From b91945ea32378a71d1e57356af6e16703a1ceaa7 Mon Sep 17 00:00:00 2001
From: fuliqi <fuliqi@qq.com>
Date: 星期五, 01 十一月 2024 14:52:16 +0800
Subject: [PATCH] 工单只下发考核的、阈值bug

---
 ycl-server/src/main/java/com/ycl/utils/CheckPointUtil.java |   57 +++++++++++++++++++++++++++++++++------------------------
 1 files changed, 33 insertions(+), 24 deletions(-)

diff --git a/ycl-server/src/main/java/com/ycl/utils/CheckPointUtil.java b/ycl-server/src/main/java/com/ycl/utils/CheckPointUtil.java
index 8edbed3..a3fbf48 100644
--- a/ycl-server/src/main/java/com/ycl/utils/CheckPointUtil.java
+++ b/ycl-server/src/main/java/com/ycl/utils/CheckPointUtil.java
@@ -48,20 +48,18 @@
      */
     public TMonitorResult check(TMonitorResult monitor) {
         // 鍏堟娴嬭兘鍚﹁闂ip鐨勭綉椤�
-        ResponseEntity<Object> res = null;
-        log.info("鐩戞祴IP锛�" + monitor.getIp());
+        ResponseEntity<String> res = null;
         String prefix = "http://";
         if ("127.0.0.1".equals(monitor.getIp())) {
-            monitor.setOnline(Boolean.FALSE);
+            monitor.setPingOnline(Boolean.FALSE);
             return monitor;
         }
         try {
             res = selfHttpUtil.get(prefix + monitor.getIp(), null, null);
-            monitor.setOnline(Objects.nonNull(res) && HttpStatus.OK == res.getStatusCode());
+            monitor.setPingOnline(Objects.nonNull(res) && HttpStatus.OK == res.getStatusCode());
         } catch (Exception e) {
-            monitor.setOnline(Boolean.FALSE);
+            monitor.setPingOnline(Boolean.FALSE);
         }
-
         // 濡傛灉http寰楀埌鐨勪笉鍦ㄧ嚎锛岄偅涔堝啀ping涓�涓�
         boolean reachable = false;
         Integer checkTimes = 1;
@@ -73,15 +71,15 @@
         } else {
             map = new HashMap<>();
         }
-        if (!monitor.getOnline()) {
+        if (!monitor.getPingOnline()) {
             try {
-                reachable = InetAddress.getByName(monitor.getIp()).isReachable(3000);
+                reachable = InetAddress.getByName(monitor.getIp()).isReachable(5000);
             } catch (IOException e) {
                 e.printStackTrace();
             }
-            monitor.setOnline(reachable);
+            monitor.setPingOnline(reachable);
         }
-        if (!monitor.getOnline()) {
+        if (!monitor.getPingOnline()) {
             offLineTimes++;
         }
         map.put("checkTimes", checkTimes);
@@ -116,9 +114,10 @@
         }
         boolean webReachable = false;
         try {
-            ResponseEntity<Object> res = selfHttpUtil.get(prefix + checkUtil.getIp(), null, null);
+            ResponseEntity<String> res = selfHttpUtil.get(prefix + checkUtil.getIp(), null, null);
             webReachable = Objects.nonNull(res) && HttpStatus.OK == res.getStatusCode();
         } catch (Exception e) {
+            log.info("妫�娴媤eb寮傚父"+e.getMessage());
             webReachable = Boolean.FALSE;
         }
         // ping
@@ -131,31 +130,39 @@
         } catch (IOException e) {
             e.printStackTrace();
         }
-
         String imgUrl = "";
-        // 鏌ュ嚭鍥芥爣璁惧锛屽氨涓�鏉℃暟鎹�
-        List<DeviceInfo> gbDevices = new LambdaQueryChainWrapper<>(deviceInfoMapper)
-                .orderByDesc(DeviceInfo::getUpdateTime)
-                .last("limit 1")
-                .list();
-        if (! CollectionUtils.isEmpty(gbDevices)) {
-            try {
-                imgUrl = workOrderService.getFrameImgByDevice(gbDevices.get(0).getDeviceId(), checkUtil.getSerialNumber(), IdUtils.workOrderNO(new Date(), "99999"));
-                result.setImg(imgUrl);
-            } catch (Exception e) {
-                e.printStackTrace();
+        if(pingReachable || webReachable) {
+            // 鏌ュ嚭鍥芥爣璁惧锛屽氨涓�鏉℃暟鎹�
+            List<DeviceInfo> gbDevices = new LambdaQueryChainWrapper<>(deviceInfoMapper)
+                    .orderByDesc(DeviceInfo::getUpdateTime)
+                    .last("limit 1")
+                    .list();
+            if (!CollectionUtils.isEmpty(gbDevices)) {
+                try {
+                    imgUrl = workOrderService.getFrameImgByDevice(gbDevices.get(0).getDeviceId(), checkUtil.getSerialNumber(), IdUtils.workOrderNO(new Date(), "99999"));
+                    result.setImg(imgUrl);
+                } catch (Exception e) {
+                    e.printStackTrace();
+                }
             }
         }
-
         String status = "";
         if (! webReachable) {
             status += "璁惧web璁块棶澶辫触锛�";
+        }else if(webReachable){
+            status += "璁惧web璁块棶姝ｅ父锛�";
         }
+
         if (! pingReachable) {
             status += "璁惧ip鏈猵ing閫氾紱";
+        }else if(pingReachable){
+            status += "璁惧ipPing姝ｅ父锛�";
         }
+
         if (StringUtils.isEmpty(imgUrl)) {
             status += "鏈幏鍙栧埌鍥剧墖";
+        }else {
+            status += "鑾峰彇鍥剧墖姝ｅ父";
         }
         result.setStatus(status);
         return result;
@@ -188,6 +195,8 @@
         String status = "";
         if (! pingReachable) {
             status += "ip鏈猵ing閫氾紱";
+        }else {
+            status += "鎴愬姛";
         }
         result.setStatus(status);
         return result;

--
Gitblit v1.8.0