交换机采集数据优化

src/main/java/com/tongran/agent/client/netty/enpoint/AgentEndpoint.java

@@ -60,6 +60,7 @@ public class AgentEndpoint {
                 }
                 if(jsonObject.containsKey("netOID")){
                     String netOID = jsonObject.getString("netOID");
+                    if(StringUtils.isNotBlank(netOID)){
                         LinkedHashMap<String, String> map = JSON.parseObject(netOID, new TypeReference<LinkedHashMap<String, String>>() {});
                         GlobalConfig.SWITCH_NET_OID = map;
                         LinkedHashMap<String,String> m = AgentUtil.swapMap(map);
@@ -67,8 +68,10 @@ public class AgentEndpoint {
                             GlobalConfig.NET_INDEX_OID = m.get(GlobalConfig.NET_INDEX_PARAM);
                         }
                     }
+                }
                 if(jsonObject.containsKey("moduleOID")){
                     String moduleOID = jsonObject.getString("moduleOID");
+                    if(StringUtils.isNotBlank(moduleOID)){
                         LinkedHashMap<String, String> map = JSON.parseObject(moduleOID, new TypeReference<LinkedHashMap<String, String>>() {});
                         GlobalConfig.SWITCH_MODULE_OID = map;
                         LinkedHashMap<String,String> m = AgentUtil.swapMap(map);
@@ -76,8 +79,11 @@ public class AgentEndpoint {
                             GlobalConfig.MODULE_INDEX_OID = m.get(GlobalConfig.MODULE_INDEX_PARAM);
                         }
                     }
+
+                }
                 if(jsonObject.containsKey("mpuOID")){
                     String mpuOID = jsonObject.getString("mpuOID");
+                    if(StringUtils.isNotBlank(mpuOID)){
                         LinkedHashMap<String, String> map = JSON.parseObject(mpuOID, new TypeReference<LinkedHashMap<String, String>>() {});
                         GlobalConfig.SWITCH_MPU_OID = map;
                         LinkedHashMap<String,String> m = AgentUtil.swapMap(map);
@@ -85,8 +91,10 @@ public class AgentEndpoint {
                             GlobalConfig.MPU_INDEX_OID = m.get(GlobalConfig.MPU_INDEX_PARAM);
                         }
                     }
+                }
                 if(jsonObject.containsKey("pwrOID")){
                     String pwrOID = jsonObject.getString("pwrOID");
+                    if(StringUtils.isNotBlank(pwrOID)){
                         LinkedHashMap<String, String> map = JSON.parseObject(pwrOID, new TypeReference<LinkedHashMap<String, String>>() {});
                         GlobalConfig.SWITCH_PWR_OID = map;
                         LinkedHashMap<String,String> m = AgentUtil.swapMap(map);
@@ -94,8 +102,10 @@ public class AgentEndpoint {
                             GlobalConfig.PWR_INDEX_OID = m.get(GlobalConfig.PWR_INDEX_PARAM);
                         }
                     }
+                }
                 if(jsonObject.containsKey("fanOID")){
                     String fanOID = jsonObject.getString("fanOID");
+                    if(StringUtils.isNotBlank(fanOID)){
                         LinkedHashMap<String, String> map = JSON.parseObject(fanOID, new TypeReference<LinkedHashMap<String, String>>() {});
                         GlobalConfig.SWITCH_FAN_OID = map;
                         LinkedHashMap<String,String> m = AgentUtil.swapMap(map);
@@ -103,8 +113,10 @@ public class AgentEndpoint {
                             GlobalConfig.FAN_INDEX_OID = m.get(GlobalConfig.FAN_INDEX_PARAM);
                         }
                     }
+                }
                 if(jsonObject.containsKey("otherOID")){
                     String otherOID = jsonObject.getString("otherOID");
+                    if(StringUtils.isNotBlank(otherOID)){
                         LinkedHashMap<String, String> map = JSON.parseObject(otherOID, new TypeReference<LinkedHashMap<String, String>>() {});
                         GlobalConfig.SWITCH_OTHER_OID = map;
                         LinkedHashMap<String,String> m = AgentUtil.swapMap(map);
@@ -112,41 +124,54 @@ public class AgentEndpoint {
                             GlobalConfig.OTHER_INDEX_OID = m.get(GlobalConfig.OTHER_INDEX_PARAM);
                         }
                     }
+                }
                 if(jsonObject.containsKey("filters")){
                     String filters = jsonObject.getString("filters");
+                    if(StringUtils.isNotBlank(filters)){
                         JSONObject object = JSONObject.parseObject(filters);
-
                         if(object.containsKey("netOID")){
                             String netOID = object.getString("netOID");
+                            if(StringUtils.isNotBlank(netOID)){
                                 List<String> list = JSON.parseObject(netOID, new TypeReference<List<String>>() {});
                                 GlobalConfig.NET_FILTER = list;
                             }
+                        }
                         if(object.containsKey("moduleOID")){
                             String moduleOID = object.getString("moduleOID");
+                            if(StringUtils.isNotBlank(moduleOID)){
                                 List<String> list = JSON.parseObject(moduleOID, new TypeReference<List<String>>() {});
                                 GlobalConfig.MODULE_FILTER = list;
                             }
+                        }
                         if(object.containsKey("mpuOID")){
                             String mpuOID = object.getString("mpuOID");
+                            if(StringUtils.isNotBlank(mpuOID)){
                                 List<String> list = JSON.parseObject(mpuOID, new TypeReference<List<String>>() {});
                                 GlobalConfig.MPU_FILTER = list;
                             }
+                        }
                         if(object.containsKey("pwrOID")){
                             String pwrOID = object.getString("pwrOID");
+                            if(StringUtils.isNotBlank(pwrOID)){
                                 List<String> list = JSON.parseObject(pwrOID, new TypeReference<List<String>>() {});
                                 GlobalConfig.PWR_FILTER = list;
                             }
+                        }
                         if(object.containsKey("fanOID")){
                             String fanOID = object.getString("fanOID");
+                            if(StringUtils.isNotBlank(fanOID)){
                                 List<String> list = JSON.parseObject(fanOID, new TypeReference<List<String>>() {});
                                 GlobalConfig.FAN_FILTER = list;
                             }
+                        }
                         if(object.containsKey("otherOID")){
                             String otherOID = object.getString("otherOID");
+                            if(StringUtils.isNotBlank(otherOID)){
                                 List<String> list = JSON.parseObject(otherOID, new TypeReference<List<String>>() {});
                                 GlobalConfig.OTHER_FILTER = list;
                             }
-
+                        }
+                    }
                 }
 
             }
@@ -266,6 +291,7 @@ public class AgentEndpoint {
             JSONObject jsonObject = JSONObject.parseObject(data);
             if(jsonObject.containsKey("alarms")){
                 String alarms = jsonObject.getString("alarms");
+                if(StringUtils.isNotBlank(alarms)){
                     AssertLog.info("告警设置,alarms={}", alarms);
                     GlobalConfig.ALARM_LIST = JSON.parseObject(alarms, new TypeReference<List<AlarmEO>>() {});
                     AssertLog.info("告警设置,监控项={}", JSON.toJSONString(GlobalConfig.ALARM_LIST));
@@ -274,6 +300,7 @@ public class AgentEndpoint {
                         GlobalConfig.IS_ALARM = AgentDataUtil.hasAnyActiveAlarm(GlobalConfig.ALARM_LIST);
                     }
                 }
+            }
             agentService.alarmMonitor();
             long timestamp = System.currentTimeMillis();
             timestamp =  Math.round(timestamp / 1000.0);