refactor: 告警清除规则切换为数组

@@ -23,6 +23,6 @@ public class ActionAlarmDTO extends TenantDTO {
     private AlarmSeverity alarmLevel;
 
 
-    private TriggerDTO clearRule;
+    private List<TriggerDTO> clearRule;
 
 }

@@ -133,7 +133,9 @@ class ReactState {
                     }
                 } else if (currentAlarms.containsKey(deviceId) && this.alarmAction != null) {
                     //清除设备告警
-                    clearAlarm(ctx, msg, deviceId);
+                    for (AlarmConditionFilterKey entityKey : triggerState.getEntityKeys()) {
+                        clearAlarm(ctx, msg, deviceId, entityKey.getKey());
+                    }
                 }
             }
         }
@@ -192,15 +194,28 @@ class ReactState {
 
     }
 
-    protected TriggerState getOrCreateClearState(String deviceId) {
+    protected TriggerState getOrCreateClearState(String deviceId,String key) {
+        String cacheKey = deviceId+key;
         if (triggerState.containsKey(deviceId)) {
-            return triggerState.get(deviceId);
+            return triggerState.get(cacheKey);
         }
         if (alarmAction.getDeviceId().contains(deviceId)) {
+            TriggerState state = null;
             ActionAlarmDTO alarm = JacksonUtil.convertValue(alarmAction.getDoContext(), ActionAlarmDTO.class);
             if (alarm != null && alarm.getClearRule() != null) {
-                TriggerState state = createTriggerState(deviceId, alarm.getClearRule().getTriggerCondition());
-                triggerState.put(deviceId, state);
+                for(TriggerDTO rule:alarm.getClearRule()){
+                    for (AlarmConditionFilter filter : rule.getTriggerCondition().getCondition().getCondition()) {
+                        String tempKey =filter.getKey().getKey();
+                        if(key.equals(tempKey)){
+                            state = createTriggerState(deviceId, rule.getTriggerCondition());
+                            triggerState.put(cacheKey, state);
+                            break;
+                        }
+                    }
+                    if(state != null){
+                        break;
+                    }
+                }
                 return state;
             }
         }
@@ -320,8 +335,8 @@ class ReactState {
         noticeService.alert(action.getAlarmProfileId(), formData);
     }
 
-    private void clearAlarm(TbContext ctx, TbMsg msg, String deviceId) throws ExecutionException, InterruptedException {
-        TriggerState clearState = getOrCreateClearState(deviceId);
+    private void clearAlarm(TbContext ctx, TbMsg msg, String deviceId,String key) throws ExecutionException, InterruptedException {
+        TriggerState clearState = getOrCreateClearState(deviceId,key);
         if (clearState.process(ctx, msg)) {
             ctx.getAlarmService().clearAlarmForResult(ctx.getTenantId(), currentAlarms.get(deviceId).getId(), null, System.currentTimeMillis());
             ytDeviceService.freshAlarmStatus(new DeviceId(UUID.fromString(deviceId)), 0);