Explorar el Código

增量同步报警条件,增加非空判断

lixing hace 3 años
padre
commit
6c4c67755f

+ 6 - 0
AlarmEngineStarter/src/main/java/com/persagy/apm/energyalarmstarter/alarmengine/jms/AlarmEngineMsgHandler.java

@@ -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())) {