|
@@ -241,7 +241,7 @@ public class AlarmEngineMsgHandler {
|
|
|
//从redis拿到设备的报警条件信息
|
|
|
ObjConditionInfo objConditionInfo = redisUtil.get(RedisConstants.OBJ_CONDITION_REL, alarmConfigItem.getObjId(), ObjConditionInfo.class);
|
|
|
LinkedList<ItemCodeCondition> conditions = objConditionInfo.getConditions();
|
|
|
- LinkedList<ItemCodeCondition> conditionsRemain = objConditionInfo.getConditions();
|
|
|
+ LinkedList<ItemCodeCondition> conditionsRemain = new LinkedList<>();
|
|
|
for (ItemCodeCondition condition : conditions) {
|
|
|
if (alarmConfigItem.getItemCode().equals(condition.getItemCode())) {
|
|
|
//删除报警条件
|
|
@@ -253,7 +253,8 @@ public class AlarmEngineMsgHandler {
|
|
|
if (CollectionUtil.isEmpty(conditionsRemain)) {
|
|
|
redisUtil.delete(RedisConstants.OBJ_CONDITION_REL, alarmConfigItem.getObjId());
|
|
|
} else {
|
|
|
- redisUtil.put(RedisConstants.OBJ_CONDITION_REL, alarmConfigItem.getObjId(), conditionsRemain);
|
|
|
+ objConditionInfo.setConditions(conditionsRemain);
|
|
|
+ redisUtil.put(RedisConstants.OBJ_CONDITION_REL, alarmConfigItem.getObjId(), objConditionInfo);
|
|
|
}
|
|
|
}
|
|
|
}
|