refactor: 场景联动逻辑调整

1、触发器内部逻辑为或
2、执行条件的逻辑为且
3、触发器和执行条件的逻辑为且

@@ -17,8 +17,8 @@ import org.thingsboard.server.common.data.yunteng.common.DeleteGroup;
 import org.thingsboard.server.common.data.yunteng.common.UpdateGroup;
 import org.thingsboard.server.common.data.yunteng.dto.DeleteDTO;
 import org.thingsboard.server.common.data.yunteng.dto.DeviceDTO;
-import org.thingsboard.server.common.data.yunteng.dto.SceneLinkageDTO;
-import org.thingsboard.server.common.data.yunteng.dto.TriggerDTO;
+import org.thingsboard.server.common.data.yunteng.dto.scene.SceneLinkageDTO;
+import org.thingsboard.server.common.data.yunteng.dto.scene.TriggerDTO;
 import org.thingsboard.server.common.data.yunteng.enums.DeviceTypeEnum;
 import org.thingsboard.server.common.data.yunteng.id.SceneId;
 import org.thingsboard.server.common.data.yunteng.utils.tools.TkPageData;

@@ -3,6 +3,7 @@ package org.thingsboard.server.common.data.yunteng.dto;
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
 import org.thingsboard.server.common.data.alarm.AlarmSeverity;
+import org.thingsboard.server.common.data.yunteng.dto.scene.TriggerDTO;
 
 import java.util.List;
 

-package org.thingsboard.server.common.data.yunteng.dto;
+package org.thingsboard.server.common.data.yunteng.dto.scene;
 
 import com.fasterxml.jackson.databind.JsonNode;
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
 import lombok.EqualsAndHashCode;
+import org.thingsboard.server.common.data.yunteng.dto.TenantDTO;
 import org.thingsboard.server.common.data.yunteng.enums.ActionTypeEnum;
 import org.thingsboard.server.common.data.yunteng.enums.CallTypeEnum;
 import org.thingsboard.server.common.data.yunteng.enums.DeviceTypeEnum;

-package org.thingsboard.server.common.data.yunteng.dto;
+package org.thingsboard.server.common.data.yunteng.dto.scene;
 
 import io.swagger.annotations.ApiModelProperty;
+import java.util.List;
 import lombok.Data;
 import lombok.EqualsAndHashCode;
-import org.thingsboard.server.common.data.device.profile.AlarmCondition;
 import org.thingsboard.server.common.data.device.profile.AlarmRule;
+import org.thingsboard.server.common.data.yunteng.dto.TenantDTO;
 import org.thingsboard.server.common.data.yunteng.enums.DeviceTypeEnum;
 import org.thingsboard.server.common.data.yunteng.enums.ScopeEnum;
 import org.thingsboard.server.common.data.yunteng.enums.TriggerTypeEnum;
 
-import java.util.List;
-
 /**
  * @Description 场景联动执行条件数据传输表 @Author cxy @Date 2021/11/24 17:33
  */

+package org.thingsboard.server.common.data.yunteng.dto.scene;
+
+import com.fasterxml.jackson.databind.JsonNode;
+import io.swagger.annotations.ApiModelProperty;
+
+import java.io.Serializable;
+import java.util.List;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+import org.thingsboard.server.common.data.yunteng.dto.TenantDTO;
+import org.thingsboard.server.common.data.yunteng.enums.ActionTypeEnum;
+import org.thingsboard.server.common.data.yunteng.enums.CallTypeEnum;
+import org.thingsboard.server.common.data.yunteng.enums.DeviceTypeEnum;
+import org.thingsboard.server.common.data.yunteng.enums.ScopeEnum;
+
+/**
+ * @Description 场景联动执行动作数据传输表 @Author cxy @Date 2021/11/24 17:32
+ */
+@Data
+public class RuleFilterDTO implements Serializable {
+
+  @ApiModelProperty(value = "触发条件ID")
+  private String ruleId;
+
+  @ApiModelProperty(value = "场景联动ID")
+  private String scenId;
+
+}

