fix: 告警通知清除规则判断设备有效性

云中非
1 parent 39ae0c1b
Showing 1 changed file with 6 additions and 0 deletions
rule-engine/rule-engine-components/src/main/java/org/thingsboard/rule/engine/yunteng/scene/ReactState.java
--- a/rule-engine/rule-engine-components/src/main/java/org/thingsboard/rule/engine/yunteng/scene/ReactState.java
View file @5a7a0a9
+++ b/rule-engine/rule-engine-components/src/main/java/org/thingsboard/rule/engine/yunteng/scene/ReactState.java
View file @5a7a0a9
@@ -19,6 +19,7 @@ import org.thingsboard.server.common.data.yunteng.dto.ActionAlarmDTO;
 import org.thingsboard.server.common.data.yunteng.dto.AlarmInfoDTO;
 import org.thingsboard.server.common.data.yunteng.dto.TriggerDTO;
 import org.thingsboard.server.common.data.yunteng.enums.ActionTypeEnum;
+import org.thingsboard.server.common.data.yunteng.enums.ScopeEnum;
 import org.thingsboard.server.common.data.yunteng.utils.JacksonUtil;
 import org.thingsboard.server.common.data.yunteng.utils.SpringBeanUtils;
 import org.thingsboard.server.common.msg.TbMsg;
@@ -204,6 +205,11 @@ class ReactState {
             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)){