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 hostMap = hosts.stream().collect(Collectors.toMap(Host::getHostId, Host -> Host)); // 获取服务器状态信息 Map 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 items = host.getItems(); Item empty; empty = items.get(MonitorConstant.ITEM_RUNTIME);