-package org.thingsboard.server.common.data.yunteng.dto;
+package org.thingsboard.server.common.data.yunteng.dto.scene;
 
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
 import lombok.EqualsAndHashCode;
 import org.thingsboard.server.common.data.HasName;
 import org.thingsboard.server.common.data.yunteng.common.AddGroup;
+import org.thingsboard.server.common.data.yunteng.dto.TenantDTO;
 
 import javax.validation.constraints.NotEmpty;
 import java.util.List;

-package org.thingsboard.server.common.data.yunteng.dto;
+package org.thingsboard.server.common.data.yunteng.dto.scene;
 
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
 import lombok.EqualsAndHashCode;
 import org.thingsboard.server.common.data.device.profile.AlarmRule;
+import org.thingsboard.server.common.data.yunteng.dto.TenantDTO;
 import org.thingsboard.server.common.data.yunteng.enums.DeviceTypeEnum;
 import org.thingsboard.server.common.data.yunteng.enums.ScopeEnum;
 import org.thingsboard.server.common.data.yunteng.enums.TriggerTypeEnum;

@@ -13,6 +13,7 @@ import org.thingsboard.server.common.data.yunteng.core.exception.NoneTenantAsset
 import org.thingsboard.server.common.data.yunteng.core.exception.TkDataValidationException;
 import org.thingsboard.server.common.data.yunteng.core.message.ErrorMessage;
 import org.thingsboard.server.common.data.yunteng.dto.*;
+import org.thingsboard.server.common.data.yunteng.dto.scene.DoActionDTO;
 import org.thingsboard.server.common.data.yunteng.utils.ReflectUtils;
 import org.thingsboard.server.common.data.yunteng.utils.tools.TkPageData;
 import org.thingsboard.server.dao.yunteng.entities.TkAlarmProfileEntity;

@@ -7,7 +7,7 @@ import java.util.Set;
 import java.util.stream.Collectors;
 import lombok.RequiredArgsConstructor;
 import org.springframework.stereotype.Service;
-import org.thingsboard.server.common.data.yunteng.dto.DoActionDTO;
+import org.thingsboard.server.common.data.yunteng.dto.scene.DoActionDTO;
 import org.thingsboard.server.common.data.yunteng.enums.ScopeEnum;
 import org.thingsboard.server.dao.yunteng.entities.TenantBaseEntity;
 import org.thingsboard.server.dao.yunteng.entities.TkDeviceEntity;

@@ -18,6 +18,7 @@ import org.thingsboard.server.common.data.yunteng.constant.ModelConstants;
 import org.thingsboard.server.common.data.yunteng.core.exception.TkDataValidationException;
 import org.thingsboard.server.common.data.yunteng.core.message.ErrorMessage;
 import org.thingsboard.server.common.data.yunteng.dto.*;
+import org.thingsboard.server.common.data.yunteng.dto.scene.*;
 import org.thingsboard.server.common.data.yunteng.enums.ActionTypeEnum;
 import org.thingsboard.server.common.data.yunteng.enums.DeviceTypeEnum;
 import org.thingsboard.server.common.data.yunteng.enums.ScopeEnum;
@@ -495,9 +496,10 @@ public class TkSceneLinkageServiceImpl
       return null;
     }
 
-    Map<String, List<String>> matchedDevices = new HashMap<>();
-    Map<String, List<String>> matchedProjectes = new HashMap<>();
+    Map<String, List<RuleFilterDTO>> matchedDevices = new HashMap<>();
+    Map<String, List<RuleFilterDTO>> matchedProjectes = new HashMap<>();
 
