|
@@ -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);
|
|
|
}
|
|
|
}
|
|
|
}
|