|
@@ -354,7 +354,9 @@ public class MonitorIndicatorRecordServiceImpl implements IMonitorIndicatorRecor
|
|
|
}
|
|
|
//根据报警规则,获取对象id_报警类型及设备监控点位list
|
|
|
Map<String, List<String>> objIdAlarmItemCodeAndInfoCodes = getObjIdAlarmItemCodeAndInfoCodes(projectAlarmRules);
|
|
|
-
|
|
|
+ if (CollectionUtils.isEmpty(objIdAlarmItemCodeAndInfoCodes) || objIdAlarmItemCodeAndInfoCodes.size() == 0){
|
|
|
+ return;
|
|
|
+ }
|
|
|
for (Map.Entry<String, List<String>> entry : objIdAlarmItemCodeAndInfoCodes.entrySet()) {
|
|
|
String objIdAndAlarmItemCode = entry.getKey();
|
|
|
int indexOf = objIdAndAlarmItemCode.indexOf("_");
|
|
@@ -444,13 +446,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);
|
|
|
}
|
|
|
}
|
|
|
}
|