From 6163071d23cd8976ab2379af2fb33ce93073c7cb Mon Sep 17 00:00:00 2001
From: sunjianxi <839419401@qq.com>
Date: Mon, 23 Sep 2024 16:44:01 +0800
Subject: [PATCH] =?UTF-8?q?=E8=AE=BE=E5=A4=87=E7=9B=91=E6=8E=A7?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../impl/ConfigMonitorServiceImpl.java        | 20 ++++++++++++++++---
 .../modules/monitor/task/MonitorTaskJob.java  |  3 ++-
 2 files changed, 19 insertions(+), 4 deletions(-)

diff --git a/src/main/java/org/springblade/modules/monitor/service/impl/ConfigMonitorServiceImpl.java b/src/main/java/org/springblade/modules/monitor/service/impl/ConfigMonitorServiceImpl.java
index c5e5ab5..84846e0 100644
--- a/src/main/java/org/springblade/modules/monitor/service/impl/ConfigMonitorServiceImpl.java
+++ b/src/main/java/org/springblade/modules/monitor/service/impl/ConfigMonitorServiceImpl.java
@@ -87,11 +87,20 @@ public class ConfigMonitorServiceImpl extends ServiceImpl<ConfigMonitorMapper, C
 						}else{
 							String[] strs = s.split("\"");
 							result = strs[strs.length-2];
-							monitor.setStatus(MonitorConstant.STATUS_1);
+							if(MonitorConstant.RESULT.equals(result)){
+								monitor.setStatus(MonitorConstant.STATUS_2);
+							}else{
+								monitor.setStatus(MonitorConstant.STATUS_1);
+							}
+
 						}
                         monitor.setResult(result);
-						if(monitor.getType().equals(MonitorConstant.SERVICE) && MonitorConstant.RESULT.equals(result)){
-							monitor.setColor("red");
+						if(monitor.getType().equals(MonitorConstant.SERVICE)){
+							if(MonitorConstant.RESULT.equals(result)){
+								monitor.setColor("red");
+							}else{
+								monitor.setColor("green");
+							}
 						}
                         baseMapper.updateById(monitor);
                         log.info("调用api结果："+s);
@@ -335,6 +344,11 @@ public class ConfigMonitorServiceImpl extends ServiceImpl<ConfigMonitorMapper, C
 		LambdaQueryWrapper<ConfigMonitor> wrapper = new LambdaQueryWrapper<>();
 		wrapper.eq(ConfigMonitor::getType, MonitorConstant.WEB);
 		List<ConfigMonitor> list = baseMapper.selectList(wrapper);
+		list.forEach(item ->{
+			if(!MonitorConstant.RESULT.equals(item.getResult())){
+				item.setResult(String.format("%.2f",Double.parseDouble(item.getResult()))+"%");
+			}
+		});
 		return list;
 	}
 
diff --git a/src/main/java/org/springblade/modules/monitor/task/MonitorTaskJob.java b/src/main/java/org/springblade/modules/monitor/task/MonitorTaskJob.java
index ac7eacf..4f7f510 100644
--- a/src/main/java/org/springblade/modules/monitor/task/MonitorTaskJob.java
+++ b/src/main/java/org/springblade/modules/monitor/task/MonitorTaskJob.java
@@ -11,7 +11,8 @@ public class MonitorTaskJob {
     private final IConfigMonitorService configMonitorService;
 
 	//更新服务器监控状态
-    @Scheduled(cron ="0 0 0 1/1 * ? ")
+    @Scheduled(cron ="0 0 0/1 * * ? ")
+    //@Scheduled(cron ="0 0/1 * * * ? ")
     public void updateMonitorInfo(){
 		configMonitorService.updateMonitorInfo();
     }