From cbf75297c310d87af7eac329584f129c6b071d2e Mon Sep 17 00:00:00 2001
From: nieziyan <nzyone@qq.com>
Date: Thu, 21 Dec 2023 09:40:25 +0800
Subject: [PATCH] =?UTF-8?q?fix=EF=BC=9Anull?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../main/java/org/jeecg/modules/feignclient/MonitorAlarm.java  | 3 ++-
 .../org/jeecg/modules/service/impl/SysServerServiceImpl.java   | 3 +++
 2 files changed, 5 insertions(+), 1 deletion(-)

diff --git a/jeecg-module-abnormal-alarm/src/main/java/org/jeecg/modules/feignclient/MonitorAlarm.java b/jeecg-module-abnormal-alarm/src/main/java/org/jeecg/modules/feignclient/MonitorAlarm.java
index 638e7a25..3017fff6 100644
--- a/jeecg-module-abnormal-alarm/src/main/java/org/jeecg/modules/feignclient/MonitorAlarm.java
+++ b/jeecg-module-abnormal-alarm/src/main/java/org/jeecg/modules/feignclient/MonitorAlarm.java
@@ -100,7 +100,8 @@ public interface MonitorAlarm {
 
     // 数据库相关
     @GetMapping("/omms/monitor/db/item/detail")
-    Result<?> dbDetail(@RequestHeader("X-Access-Token") String token);
+    Result<?> dbDetail(@RequestParam("hostId") String hostId,
+                       @RequestHeader("X-Access-Token") String token);
 
     @GetMapping("/omms/monitor/db/list")
     Result<?> dbList(@RequestHeader("X-Access-Token") String token);
diff --git a/jeecg-module-abnormal-alarm/src/main/java/org/jeecg/modules/service/impl/SysServerServiceImpl.java b/jeecg-module-abnormal-alarm/src/main/java/org/jeecg/modules/service/impl/SysServerServiceImpl.java
index 2d670c24..e9410f65 100644
--- a/jeecg-module-abnormal-alarm/src/main/java/org/jeecg/modules/service/impl/SysServerServiceImpl.java
+++ b/jeecg-module-abnormal-alarm/src/main/java/org/jeecg/modules/service/impl/SysServerServiceImpl.java
@@ -4,6 +4,7 @@ import cn.hutool.core.bean.BeanUtil;
 import cn.hutool.core.collection.CollUtil;
 import cn.hutool.core.convert.Convert;
 import cn.hutool.core.date.DateUtil;
+import cn.hutool.core.map.MapUtil;
 import cn.hutool.core.util.NumberUtil;
 import cn.hutool.core.util.ObjectUtil;
 import cn.hutool.core.util.StrUtil;
@@ -89,6 +90,7 @@ public class SysServerServiceImpl extends ServiceImpl<SysServerMapper, SysServer
         Map<String, Host> hostMap = hosts.stream().collect(Collectors.toMap(Host::getHostId, Host -> Host));
         // 获取服务器状态信息
         Map<Object, Object> statusMap = redisUtil.hmget(RedisConstant.SERVER_STATUS);
+        statusMap = MapUtil.isEmpty(statusMap) ? MapUtil.newHashMap() : statusMap;
         for (ServerDto serverDto : serverDtos) {
             int alarms = serverDto.getAlarms();
             String id = serverDto.getId();
@@ -261,6 +263,7 @@ public class SysServerServiceImpl extends ServiceImpl<SysServerMapper, SysServer
         // 服务器是否在线
         String status = host.getStatus();
         boolean online = StrUtil.equals(status, ServerStatus.ON.getValue());
+
         Map<String, Item> items = host.getItems();
         Item empty;
         empty = items.get(MonitorConstant.ITEM_RUNTIME);