From 746a85a842adc99322b364d1c564a624dce62429 Mon Sep 17 00:00:00 2001
From: fuliqi <fuliqi@qq.com>
Date: 星期三, 30 十月 2024 23:01:49 +0800
Subject: [PATCH] 工单阈值bug、工单分页故障查询bug、工单未进入下发表bug
---
ycl-server/src/main/java/com/ycl/utils/CheckPointUtil.java | 26 +++++++++++++++-----------
1 files changed, 15 insertions(+), 11 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 8e97e3a..a3fbf48 100644
--- a/ycl-server/src/main/java/com/ycl/utils/CheckPointUtil.java
+++ b/ycl-server/src/main/java/com/ycl/utils/CheckPointUtil.java
@@ -49,17 +49,16 @@
public TMonitorResult check(TMonitorResult monitor) {
// 鍏堟娴嬭兘鍚﹁闂ip鐨勭綉椤�
ResponseEntity<String> res = null;
- log.info("鐩戞祴IP锛�" + monitor.getIp());
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;
@@ -72,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);
@@ -150,15 +149,20 @@
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 += "鏈幏鍙栧埌鍥剧墖";
- }
- if (StringUtils.isEmpty(status)) {
- status += "璁惧姝ｅ父";
+ }else {
+ status += "鑾峰彇鍥剧墖姝ｅ父";
}
result.setStatus(status);
return result;
--
Gitblit v1.8.0