From 6c098b3950bac0c1b31f6f26542bf27cc9294e32 Mon Sep 17 00:00:00 2001 From: qiminbao Date: Fri, 26 Sep 2025 15:03:48 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BA=A4=E6=8D=A2=E6=9C=BA=E9=87=87=E9=9B=86?= =?UTF-8?q?=E6=95=B0=E6=8D=AE=E4=BC=98=E5=8C=96?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../client/netty/enpoint/AgentEndpoint.java | 163 ++++++++++-------- 1 file changed, 95 insertions(+), 68 deletions(-) diff --git a/src/main/java/com/tongran/agent/client/netty/enpoint/AgentEndpoint.java b/src/main/java/com/tongran/agent/client/netty/enpoint/AgentEndpoint.java index 282fb34..b837d6b 100644 --- a/src/main/java/com/tongran/agent/client/netty/enpoint/AgentEndpoint.java +++ b/src/main/java/com/tongran/agent/client/netty/enpoint/AgentEndpoint.java @@ -60,93 +60,118 @@ public class AgentEndpoint { } if(jsonObject.containsKey("netOID")){ String netOID = jsonObject.getString("netOID"); - LinkedHashMap map = JSON.parseObject(netOID, new TypeReference>() {}); - GlobalConfig.SWITCH_NET_OID = map; - LinkedHashMap m = AgentUtil.swapMap(map); - if(m.containsKey(GlobalConfig.NET_INDEX_PARAM)){ - GlobalConfig.NET_INDEX_OID = m.get(GlobalConfig.NET_INDEX_PARAM); + if(StringUtils.isNotBlank(netOID)){ + LinkedHashMap map = JSON.parseObject(netOID, new TypeReference>() {}); + GlobalConfig.SWITCH_NET_OID = map; + LinkedHashMap m = AgentUtil.swapMap(map); + if(m.containsKey(GlobalConfig.NET_INDEX_PARAM)){ + GlobalConfig.NET_INDEX_OID = m.get(GlobalConfig.NET_INDEX_PARAM); + } } } if(jsonObject.containsKey("moduleOID")){ String moduleOID = jsonObject.getString("moduleOID"); - LinkedHashMap map = JSON.parseObject(moduleOID, new TypeReference>() {}); - GlobalConfig.SWITCH_MODULE_OID = map; - LinkedHashMap m = AgentUtil.swapMap(map); - if(m.containsKey(GlobalConfig.MODULE_INDEX_PARAM)){ - GlobalConfig.MODULE_INDEX_OID = m.get(GlobalConfig.MODULE_INDEX_PARAM); + if(StringUtils.isNotBlank(moduleOID)){ + LinkedHashMap map = JSON.parseObject(moduleOID, new TypeReference>() {}); + GlobalConfig.SWITCH_MODULE_OID = map; + LinkedHashMap m = AgentUtil.swapMap(map); + if(m.containsKey(GlobalConfig.MODULE_INDEX_PARAM)){ + GlobalConfig.MODULE_INDEX_OID = m.get(GlobalConfig.MODULE_INDEX_PARAM); + } } + } if(jsonObject.containsKey("mpuOID")){ String mpuOID = jsonObject.getString("mpuOID"); - LinkedHashMap map = JSON.parseObject(mpuOID, new TypeReference>() {}); - GlobalConfig.SWITCH_MPU_OID = map; - LinkedHashMap m = AgentUtil.swapMap(map); - if(m.containsKey(GlobalConfig.MPU_INDEX_PARAM)){ - GlobalConfig.MPU_INDEX_OID = m.get(GlobalConfig.MPU_INDEX_PARAM); + if(StringUtils.isNotBlank(mpuOID)){ + LinkedHashMap map = JSON.parseObject(mpuOID, new TypeReference>() {}); + GlobalConfig.SWITCH_MPU_OID = map; + LinkedHashMap m = AgentUtil.swapMap(map); + if(m.containsKey(GlobalConfig.MPU_INDEX_PARAM)){ + GlobalConfig.MPU_INDEX_OID = m.get(GlobalConfig.MPU_INDEX_PARAM); + } } } if(jsonObject.containsKey("pwrOID")){ String pwrOID = jsonObject.getString("pwrOID"); - LinkedHashMap map = JSON.parseObject(pwrOID, new TypeReference>() {}); - GlobalConfig.SWITCH_PWR_OID = map; - LinkedHashMap m = AgentUtil.swapMap(map); - if(m.containsKey(GlobalConfig.PWR_INDEX_PARAM)){ - GlobalConfig.PWR_INDEX_OID = m.get(GlobalConfig.PWR_INDEX_PARAM); + if(StringUtils.isNotBlank(pwrOID)){ + LinkedHashMap map = JSON.parseObject(pwrOID, new TypeReference>() {}); + GlobalConfig.SWITCH_PWR_OID = map; + LinkedHashMap m = AgentUtil.swapMap(map); + if(m.containsKey(GlobalConfig.PWR_INDEX_PARAM)){ + GlobalConfig.PWR_INDEX_OID = m.get(GlobalConfig.PWR_INDEX_PARAM); + } } } if(jsonObject.containsKey("fanOID")){ String fanOID = jsonObject.getString("fanOID"); - LinkedHashMap map = JSON.parseObject(fanOID, new TypeReference>() {}); - GlobalConfig.SWITCH_FAN_OID = map; - LinkedHashMap m = AgentUtil.swapMap(map); - if(m.containsKey(GlobalConfig.FAN_INDEX_PARAM)){ - GlobalConfig.FAN_INDEX_OID = m.get(GlobalConfig.FAN_INDEX_PARAM); + if(StringUtils.isNotBlank(fanOID)){ + LinkedHashMap map = JSON.parseObject(fanOID, new TypeReference>() {}); + GlobalConfig.SWITCH_FAN_OID = map; + LinkedHashMap m = AgentUtil.swapMap(map); + if(m.containsKey(GlobalConfig.FAN_INDEX_PARAM)){ + GlobalConfig.FAN_INDEX_OID = m.get(GlobalConfig.FAN_INDEX_PARAM); + } } } if(jsonObject.containsKey("otherOID")){ String otherOID = jsonObject.getString("otherOID"); - LinkedHashMap map = JSON.parseObject(otherOID, new TypeReference>() {}); - GlobalConfig.SWITCH_OTHER_OID = map; - LinkedHashMap m = AgentUtil.swapMap(map); - if(m.containsKey(GlobalConfig.OTHER_INDEX_PARAM)){ - GlobalConfig.OTHER_INDEX_OID = m.get(GlobalConfig.OTHER_INDEX_PARAM); + if(StringUtils.isNotBlank(otherOID)){ + LinkedHashMap map = JSON.parseObject(otherOID, new TypeReference>() {}); + GlobalConfig.SWITCH_OTHER_OID = map; + LinkedHashMap m = AgentUtil.swapMap(map); + if(m.containsKey(GlobalConfig.OTHER_INDEX_PARAM)){ + GlobalConfig.OTHER_INDEX_OID = m.get(GlobalConfig.OTHER_INDEX_PARAM); + } } } if(jsonObject.containsKey("filters")){ String filters = jsonObject.getString("filters"); - JSONObject object = JSONObject.parseObject(filters); - - if(object.containsKey("netOID")){ - String netOID = object.getString("netOID"); - List list = JSON.parseObject(netOID, new TypeReference>() {}); - GlobalConfig.NET_FILTER = list; + if(StringUtils.isNotBlank(filters)){ + JSONObject object = JSONObject.parseObject(filters); + if(object.containsKey("netOID")){ + String netOID = object.getString("netOID"); + if(StringUtils.isNotBlank(netOID)){ + List list = JSON.parseObject(netOID, new TypeReference>() {}); + GlobalConfig.NET_FILTER = list; + } + } + if(object.containsKey("moduleOID")){ + String moduleOID = object.getString("moduleOID"); + if(StringUtils.isNotBlank(moduleOID)){ + List list = JSON.parseObject(moduleOID, new TypeReference>() {}); + GlobalConfig.MODULE_FILTER = list; + } + } + if(object.containsKey("mpuOID")){ + String mpuOID = object.getString("mpuOID"); + if(StringUtils.isNotBlank(mpuOID)){ + List list = JSON.parseObject(mpuOID, new TypeReference>() {}); + GlobalConfig.MPU_FILTER = list; + } + } + if(object.containsKey("pwrOID")){ + String pwrOID = object.getString("pwrOID"); + if(StringUtils.isNotBlank(pwrOID)){ + List list = JSON.parseObject(pwrOID, new TypeReference>() {}); + GlobalConfig.PWR_FILTER = list; + } + } + if(object.containsKey("fanOID")){ + String fanOID = object.getString("fanOID"); + if(StringUtils.isNotBlank(fanOID)){ + List list = JSON.parseObject(fanOID, new TypeReference>() {}); + GlobalConfig.FAN_FILTER = list; + } + } + if(object.containsKey("otherOID")){ + String otherOID = object.getString("otherOID"); + if(StringUtils.isNotBlank(otherOID)){ + List list = JSON.parseObject(otherOID, new TypeReference>() {}); + GlobalConfig.OTHER_FILTER = list; + } + } } - if(object.containsKey("moduleOID")){ - String moduleOID = object.getString("moduleOID"); - List list = JSON.parseObject(moduleOID, new TypeReference>() {}); - GlobalConfig.MODULE_FILTER = list; - } - if(object.containsKey("mpuOID")){ - String mpuOID = object.getString("mpuOID"); - List list = JSON.parseObject(mpuOID, new TypeReference>() {}); - GlobalConfig.MPU_FILTER = list; - } - if(object.containsKey("pwrOID")){ - String pwrOID = object.getString("pwrOID"); - List list = JSON.parseObject(pwrOID, new TypeReference>() {}); - GlobalConfig.PWR_FILTER = list; - } - if(object.containsKey("fanOID")){ - String fanOID = object.getString("fanOID"); - List list = JSON.parseObject(fanOID, new TypeReference>() {}); - GlobalConfig.FAN_FILTER = list; - } - if(object.containsKey("otherOID")){ - String otherOID = object.getString("otherOID"); - List list = JSON.parseObject(otherOID, new TypeReference>() {}); - GlobalConfig.OTHER_FILTER = list; - } - } } @@ -266,12 +291,14 @@ public class AgentEndpoint { JSONObject jsonObject = JSONObject.parseObject(data); if(jsonObject.containsKey("alarms")){ String alarms = jsonObject.getString("alarms"); - AssertLog.info("告警设置,alarms={}", alarms); - GlobalConfig.ALARM_LIST = JSON.parseObject(alarms, new TypeReference>() {}); - AssertLog.info("告警设置,监控项={}", JSON.toJSONString(GlobalConfig.ALARM_LIST)); - if(CollectionUtil.isNotEmpty(GlobalConfig.ALARM_LIST)){ - AssertLog.info("告警设置,is_alarm={}", AgentDataUtil.hasAnyActiveAlarm(GlobalConfig.ALARM_LIST)); - GlobalConfig.IS_ALARM = AgentDataUtil.hasAnyActiveAlarm(GlobalConfig.ALARM_LIST); + if(StringUtils.isNotBlank(alarms)){ + AssertLog.info("告警设置,alarms={}", alarms); + GlobalConfig.ALARM_LIST = JSON.parseObject(alarms, new TypeReference>() {}); + AssertLog.info("告警设置,监控项={}", JSON.toJSONString(GlobalConfig.ALARM_LIST)); + if(CollectionUtil.isNotEmpty(GlobalConfig.ALARM_LIST)){ + AssertLog.info("告警设置,is_alarm={}", AgentDataUtil.hasAnyActiveAlarm(GlobalConfig.ALARM_LIST)); + GlobalConfig.IS_ALARM = AgentDataUtil.hasAnyActiveAlarm(GlobalConfig.ALARM_LIST); + } } } agentService.alarmMonitor();