From d04a18db0b13dcb7504d5a140eaff4d42e24c0dd Mon Sep 17 00:00:00 2001 From: duwenyuan <15600000461@163.com> Date: Mon, 20 Jul 2026 18:24:39 +0800 Subject: [PATCH] =?UTF-8?q?=E5=88=A0=E9=99=A4=E8=BF=90=E7=AE=A1=E4=BF=A1?= =?UTF-8?q?=E6=81=AF?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../org/jeecg/modules/aspect/StatusAspect.java | 6 +++--- .../service/impl/SysServerServiceImpl.java | 18 ++---------------- 2 files changed, 5 insertions(+), 19 deletions(-) diff --git a/jeecg-module-abnormal-alarm/src/main/java/org/jeecg/modules/aspect/StatusAspect.java b/jeecg-module-abnormal-alarm/src/main/java/org/jeecg/modules/aspect/StatusAspect.java index f9c092a2..e6a24809 100644 --- a/jeecg-module-abnormal-alarm/src/main/java/org/jeecg/modules/aspect/StatusAspect.java +++ b/jeecg-module-abnormal-alarm/src/main/java/org/jeecg/modules/aspect/StatusAspect.java @@ -174,9 +174,9 @@ public class StatusAspect { alarmItemService.saveOrUpdateBatch(alarmItems); } catch (FeignException.Unauthorized e) { ManageUtil.refreshToken(); - log.warn("向运管系统查询Hosts信息异常: Token失效,已刷新Token"); + log.warn("更新数据源的状态信息异常: ",e); } catch (Exception e) { - log.error("数据源更新状态/绑定HostId异常: {}", e.getMessage()); + log.error("数据源更新状态 {}", e.getMessage()); } } @@ -268,7 +268,7 @@ public class StatusAspect { alarmItemService.saveOrUpdateBatch(alarmItems); } catch (FeignException.Unauthorized e) { ManageUtil.refreshToken(); - log.warn("向运管系统查询Hosts信息异常: Token失效,已刷新Token"); + log.warn("服务器更新状态信息异常: ",e); } catch (Exception e) { log.error("服务器更新状态/绑定HostId/绑定监控项异常: {}", e.getMessage()); } 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 d17b9ac5..d9e9d3c7 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 @@ -93,20 +93,6 @@ public class SysServerServiceImpl extends ServiceImpl serverDtos = page.getRecords(); // 获取所有在线服务器信息 - List hosts = new ArrayList<>(); - try { - String token = ManageUtil.getToken(); - hosts = monitorAlarm.listApp(MonitorConstant.pageNo, MonitorConstant.pageSize, token) - .getResult().getRecords(); - } catch (FeignException.Unauthorized e) { - ManageUtil.refreshToken(); - log.warn("向运管系统查询Hosts信息异常: Token失效,已刷新Token"); - } catch (Exception e) { - log.error("向运管系统查询Hosts信息异常: {}", e.getMessage()); - } - // 将List转换为Map - Map hostMap = - hosts.stream().collect(Collectors.toMap(Host::getHostId, Host -> Host)); // 获取服务器状态信息 Map statusMap = redisUtil.hmget(RedisConstant.SERVER_STATUS); statusMap = MapUtil.isEmpty(statusMap) ? MapUtil.newHashMap() : statusMap; @@ -577,10 +563,10 @@ public class SysServerServiceImpl extends ServiceImpl