fix: 告警清除逻辑优化

@@ -200,30 +200,28 @@ class ReactState {
         if (triggerState.containsKey(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) {
-                for(TriggerDTO rule:alarm.getClearRule()){
-                    if(!(ScopeEnum.PART.equals(rule.getEntityType()) && !rule.getEntityId().contains(deviceId))
-                            || !alarmAction.getDeviceId().contains(deviceId)){
-                        return null;
-                    }
+        TriggerState state = null;
+        ActionAlarmDTO alarm = JacksonUtil.convertValue(alarmAction.getDoContext(), ActionAlarmDTO.class);
+        if (alarm != null && alarm.getClearRule() != null) {
+            for(TriggerDTO rule:alarm.getClearRule()){
+                if((ScopeEnum.PART.equals(rule.getEntityType()) && !rule.getEntityId().contains(deviceId))
+                        || !alarmAction.getDeviceId().contains(deviceId)){
+                    return null;
+                }
 
-                    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){
+                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;
                     }
                 }
-                return state;
+                if(state != null){
+                    break;
+                }
             }
+            return state;
         }
         return null;