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/utils/CheckPointUtil.java | 36 +++++++++++++++++++++---------------
1 files changed, 21 insertions(+), 15 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 fc06f30..8e97e3a 100644
--- a/ycl-server/src/main/java/com/ycl/utils/CheckPointUtil.java
+++ b/ycl-server/src/main/java/com/ycl/utils/CheckPointUtil.java
@@ -48,7 +48,7 @@
*/
public TMonitorResult check(TMonitorResult monitor) {
// 鍏堟娴嬭兘鍚﹁闂ip鐨勭綉椤�
- ResponseEntity<Object> res = null;
+ ResponseEntity<String> res = null;
log.info("鐩戞祴IP锛�" + monitor.getIp());
String prefix = "http://";
if ("127.0.0.1".equals(monitor.getIp())) {
@@ -115,9 +115,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
@@ -130,22 +131,22 @@
} 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璁块棶澶辫触锛�";
@@ -155,6 +156,9 @@
}
if (StringUtils.isEmpty(imgUrl)) {
status += "鏈幏鍙栧埌鍥剧墖";
+ }
+ if (StringUtils.isEmpty(status)) {
+ status += "璁惧姝ｅ父";
}
result.setStatus(status);
return result;
@@ -187,6 +191,8 @@
String status = "";
if (! pingReachable) {
status += "ip鏈猵ing閫氾紱";
+ }else {
+ status += "鎴愬姛";
}
result.setStatus(status);
return result;
--
Gitblit v1.8.0