refactor: 场景联动

@@ -187,7 +187,7 @@ public class YtConvertDataToController extends BaseController {
     String sceneId = convertReqDTO.getId();
     String currentTenant = getCurrentUser().getCurrentTenantId();
     Integer sceneStatus = convertReqDTO.getStatus();
-    JsonNode configuration = sceneLinkageService.getRuleNodeConfig(sceneId,currentTenant,sceneStatus);
+    JsonNode configuration = sceneLinkageService.getRuleNodeConfig(sceneId,currentTenant,getCurrentUser().getCustomerId().getId().toString(),sceneStatus);
     boolean noValue = configuration == null;
     if (noValue && convertReqDTO.getStatus() == FastIotConstants.StateValue.DISABLE) {
       status = FastIotConstants.StateValue.DISABLE;

@@ -529,12 +529,12 @@ spring:
     database-platform: "${SPRING_JPA_DATABASE_PLATFORM:org.hibernate.dialect.PostgreSQLDialect}"
   datasource:
     driverClassName: "${SPRING_DRIVER_CLASS_NAME:org.postgresql.Driver}"
-    #url: "${SPRING_DATASOURCE_URL:jdbc:postgresql://47.99.141.212:20638/thingsboard-3.3.2}"
-    #username: "${SPRING_DATASOURCE_USERNAME:postgres}"
-    #password: "${SPRING_DATASOURCE_PASSWORD:Vrr861!@waja}"
-    url: "${SPRING_DATASOURCE_URL:jdbc:postgresql://101.133.234.90:28776/thingsboard-3.3.2}"
+    url: "${SPRING_DATASOURCE_URL:jdbc:postgresql://47.99.141.212:20638/thingsboard-3.3.2}"
     username: "${SPRING_DATASOURCE_USERNAME:postgres}"
-    password: "${SPRING_DATASOURCE_PASSWORD:Bua312!!iwcw}"
+    password: "${SPRING_DATASOURCE_PASSWORD:Vrr861!@waja}"
+#    url: "${SPRING_DATASOURCE_URL:jdbc:postgresql://101.133.234.90:28776/thingsboard-3.3.2}"
+#    username: "${SPRING_DATASOURCE_USERNAME:postgres}"
+#    password: "${SPRING_DATASOURCE_PASSWORD:Bua312!!iwcw}"
     hikari:
       maximumPoolSize: "${SPRING_DATASOURCE_MAXIMUM_POOL_SIZE:16}"
 
@@ -1126,8 +1126,8 @@ file:
       randomFileName: ${file.storage.randomFileName}
 account:
   info:
-    emailSuffix: thingskit.com
+    emailSuffix: yunteng.com
     defaultPassword: 123456
 logging:
   level:
-    org.thingsboard.server.dao.yunteng.mapper: error
+    org.thingsboard.server.dao.yunteng.mapper: debug

@@ -55,6 +55,7 @@ public enum ErrorMessage {
   FILE_NOT_FOUND(400036,"文件未找到"),
   STORE_FILE_FAILED(400037,"文件存储失败"),
   NOT_BELONG_CURRENT_TENANT(400038,"不属于当前租户"),
+  DEVICE_LOSED(400039,"设备相关参数丢失"),
   HAVE_NO_PERMISSION(500002,"没有修改权限");
   private final int code;
   private String message;

+package org.thingsboard.server.common.data.yunteng.dto;
+
+import com.fasterxml.jackson.databind.JsonNode;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+import org.thingsboard.server.common.data.alarm.AlarmSeverity;
+import org.thingsboard.server.common.data.device.profile.AlarmRule;
+import org.thingsboard.server.common.data.yunteng.enums.ActionTypeEnum;
+import org.thingsboard.server.common.data.yunteng.enums.ScopeEnum;
+
+import java.util.List;
+
+/**
+ * @Description  场景联动动作告警通知
+ * @Author cxy
+ * @Date 2021/11/24 17:32
+ */
+@Data
+public class ActionAlarmDTO extends  TenantDTO{
+
+
+    private List<ActionTypeEnum> noticeType;
+
+    /**告警联系人*/
+    private List<String> noticeUser;
+
+    private AlarmSeverity alarmLevel;
+
+
+    private AlarmRule clearRule;
+
+}

@@ -5,25 +5,32 @@ import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
 import lombok.EqualsAndHashCode;
 import org.thingsboard.server.common.data.yunteng.enums.ActionTypeEnum;
+import org.thingsboard.server.common.data.yunteng.enums.ScopeEnum;
 
 import java.util.List;
 
-/** @Description 场景联动执行动作数据传输表 @Author cxy @Date 2021/11/24 17:32 */
+/**
+ * @Description  场景联动执行动作数据传输表
+ * @Author cxy
+ * @Date 2021/11/24 17:32
+ */
 @Data
 @EqualsAndHashCode(callSuper = true)
-public class DoActionDTO extends TenantDTO {
+public class DoActionDTO  extends  TenantDTO{
 
-  @ApiModelProperty(value = "所属设备id")
-  private String deviceId;
+    @ApiModelProperty(value = "所属设备id")
+    private List<String> deviceId;
+    private ScopeEnum entityType;
 
-  @ApiModelProperty(value = "场景联动内容")
-  private JsonNode doContext;
+
+    @ApiModelProperty(value = "场景联动内容")
+    private JsonNode doContext;
 
   @ApiModelProperty(value = "输出目标:设备,告警,其他")
   private ActionTypeEnum outTarget;
 
-  @ApiModelProperty(value = "场景联动id")
-  private String sceneLinkageId;
+    @ApiModelProperty(value = "场景联动id")
+    private String sceneLinkageId;
 
   @ApiModelProperty(value = "输出目标为告警才进行配置")
   private String alarmProfileId;

@@ -4,8 +4,12 @@ import io.swagger.annotations.ApiModelProperty;
 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.enums.ScopeEnum;
 import org.thingsboard.server.common.data.yunteng.enums.TriggerTypeEnum;
 
+import java.util.List;
+
 /**
  * @Description 场景联动执行条件数据传输表
  * @Author cxy
@@ -18,11 +22,13 @@ public class DoConditionDTO  extends TenantDTO{
     @ApiModelProperty(value = "触发器类型")
     private TriggerTypeEnum triggerType;
 
+
     @ApiModelProperty(value = "触发器关联实体")
-    private String entityId;
+    private ScopeEnum entityType;
+    private List<String> entityId;
 
     @ApiModelProperty(value = "触发条件")
-    private AlarmCondition triggerCondition;
+    private AlarmRule triggerCondition;
 
     @ApiModelProperty(value = "场景联动id")
     private String sceneLinkageId;

@@ -4,8 +4,13 @@ import io.swagger.annotations.ApiModelProperty;
 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.device.profile.AlarmSchedule;
+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
@@ -19,10 +24,13 @@ public class TriggerDTO extends TenantDTO{
     private TriggerTypeEnum triggerType;
 
     @ApiModelProperty(value = "触发器关联实体，例如：设备ID、场景联动ID、定时任务CRON表达式")
-    private String entityId;
+    private ScopeEnum entityType;
+    private List<String> entityId;
 
     @ApiModelProperty(value = "触发条件")
-    private AlarmCondition triggerCondition;
+    private AlarmRule triggerCondition;
+
+
 
     @ApiModelProperty(value = "场景联动id")
     private String sceneLinkageId;

+package org.thingsboard.server.common.data.yunteng.enums;
+
+/** 取值范围枚举值 */
+public enum ScopeEnum {
+  ALL,
+  PART
+}

@@ -3,31 +3,47 @@ package org.thingsboard.server.dao.yunteng.entities;
 import com.baomidou.mybatisplus.annotation.TableField;
 import com.baomidou.mybatisplus.annotation.TableName;
 import com.baomidou.mybatisplus.extension.handlers.JacksonTypeHandler;
+import com.fasterxml.jackson.annotation.JsonIgnore;
 import com.fasterxml.jackson.databind.JsonNode;
 import lombok.Data;
 import lombok.EqualsAndHashCode;
 import org.apache.ibatis.type.EnumTypeHandler;
 import org.thingsboard.server.common.data.yunteng.constant.ModelConstants;
 import org.thingsboard.server.common.data.yunteng.enums.ActionTypeEnum;
+import org.thingsboard.server.common.data.yunteng.enums.ScopeEnum;
+import org.thingsboard.server.dao.yunteng.mapper.ListStringTypeHandler;
 
-/** @Description 执行动作 @Author cxy @Date 2021/11/24 17:24 */
+import java.util.Arrays;
+import java.util.List;
+
+/**
+ * @Description 执行动作 @Author cxy @Date 2021/11/24 17:24
+ */
 @Data
 @TableName(value = ModelConstants.Table.IOTFS_DO_ACTION_TABLE_NAME, autoResultMap = true)
 @EqualsAndHashCode(callSuper = true)
 public class DoAction extends TenantBaseEntity {
 
-  private static final long serialVersionUID = -5459834451418047957L;
+    private static final long serialVersionUID = -5459834451418047957L;
+
 
-  private String deviceId;
+    @TableField(typeHandler = ListStringTypeHandler.class)
+    private List<String> deviceId;
 
-  @TableField(typeHandler = EnumTypeHandler.class)
-  private ActionTypeEnum outTarget;
-  /** 场景联动内容 */
-  @TableField(typeHandler = JacksonTypeHandler.class)
-  private JsonNode doContext;
+    @TableField(typeHandler = EnumTypeHandler.class)
+    private ScopeEnum entityType;
+    @TableField(typeHandler = EnumTypeHandler.class)
+    private ActionTypeEnum outTarget;
+    /**
+     * 场景联动内容
+     */
+    @TableField(typeHandler = JacksonTypeHandler.class)
+    private JsonNode doContext;
 
-  /** 场景联动id */
-  private String sceneLinkageId;
+    /**
+     * 场景联动id
+     */
+    private String sceneLinkageId;
 
-  private String alarmProfileId;
+    private String alarmProfileId;
 }

@@ -7,20 +7,36 @@ import lombok.Data;
 import lombok.EqualsAndHashCode;
 import org.apache.ibatis.type.EnumTypeHandler;
 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.constant.ModelConstants;
+import org.thingsboard.server.common.data.yunteng.enums.ScopeEnum;
 import org.thingsboard.server.common.data.yunteng.enums.TriggerTypeEnum;
+import org.thingsboard.server.dao.yunteng.mapper.ListStringTypeHandler;
 
-/** @Description 执行条件实体表 @Author cxy @Date 2021/11/24 17:16 */
+import java.util.Arrays;
+import java.util.List;
+
+/**
+ * @Description 执行条件实体表 @Author cxy @Date 2021/11/24 17:16
+ */
 @Data
-@TableName(value = ModelConstants.Table.IOTFS_DO_CONDITION_TABLE_NAME,autoResultMap=true)
+@TableName(value = ModelConstants.Table.IOTFS_DO_CONDITION_TABLE_NAME, autoResultMap = true)
 @EqualsAndHashCode(callSuper = true)
 public class DoCondition extends TenantBaseEntity {
-  private static final long serialVersionUID = 2827674377416477646L;
-  /** 设备 */
-  private String entityId;
-  @TableField(typeHandler = EnumTypeHandler.class)
-  private TriggerTypeEnum triggerType;
-  @TableField(typeHandler = JacksonTypeHandler.class)
-  private AlarmCondition triggerCondition;
-  private String sceneLinkageId;
+    private static final long serialVersionUID = 2827674377416477646L;
+    /**
+     * 设备
+     */
+    @TableField(typeHandler = ListStringTypeHandler.class)
+    private List<String> entityId;
+
+    @TableField(typeHandler = EnumTypeHandler.class)
+    private ScopeEnum entityType;
+    @TableField(typeHandler = EnumTypeHandler.class)
+    private TriggerTypeEnum triggerType;
+    @TableField(typeHandler = JacksonTypeHandler.class)
+    private AlarmRule triggerCondition;
+    private String sceneLinkageId;
+
+
 }

 package org.thingsboard.server.dao.yunteng.entities;
+
 import com.baomidou.mybatisplus.annotation.TableField;
 import com.baomidou.mybatisplus.annotation.TableName;
 import com.baomidou.mybatisplus.extension.handlers.JacksonTypeHandler;
@@ -6,21 +7,37 @@ import lombok.Data;
 import lombok.EqualsAndHashCode;
 import org.apache.ibatis.type.EnumTypeHandler;
 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.constant.ModelConstants;
+import org.thingsboard.server.common.data.yunteng.enums.ScopeEnum;
 import org.thingsboard.server.common.data.yunteng.enums.TriggerTypeEnum;
+import org.thingsboard.server.dao.yunteng.mapper.ListStringTypeHandler;
+
+import java.util.Arrays;
+import java.util.List;
 
-/** @Description 触发器实体表 @Author cxy @Date 2021/11/24 17:06 */
+/**
+ * @Description 触发器实体表 @Author cxy @Date 2021/11/24 17:06
+ */
 @Data
-@TableName(value = ModelConstants.Table.IOTFS_TRIGGER_TABLE_NAME,autoResultMap=true)
+@TableName(value = ModelConstants.Table.IOTFS_TRIGGER_TABLE_NAME, autoResultMap = true)
 @EqualsAndHashCode(callSuper = true)
 public class Trigger extends TenantBaseEntity {
 
-  private static final long serialVersionUID = -1847061176808850967L;
-  /** 设备 */
-  private String entityId;
-  @TableField(typeHandler = EnumTypeHandler.class)
-  private TriggerTypeEnum triggerType;
-  @TableField(typeHandler = JacksonTypeHandler.class)
-  private AlarmCondition triggerCondition;
-  private String sceneLinkageId;
+    private static final long serialVersionUID = -1847061176808850967L;
+    /**
+     * 设备
+     */
+    @TableField(typeHandler = ListStringTypeHandler.class)
+    private List<String> entityId;
+
+    @TableField(typeHandler = EnumTypeHandler.class)
+    private ScopeEnum entityType;
+    @TableField(typeHandler = EnumTypeHandler.class)
+    private TriggerTypeEnum triggerType;
+    @TableField(typeHandler = JacksonTypeHandler.class)
+    private AlarmRule triggerCondition;
+    private String sceneLinkageId;
+
+
 }

@@ -268,7 +268,7 @@ public class SceneLinkageServiceImpl extends AbstractBaseService<SceneLinkageMap
         List<DoConditionDTO> conditionDTOS = sceneLinkageDTO.getDoConditions();
         if (conditionDTOS != null && !conditionDTOS.isEmpty()) {
             for (DoConditionDTO condition : conditionDTOS) {
-                if (!ActionTypeEnum.DEVICE_OUT.equals(condition.getTriggerType())) {
+                if (!TriggerTypeEnum.DEVICE_TRIGGER.equals(condition.getTriggerType())) {
                     continue;
                 }
                 List<String> deviceIds = condition.getEntityId();

@@ -5,12 +5,15 @@ 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.enums.ScopeEnum;
 import org.thingsboard.server.dao.yunteng.entities.Trigger;
 import org.thingsboard.server.dao.yunteng.mapper.TriggerMapper;
 import org.thingsboard.server.dao.yunteng.service.AbstractBaseService;
 import org.thingsboard.server.dao.yunteng.service.TriggerService;
 
+import java.util.List;
 import java.util.Optional;
+import java.util.stream.Collectors;
 
 /**
  * @Description
@@ -24,15 +27,16 @@ public class TriggerServiceImpl extends AbstractBaseService<TriggerMapper, Trigg
     private final TriggerMapper triggerMapper;
 
     @Override
-    public TriggerDTO getTrigger(String sceneId, String deviceId) {
+    public List<TriggerDTO> getTrigger(String sceneId) {
         LambdaQueryWrapper filter = new QueryWrapper<Trigger>().lambda()
-                .eq(Trigger::getSceneLinkageId, sceneId)
-                .eq(Trigger::getEntityId, deviceId);
-        Trigger trigger = triggerMapper.selectOne(filter);
-        if(trigger == null){
+                .eq(Trigger::getSceneLinkageId, sceneId);
+        List<Trigger> trigger = triggerMapper.selectList(filter);
+        if(trigger == null || trigger.isEmpty()){
             return null;
         }
 
-        return trigger.getDTO(TriggerDTO.class);
+        return trigger.stream()
+                .map(item -> item.getDTO(TriggerDTO.class))
+                .collect(Collectors.toList());
     }
 }

+package org.thingsboard.server.dao.yunteng.mapper;
+
+/**
+ * @version V1.0
+ * @Description :
+ * 1.其它地方抛出异常，交由控制层统一处理
+ * 2.服务层注意持久化的事务管理
+ * @Dependency: 依赖包
+ * @Author: junlianglee
+ * @Date Created in 2021/12/28$
+ * @Copyright 2016-2018  - Powered By 云腾五洲
+ */
+
+import org.apache.ibatis.type.BaseTypeHandler;
+import org.apache.ibatis.type.JdbcType;
+
+import java.sql.CallableStatement;
+import java.sql.PreparedStatement;
+import java.sql.ResultSet;
+import java.sql.SQLException;
+import java.util.Arrays;
+import java.util.List;
+
+public class ListStringTypeHandler extends BaseTypeHandler {
+
+    @Override
+    public Object getNullableResult(ResultSet rs, String columnName)
+            throws SQLException {
+        return Arrays.asList(rs.getString(columnName).split(","));
+    }
+
+    @Override
+    public Object getNullableResult(ResultSet resultSet, int i) throws SQLException {
+        return Arrays.asList(resultSet.getString(i).split(","));
+    }
+
+    @Override
+    public Object getNullableResult(CallableStatement cs, int columnIndex)
+            throws SQLException {
+        return Arrays.asList(cs.getString(columnIndex).split(","));
+    }
+
+    @Override
+    public void setNonNullParameter(PreparedStatement ps, int i,
+                                    Object parameter, JdbcType jdbcType) throws SQLException {
+        ps.setString(i, ((List) parameter).toString());
+    }
+}

@@ -5,6 +5,7 @@ import org.thingsboard.server.common.data.yunteng.dto.MenuDTO;
 import org.thingsboard.server.common.data.yunteng.dto.TriggerDTO;
 import org.thingsboard.server.dao.yunteng.entities.Trigger;
 
+import java.util.List;
 import java.util.Optional;
 
 /**
@@ -13,5 +14,5 @@ import java.util.Optional;
  * @Date 2021/12/6 19:52
  */
 public interface TriggerService extends BaseService<Trigger>{
-    TriggerDTO getTrigger(String sceneId, String deviceId);
+    List<TriggerDTO> getTrigger(String sceneId);
 }

@@ -4,7 +4,8 @@
 <mapper namespace="org.thingsboard.server.dao.yunteng.mapper.DoActionMapper">
     <resultMap id="actionDTO" type="org.thingsboard.server.common.data.yunteng.dto.DoActionDTO">
         <result property="id" column="id"/>
-        <result property="deviceId" column="device_id"/>
+        <result property="deviceId" column="device_id" typeHandler="org.thingsboard.server.dao.yunteng.mapper.ListStringTypeHandler"/>
+        <result property="entityType" column="entity_type" typeHandler="org.apache.ibatis.type.EnumTypeHandler"/>
         <result property="doContext" column="do_context" typeHandler="com.baomidou.mybatisplus.extension.handlers.JacksonTypeHandler"/>
         <result property="outTarget" column="out_target" typeHandler="org.apache.ibatis.type.EnumTypeHandler"/>
         <result property="sceneLinkageId" column="scene_linkage_id"/>

@@ -4,7 +4,8 @@
 <mapper namespace="org.thingsboard.server.dao.yunteng.mapper.DoConditionMapper">
     <resultMap id="conditionDTO" type="org.thingsboard.server.common.data.yunteng.dto.DoConditionDTO">
         <result property="id" column="id"/>
-        <result property="entityId" column="entity_id"/>
+        <result property="entityId" column="entity_id" typeHandler="org.thingsboard.server.dao.yunteng.mapper.ListStringTypeHandler"/>
+        <result property="entityType" column="entity_type" typeHandler="org.apache.ibatis.type.EnumTypeHandler"/>
         <result property="triggerCondition" column="trigger_condition" typeHandler="com.baomidou.mybatisplus.extension.handlers.JacksonTypeHandler"/>
         <result property="triggerType" column="trigger_type" typeHandler="org.apache.ibatis.type.EnumTypeHandler"/>
         <result property="sceneLinkageId" column="scene_linkage_id"/>

@@ -4,7 +4,8 @@
 <mapper namespace="org.thingsboard.server.dao.yunteng.mapper.TriggerMapper">
     <resultMap id="triggerDTO" type="org.thingsboard.server.common.data.yunteng.dto.TriggerDTO">
         <result property="id" column="id"/>
-        <result property="entityId" column="entity_id"/>
+        <result property="entityId" column="entity_id" typeHandler="org.thingsboard.server.dao.yunteng.mapper.ListStringTypeHandler"/>
+        <result property="entityType" column="entity_type" typeHandler="org.apache.ibatis.type.EnumTypeHandler"/>
         <result property="triggerCondition" column="trigger_condition" typeHandler="com.baomidou.mybatisplus.extension.handlers.JacksonTypeHandler"/>
         <result property="triggerType" column="trigger_type" typeHandler="org.apache.ibatis.type.EnumTypeHandler"/>
         <result property="sceneLinkageId" column="scene_linkage_id"/>

@@ -5,12 +5,14 @@ package org.thingsboard.rule.engine.yunteng.scene;
 
 import com.fasterxml.jackson.databind.JsonNode;
 import lombok.extern.slf4j.Slf4j;
+import org.apache.commons.lang3.StringUtils;
 import org.jetbrains.annotations.NotNull;
 import org.thingsboard.rule.engine.api.TbContext;
 import org.thingsboard.server.common.data.DataConstants;
 import org.thingsboard.server.common.data.device.profile.AlarmCondition;
 import org.thingsboard.server.common.data.device.profile.AlarmConditionFilter;
 import org.thingsboard.server.common.data.device.profile.AlarmConditionFilterKey;
+import org.thingsboard.server.common.data.device.profile.AlarmRule;
 import org.thingsboard.server.common.data.rule.RuleNodeState;
 import org.thingsboard.server.common.data.yunteng.dto.TriggerDTO;
 import org.thingsboard.server.common.data.yunteng.utils.JacksonUtil;
@@ -38,7 +40,9 @@ class ReactState {
      * 键：设备主键
      * 值：设备指标参与的触发器
      */
-    private ConcurrentHashMap<String, TriggerState> triggerState = new ConcurrentHashMap<>();
+    private ConcurrentHashMap<String, TriggerState > triggerState = new ConcurrentHashMap<>();
+
+    private ConcurrentHashMap<String, TriggerState> clearState = new ConcurrentHashMap<>();
 
     /**场景联动的执行条件状态
      * 键：设备主键
@@ -50,6 +54,7 @@ class ReactState {
 
 
 
+    private final List<TriggerDTO> triggers;
     /**【场景联动的执行条件】懒加载*/
     private final List<DoCondition> conditions;
     /**【场景联动的执行集合】懒加载*/
@@ -64,6 +69,8 @@ class ReactState {
 
     ReactState(String reactId,TbContext ctx, TbSceneReactNodeConfig config) {
         this.reactId = reactId;
+        TriggerService triggerService = SpringBeanUtils.getBean(TriggerService.class);
+        this.triggers = triggerService.getTrigger(reactId);
         DoConditionService conditionService = SpringBeanUtils.getBean(DoConditionService.class);
         this.conditions = conditionService.getConditions(reactId);
         DoActionService actionService = SpringBeanUtils.getBean(DoActionService.class);
@@ -74,29 +81,48 @@ class ReactState {
 
 
     public void process(TbContext ctx, TbMsg msg,String deviceId) throws ExecutionException, InterruptedException {
-        TriggerState triggerState = getOrCreateTriggerState(deviceId);
-        boolean matched = false;
-        if( actions != null){
+
+
+
+
+        if( actions == null){
             ctx.tellSuccess(msg);
         }
 
-        if(triggerState != null){
-            matched = triggerState.process(ctx,msg);
+        boolean matched;
+        if(triggers == null || triggers.isEmpty()){
+            matched = true;
+        }else{
+            matched = false;
+            for(TriggerDTO trigger: triggers){
+                TriggerState triggerState = getOrCreateTriggerState(trigger,deviceId);
+                matched = triggerState.process(ctx,msg);
+                if(matched){
+                    break;
+                }
+            }
         }
 
 
         if(matched && conditions.size() >0 ){
             matched = false;
             for(DoCondition item:conditions){
-                TriggerState conditionState = getOrCreateConditionState(item.getEntityId(),item.getTriggerCondition());
-                boolean result = false;
-                if( conditionState != null){
-                    result =conditionState.process(ctx,msg);
-                }
-                if( result){
+                List<String> entityIds = item.getEntityId();
+                if(entityIds == null || entityIds.isEmpty()){
                     matched = true;
                     break;
                 }
+                for(String id:entityIds){
+                    TriggerState conditionState = getOrCreateConditionState(item.getId(),id,item.getTriggerCondition());
+                    if( conditionState == null
+                            || conditionState.process(ctx,msg)){
+                        matched = true;
+                        break;
+                    }
+                }
+                if(matched){
+                    break;
+                }
             }
         }
 
@@ -115,38 +141,40 @@ class ReactState {
 
 
 
-    protected TriggerState getOrCreateTriggerState(String deviceId) {
-        if(triggerState.containsKey(deviceId)){
-            return triggerState.get(deviceId);
+    protected TriggerState  getOrCreateTriggerState(TriggerDTO trigger,String deviceId) {
+        String triggerId = trigger.getId();
+        String cacheKey =triggerId+deviceId;
+        if(triggerState.containsKey(cacheKey)){
+            return triggerState.get(cacheKey);
         }
-        TriggerService triggerService = SpringBeanUtils.getBean(TriggerService.class);
-        TriggerDTO trigger =triggerService.getTrigger(reactId,deviceId);
-        if(trigger != null){
+        if(trigger.getEntityId().contains(deviceId)){
             TriggerState state = createTriggerState(deviceId, trigger.getTriggerCondition());
-            triggerState.put(deviceId, state);
+            triggerState.put(cacheKey, state);
             return state;
         }
         return null;
+
     }
 
-    protected TriggerState getOrCreateConditionState(String deviceId,AlarmCondition condition) {
-        if(conditionState.containsKey(deviceId)){
-            return conditionState.get(deviceId);
+    protected TriggerState getOrCreateConditionState(String conditionId, String deviceId, AlarmRule condition) {
+        String cacheKey =conditionId+deviceId;
+        if(conditionState.containsKey(cacheKey)){
+            return conditionState.get(cacheKey);
         }else{
             TriggerState state = createTriggerState(deviceId, condition);
-            conditionState.put(deviceId, state);
+            conditionState.put(cacheKey, state);
             return  state;
         }
 
     }
 
     @NotNull
-    private TriggerState createTriggerState(String deviceId, AlarmCondition condition) {
+    private TriggerState createTriggerState(String deviceId, AlarmRule rule) {
         Set<AlarmConditionFilterKey> filterKeys = new HashSet<>();
-        for(AlarmConditionFilter filter :condition.getCondition()){
+        for(AlarmConditionFilter filter :rule.getCondition().getCondition()){
             filterKeys.add(filter.getKey());
         }
-        TriggerState state = new TriggerState(deviceId,condition, filterKeys,null);
+        TriggerState state = new TriggerState(deviceId,rule, filterKeys,null);
 
         return  state;
     }

@@ -73,11 +73,11 @@ class TriggerState {
 
     private final Set<AlarmConditionFilterKey> entityKeys;
 
-    TriggerState( String originator, AlarmCondition condition,Set<AlarmConditionFilterKey> filterKeys,DynamicPredicateValueCtx dynamicPredicateValueCtx) {
+    TriggerState( String originator, AlarmRule rule,Set<AlarmConditionFilterKey> filterKeys,DynamicPredicateValueCtx dynamicPredicateValueCtx) {
 
         this.originator = originator;
         this.dynamicPredicateValueCtx = dynamicPredicateValueCtx;
-        ruleState = new TriggerRuleState(condition, filterKeys, new PersistedAlarmRuleState());
+        ruleState = new TriggerRuleState(rule.getCondition(), filterKeys, new PersistedAlarmRuleState(),rule.getSchedule());
         this.entityKeys = filterKeys;
     }
 

@@ -34,17 +34,7 @@ public class TriggerRuleState {
 
 
 
-    public TriggerRuleState(AlarmCondition condition, Set<AlarmConditionFilterKey> entityKeys, PersistedAlarmRuleState state) {
-        this.condition = condition;
-        this.schedule = new AnyTimeSchedule();
-        this.entityKeys = entityKeys;
-        if (state != null) {
-            this.state = state;
-        } else {
-            this.state = new PersistedAlarmRuleState(0L, 0L, 0L);
-        }
-        this.spec = getSpec(condition);
-    }
+
 
     public TriggerRuleState(AlarmCondition condition, Set<AlarmConditionFilterKey> entityKeys, PersistedAlarmRuleState state, AlarmSchedule schedule) {
         this.condition = condition;