+    Set<String> projectFilter = new HashSet<>();
     List<TkTriggerEntity> triggers =
         triggerMapper.selectList(
             new QueryWrapper<TkTriggerEntity>()
@@ -507,9 +509,11 @@ public class TkSceneLinkageServiceImpl
                 .in(TkTriggerEntity::getSceneLinkageId, enableIds));
     triggers.forEach(
         trigger -> {
+          projectFilter.add(trigger.getDeviceProfileId());
           deviceSceneMap(
               matchedProjectes,
               matchedDevices,
+              trigger.getId(),
               trigger.getSceneLinkageId(),
               trigger.getEntityType(),
               trigger.getDeviceProfileId(),
@@ -525,9 +529,11 @@ public class TkSceneLinkageServiceImpl
                 .in(TkDoConditionEntity::getSceneLinkageId, enableIds));
     conditions.forEach(
         condition -> {
+          projectFilter.add(condition.getDeviceProfileId());
           deviceSceneMap(
               matchedProjectes,
               matchedDevices,
+              condition.getId(),
               condition.getSceneLinkageId(),
               condition.getEntityType(),
               condition.getDeviceProfileId(),
@@ -538,10 +544,12 @@ public class TkSceneLinkageServiceImpl
       return null;
     }
 
+
+
     List<TkDeviceProfileEntity> profiles =
         profileMapper.selectList(
             new LambdaQueryWrapper<TkDeviceProfileEntity>()
-                .eq(TkDeviceProfileEntity::getTenantId, tenantId));
+                .eq(TkDeviceProfileEntity::getTenantId, tenantId).in(TkDeviceProfileEntity::getId, projectFilter));
     Map<String, String> projects = new HashMap<>();
     profiles.forEach(f -> projects.put(f.getTbProfileId(), f.getId()));
 
@@ -556,8 +564,8 @@ public class TkSceneLinkageServiceImpl
   }
 
   private void deviceSceneMap(
-      Map<String, List<String>> matchedProjectes,
-      Map<String, List<String>> matchedDevices,
+      Map<String, List<RuleFilterDTO>> matchedProjectes,
+      Map<String, List<RuleFilterDTO>> matchedDevices,String ruleId,
       String scenId,
       ScopeEnum scope,
       String profileId,
@@ -565,9 +573,9 @@ public class TkSceneLinkageServiceImpl
     if (ScopeEnum.ALL.equals(scope)) {
       List<String> profileIds = new ArrayList<>();
       profileIds.add(profileId);
-      deviceSceneMap(matchedProjectes, profileIds, scenId);
+      deviceSceneMap(matchedProjectes, profileIds,ruleId, scenId);
     } else {
-      deviceSceneMap(matchedDevices, deviceIds, scenId);
+      deviceSceneMap(matchedDevices, deviceIds,ruleId, scenId);
     }
   }
 
@@ -575,15 +583,18 @@ public class TkSceneLinkageServiceImpl
    * 设备与场景联动的映射集合
    *
    * @param resultMap 缓存设备和场景联动映射结果的集合
-   * @param triggerIds 设备或产品主键集合
+   * @param postfixIds 设备或产品主键集合
    * @param scenId 场景联动主键
    */
   private void deviceSceneMap(
-      Map<String, List<String>> resultMap, List<String> triggerIds, String scenId) {
-    for (String deviceId : triggerIds) {
-      List<String> scenes = resultMap.computeIfAbsent(deviceId, k -> new ArrayList<String>());
-      if (!scenes.contains(scenId)) {
-        scenes.add(scenId);
+      Map<String, List<RuleFilterDTO>> resultMap, List<String> postfixIds, String prefixId, String scenId) {
+    for (String deviceId : postfixIds) {
+      List<RuleFilterDTO> scenes = resultMap.computeIfAbsent(deviceId, k -> new ArrayList<RuleFilterDTO>());
+      RuleFilterDTO filter = new RuleFilterDTO();
+      filter.setRuleId(prefixId);
+      filter.setScenId(scenId);
+      if (!scenes.contains(filter)) {
+        scenes.add(filter);
       }
       resultMap.put(deviceId, scenes);
     }

@@ -4,7 +4,7 @@ import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import lombok.RequiredArgsConstructor;
 import org.springframework.stereotype.Service;
-import org.thingsboard.server.common.data.yunteng.dto.TriggerDTO;
+import org.thingsboard.server.common.data.yunteng.dto.scene.TriggerDTO;
 import org.thingsboard.server.dao.yunteng.entities.TkTriggerEntity;
 import org.thingsboard.server.dao.yunteng.mapper.TriggerMapper;
 import org.thingsboard.server.dao.yunteng.service.AbstractBaseService;

@@ -3,7 +3,7 @@ package org.thingsboard.server.dao.yunteng.mapper;
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 import org.apache.ibatis.annotations.Mapper;
 import org.apache.ibatis.annotations.Param;
-import org.thingsboard.server.common.data.yunteng.dto.DoActionDTO;
+import org.thingsboard.server.common.data.yunteng.dto.scene.DoActionDTO;
 import org.thingsboard.server.dao.yunteng.entities.TkDoActionEntity;
 
 import java.util.List;

@@ -3,7 +3,7 @@ package org.thingsboard.server.dao.yunteng.mapper;
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 import org.apache.ibatis.annotations.Mapper;
 import org.apache.ibatis.annotations.Param;
-import org.thingsboard.server.common.data.yunteng.dto.DoConditionDTO;
+import org.thingsboard.server.common.data.yunteng.dto.scene.DoConditionDTO;
 import org.thingsboard.server.dao.yunteng.entities.TkDoConditionEntity;
 
 import java.util.List;

@@ -4,7 +4,7 @@ import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import org.apache.ibatis.annotations.Mapper;
 import org.apache.ibatis.annotations.Param;
-import org.thingsboard.server.common.data.yunteng.dto.SceneLinkageDTO;
+import org.thingsboard.server.common.data.yunteng.dto.scene.SceneLinkageDTO;
 import org.thingsboard.server.dao.yunteng.entities.TkSceneLinkageEntity;
 
 import java.util.Map;

@@ -3,7 +3,7 @@ package org.thingsboard.server.dao.yunteng.mapper;
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 import org.apache.ibatis.annotations.Mapper;
 import org.apache.ibatis.annotations.Param;
-import org.thingsboard.server.common.data.yunteng.dto.TriggerDTO;
+import org.thingsboard.server.common.data.yunteng.dto.scene.TriggerDTO;
 import org.thingsboard.server.dao.yunteng.entities.TkTriggerEntity;
 
 import java.util.List;

 package org.thingsboard.server.dao.yunteng.service;
 
-import org.thingsboard.server.common.data.yunteng.dto.DoActionDTO;
+import org.thingsboard.server.common.data.yunteng.dto.scene.DoActionDTO;
 import org.thingsboard.server.dao.yunteng.entities.TkDoActionEntity;
 
 import java.util.List;

 package org.thingsboard.server.dao.yunteng.service;
 import com.fasterxml.jackson.databind.JsonNode;
 import org.thingsboard.server.common.data.yunteng.dto.DeviceDTO;
-import org.thingsboard.server.common.data.yunteng.dto.SceneLinkageDTO;
+import org.thingsboard.server.common.data.yunteng.dto.scene.SceneLinkageDTO;
 import org.thingsboard.server.common.data.yunteng.enums.DeviceTypeEnum;
 import org.thingsboard.server.common.data.yunteng.utils.tools.TkPageData;
 import org.thingsboard.server.dao.yunteng.entities.TkSceneLinkageEntity;

 package org.thingsboard.server.dao.yunteng.service;
 
-import org.thingsboard.server.common.data.yunteng.dto.TriggerDTO;
+import org.thingsboard.server.common.data.yunteng.dto.scene.TriggerDTO;
 import org.thingsboard.server.dao.yunteng.entities.TkTriggerEntity;
 
 import java.util.List;

@@ -2,7 +2,7 @@
 <!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
 
 <mapper namespace="org.thingsboard.server.dao.yunteng.mapper.DoActionMapper">
-    <resultMap id="actionDTO" type="org.thingsboard.server.common.data.yunteng.dto.DoActionDTO">
+    <resultMap id="actionDTO" type="org.thingsboard.server.common.data.yunteng.dto.scene.DoActionDTO">
         <result property="id" column="id"/>
         <result property="deviceId" column="device_id"
                 typeHandler="org.thingsboard.server.dao.yunteng.mapper.ListStringTypeHandler"/>

@@ -2,7 +2,7 @@
 <!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
 
 <mapper namespace="org.thingsboard.server.dao.yunteng.mapper.DoConditionMapper">
-    <resultMap id="conditionDTO" type="org.thingsboard.server.common.data.yunteng.dto.DoConditionDTO">
+    <resultMap id="conditionDTO" type="org.thingsboard.server.common.data.yunteng.dto.scene.DoConditionDTO">
         <result property="id" column="id"/>
         <result property="entityId" column="entity_id"
                 typeHandler="org.thingsboard.server.dao.yunteng.mapper.ListStringTypeHandler"/>

@@ -2,7 +2,7 @@
 <!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
 
 <mapper namespace="org.thingsboard.server.dao.yunteng.mapper.SceneLinkageMapper">
-    <resultMap id="sceneLinkageMap" type="org.thingsboard.server.common.data.yunteng.dto.SceneLinkageDTO">
+    <resultMap id="sceneLinkageMap" type="org.thingsboard.server.common.data.yunteng.dto.scene.SceneLinkageDTO">
         <result property="id" column="id"/>
         <result property="name" column="name"/>
         <result property="organizationId" column="organization_id"/>

@@ -2,7 +2,7 @@
 <!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
 
 <mapper namespace="org.thingsboard.server.dao.yunteng.mapper.TriggerMapper">
-    <resultMap id="triggerDTO" type="org.thingsboard.server.common.data.yunteng.dto.TriggerDTO">
+    <resultMap id="triggerDTO" type="org.thingsboard.server.common.data.yunteng.dto.scene.TriggerDTO">
         <result property="id" column="id"/>
         <result property="entityId" column="entity_id"
                 typeHandler="org.thingsboard.server.dao.yunteng.mapper.ListStringTypeHandler"/>

@@ -21,7 +21,7 @@ import org.thingsboard.server.common.data.id.DeviceId;
 import org.thingsboard.server.common.data.yunteng.constant.FastIotConstants;
 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.dto.scene.TriggerDTO;
 import org.thingsboard.server.common.data.yunteng.enums.*;
 import org.thingsboard.server.common.data.yunteng.utils.JacksonUtil;
 import org.thingsboard.server.common.data.yunteng.utils.SpringBeanUtils;
@@ -93,7 +93,7 @@ class ReactState {
    * @throws ExecutionException
    * @throws InterruptedException
    */
-  public void process(TbContext ctx, TbMsg msg,  String deviceId)
+  public void process(TbContext ctx, TbMsg msg,  String prefixId,String deviceId)
       throws ExecutionException, InterruptedException {
 
     StringBuilder detail = new StringBuilder();
@@ -126,7 +126,13 @@ class ReactState {
                                     return false;
                                   }
                                   try {
-                                    if (triggerState.process(ctx, msg)) {
+                                    boolean fresh = false;
+                                    if(trigger.getId().equals(prefixId)&&msg.getOriginator().getId().toString().equals(id)){
+                                      fresh=true;
+                                    }
+                                    boolean result = triggerState.process(ctx, msg,fresh);
+                                    log.error(String.format("触发器【%s】刷新【%s】结果【%s】触发器设备【%s】数据设备【%s】数据内容【%s】",trigger.getId(),fresh,result,id,msg.getOriginator(),msg.getData()));
+                                    if (result) {
                                       detail.append(
                                           triggerState.getAlarmDetails() == null
                                               ? ""
@@ -150,41 +156,45 @@ class ReactState {
             });
 
     /** 执行条件的所有设备都满足才为true */
-    AtomicBoolean conditionMatched = new AtomicBoolean(false);
-    if (triggerMatched.get()) {
-      conditionMatched.set(true);
-      Optional.ofNullable(conditions)
-          .ifPresent(
-              t -> {
-                t.forEach(
-                    condition -> {
-                      ScopeEnum entityType = condition.getEntityType();
-                      List<String> conditionDevices = condition.getEntityId();
-                      String tkProjectId = condition.getDeviceProfileId();
-                      if (ScopeEnum.ALL.equals(entityType)) {
-                        conditionDevices =
-                            ytDeviceService.findTbDeviceIdsByDeviceProfileId(
-                                tkProjectId, condition.getTenantId());
-                      }
-                      conditionMatched.set(
-                          !conditionDevices.stream()
-                              .anyMatch(
-                                  id -> {
-                                    TriggerState conditionState =
-                                        getOrCreateConditionState(condition, tkProjectId, id);
-                                    try {
-                                      return !conditionState.process(ctx, msg);
-                                    } catch (ExecutionException e) {
-                                      throw new RuntimeException(e);
-                                    } catch (InterruptedException e) {
-                                      throw new RuntimeException(e);
-                                    }
-                                  }));
+    AtomicBoolean conditionMatched = new AtomicBoolean(true);
+    Optional.ofNullable(conditions)
+            .ifPresent(
+                    t -> {
+                      t.forEach(
+                              condition -> {
+                                ScopeEnum entityType = condition.getEntityType();
+                                List<String> conditionDevices = condition.getEntityId();
+                                String tkProjectId = condition.getDeviceProfileId();
+                                if (ScopeEnum.ALL.equals(entityType)) {
+                                  conditionDevices =
+                                          ytDeviceService.findTbDeviceIdsByDeviceProfileId(
+                                                  tkProjectId, condition.getTenantId());
+                                }
+                                conditionMatched.set(
+                                        !conditionDevices.stream()
+                                                .anyMatch(
+                                                        id -> {
+                                                          TriggerState conditionState =
+                                                                  getOrCreateConditionState(condition, tkProjectId, id);
+                                                          try {
+                                                            boolean fresh = false;
+                                                            if(msg.getOriginator().getId().toString().equals(id)){
+                                                              fresh=true;
+                                                            }
+                                                            boolean result = conditionState.process(ctx, msg,fresh);
+                                                            log.warn(String.format("执行器【%s】刷新【%s】结果【%s】执行器设备【%s】数据设备【%s】数据内容【%s】",condition.getId(),fresh,result,id,msg.getOriginator(),msg.getData()));
+                                                            return !result;
+                                                          } catch (ExecutionException e) {
+                                                            throw new RuntimeException(e);
+                                                          } catch (InterruptedException e) {
+                                                            throw new RuntimeException(e);
+                                                          }
+                                                        }));
+                              });
                     });
-              });
-    }
 
     if (triggerMatched.get() && conditionMatched.get()) {
+      log.error(String.format("设备【%s】的消息内容【%s】触发动作",deviceId,msg.getData()));
       for (TkDoActionEntity item : actions) {
         if (ActionTypeEnum.MSG_NOTIFY.equals(item.getOutTarget())) {
           noticeMsg(ctx, msg, item, deviceId, detail.toString(), msg.getTs());
@@ -216,6 +226,7 @@ class ReactState {
         || (trigger.getEntityType().equals(ScopeEnum.ALL)
             && trigger.getDeviceProfileId().equals(profileId))) {
       TriggerState state = createTriggerState(deviceId, trigger.getTriggerCondition());
+      log.error(String.format("新建设备【%s】的触发器",deviceId));
       triggerState.put(cacheKey, state);
       return state;
     }
@@ -267,7 +278,7 @@ class ReactState {
         || (condition.getEntityType().equals(ScopeEnum.ALL)
             && condition.getDeviceProfileId().equals(profileId))) {
       TriggerState state = createTriggerState(deviceId, condition.getTriggerCondition());
-      triggerState.put(cacheKey, state);
+      conditionState.put(cacheKey, state);
       return state;
     }
     return null;
@@ -397,7 +408,7 @@ class ReactState {
   private void clearAlarm(TbContext ctx, TbMsg msg, String deviceId, String key)
       throws ExecutionException, InterruptedException {
     TriggerState clearState = getOrCreateClearState(deviceId, key);
-    if (clearState != null && clearState.process(ctx, msg)) {
+    if (clearState != null && clearState.process(ctx, msg,true)) {
       ctx.getAlarmService()
           .clearAlarmForResult(
               ctx.getTenantId(),

@@ -25,6 +25,7 @@ import org.thingsboard.rule.engine.profile.SnapshotUpdate;
 import org.thingsboard.rule.engine.yunteng.utils.TriggerRuleState;
 import org.thingsboard.server.common.data.device.profile.AlarmConditionKeyType;
 import org.thingsboard.server.common.data.plugin.ComponentType;
+import org.thingsboard.server.common.data.yunteng.dto.scene.RuleFilterDTO;
 import org.thingsboard.server.common.msg.TbMsg;
 import org.thingsboard.server.common.msg.queue.PartitionChangeMsg;
 
@@ -64,30 +65,30 @@ public class TbSceneReactNode implements TbNode {
       ctx.tellSuccess(msg);
       return;
     }
-    List<String> devScence = config.getScenes().get(deviceId);
+    List<RuleFilterDTO> devScence = config.getScenes().get(deviceId);
     if (devScence != null && !devScence.isEmpty()) {
       devScence.stream()
           .forEach(
               t -> {
-                ReactState react = getOrCreateReactState(ctx, config, t);
+                ReactState react = getOrCreateReactState(ctx, config, t.getScenId());
                 if (react != null) {
                   try {
-                    react.process(ctx, msg, deviceId);
+                    react.process(ctx, msg,t.getRuleId(), deviceId);
                   } catch (Exception e) {
                     ctx.tellFailure(msg, e);
                   }
                 }
               });
     }
-    List<String> projectScence = config.getProject().get(projectId);
+    List<RuleFilterDTO> projectScence = config.getProject().get(projectId);
     if (projectScence != null && !projectScence.isEmpty()) {
       projectScence.stream()
           .forEach(
               t -> {
-                ReactState react = getOrCreateReactState(ctx, config, t);
+                ReactState react = getOrCreateReactState(ctx, config, t.getScenId());
                 if (react != null) {
                   try {
-                    react.process(ctx, msg, deviceId);
+                    react.process(ctx, msg,t.getRuleId(), deviceId);
                   } catch (Exception e) {
                     ctx.tellFailure(msg, e);
                   }

@@ -6,16 +6,17 @@ import java.util.List;
 import java.util.Map;
 import lombok.Data;
 import org.thingsboard.rule.engine.api.NodeConfiguration;
+import org.thingsboard.server.common.data.yunteng.dto.scene.RuleFilterDTO;
 
 @Data
 public class TbSceneReactNodeConfig implements NodeConfiguration<TbSceneReactNodeConfig> {
 
   /** 【TB设备配置ID,TK产品ID】产品信息 */
   private Map<String, String> profile;
-  /** 【触发器的TK产品ID,场景】哪些产品会触发场景联动 */
-  private Map<String, List<String>> project;
-  /** 【触发器的TB设备ID,场景】哪些设备会触发场景联动 */
-  private Map<String, List<String>> scenes;
+  /** 【TK产品ID,场景】哪些产品会触发场景联动 */
+  private Map<String, List<RuleFilterDTO>> project;
+  /** 【TB设备ID,场景】哪些设备会触发场景联动 */
+  private Map<String, List<RuleFilterDTO>> scenes;
   /** 【TK场景ID,场景名称】场景联动信息 */
   private Map<String, String> names;
   /** 【TK场景ID,组织ID】场景联动所属组织信息 */
@@ -24,8 +25,8 @@ public class TbSceneReactNodeConfig implements NodeConfiguration<TbSceneReactNod
   @Override
   public TbSceneReactNodeConfig defaultConfiguration() {
     TbSceneReactNodeConfig config = new TbSceneReactNodeConfig();
-    Map<String, List<String>> sceneMap = new HashMap<>();
-    Map<String, List<String>> projectScenes = new HashMap<>();
+    Map<String, List<RuleFilterDTO>> sceneMap = new HashMap<>();
+    Map<String, List<RuleFilterDTO>> projectScenes = new HashMap<>();
 
     config.setScenes(sceneMap);
     config.setProject(projectScenes);

@@ -73,8 +73,8 @@ class TriggerState {
     this.alarmDetails = alarmDetails;
   }
 
-  public boolean process(TbContext ctx, TbMsg msg) throws ExecutionException, InterruptedException {
-    if (!msg.getOriginator().getId().toString().equals(originator)) {
+  public boolean process(TbContext ctx, TbMsg msg,boolean needFresh) throws ExecutionException, InterruptedException {
+    if (!needFresh) {
       return ruleMatched;
     }
     if (latestValues == null) {