|
@@ -240,7 +240,13 @@ public class AlarmEngineMsgHandler {
|
|
|
for (AlarmConfigItem alarmConfigItem : deletedConfigUniques) {
|
|
|
//从redis拿到设备的报警条件信息
|
|
|
ObjConditionInfo objConditionInfo = redisUtil.get(RedisConstants.OBJ_CONDITION_REL, alarmConfigItem.getObjId(), ObjConditionInfo.class);
|
|
|
+ if (objConditionInfo == null) {
|
|
|
+ continue;
|
|
|
+ }
|
|
|
LinkedList<ItemCodeCondition> conditions = objConditionInfo.getConditions();
|
|
|
+ if (CollectionUtils.isEmpty(conditions)) {
|
|
|
+ continue;
|
|
|
+ }
|
|
|
LinkedList<ItemCodeCondition> conditionsRemain = new LinkedList<>();
|
|
|
for (ItemCodeCondition condition : conditions) {
|
|
|
if (alarmConfigItem.getItemCode().equals(condition.getItemCode())) {
|