miaolijing преди 3 години
родител
ревизия
e2a2760145

+ 8 - 6
src/main/java/com/persagy/apm/diagnose/indicatorrecord/service/impl/MonitorIndicatorRecordServiceImpl.java

@@ -433,13 +433,15 @@ public class MonitorIndicatorRecordServiceImpl implements IMonitorIndicatorRecor
             String alarmItemCode = projectAlarmRule.getAlarmItemCode();
             List<String> objIds = projectAlarmRule.getObjIds();
             List<String> infoCodes = projectAlarmRule.getInfoCodes();
-            for (String infoCode : infoCodes) {
-                for (String objId : objIds) {
-                    String key = objId + "_" + alarmItemCode;
-                    if (!objIdAlarmItemCodeAndInfoCodes.containsKey(key)) {
-                        objIdAlarmItemCodeAndInfoCodes.put(key, new ArrayList<String>());
+            if (!CollectionUtils.isEmpty(infoCodes) && !CollectionUtils.isEmpty(objIds)){
+                for (String infoCode : infoCodes) {
+                    for (String objId : objIds) {
+                        String key = objId + "_" + alarmItemCode;
+                        if (!objIdAlarmItemCodeAndInfoCodes.containsKey(key)) {
+                            objIdAlarmItemCodeAndInfoCodes.put(key, new ArrayList<String>());
+                        }
+                        objIdAlarmItemCodeAndInfoCodes.get(key).add(infoCode);
                     }
-                    objIdAlarmItemCodeAndInfoCodes.get(key).add(infoCode);
                 }
             }
         }

+ 8 - 6
src/main/java/com/persagy/apm/diagnose/maintenance/service/impl/ProjectDataRecordServiceImpl.java

@@ -344,13 +344,15 @@ public class ProjectDataRecordServiceImpl implements IProjectDataRecordService {
             String alarmItemCode = projectAlarmRule.getAlarmItemCode();
             List<String> objIds = projectAlarmRule.getObjIds();
             List<String> infoCodes = projectAlarmRule.getInfoCodes();
-            for (String infoCode : infoCodes) {
-                for (String objId : objIds) {
-                    String key = objId + "_" + alarmItemCode;
-                    if (!objIdAlarmItemCodeAndInfoCodes.containsKey(key)) {
-                        objIdAlarmItemCodeAndInfoCodes.put(key, new ArrayList<>());
+            if (!CollectionUtils.isEmpty(infoCodes) && !CollectionUtils.isEmpty(objIds)){
+                for (String infoCode : infoCodes) {
+                    for (String objId : objIds) {
+                        String key = objId + "_" + alarmItemCode;
+                        if (!objIdAlarmItemCodeAndInfoCodes.containsKey(key)) {
+                            objIdAlarmItemCodeAndInfoCodes.put(key, new ArrayList<>());
+                        }
+                        objIdAlarmItemCodeAndInfoCodes.get(key).add(infoCode);
                     }
-                    objIdAlarmItemCodeAndInfoCodes.get(key).add(infoCode);
                 }
             }
         }