refactor: 场景联动触发器关联实体字段从deviceId改为entityId

@@ -17,7 +17,7 @@ import org.thingsboard.server.common.data.yunteng.enums.TriggerTypeEnum;
 public class DoCondition extends TenantBaseEntity {
 public class DoCondition extends TenantBaseEntity {
   private static final long serialVersionUID = 2827674377416477646L;
   private static final long serialVersionUID = 2827674377416477646L;
   /** 设备 */
   /** 设备 */
-  private String deviceId;
+  private String entityId;
   @TableField(typeHandler = EnumTypeHandler.class)
   @TableField(typeHandler = EnumTypeHandler.class)
   private TriggerTypeEnum triggerType;
   private TriggerTypeEnum triggerType;
   @TableField(typeHandler = JacksonTypeHandler.class)
   @TableField(typeHandler = JacksonTypeHandler.class)

@@ -17,7 +17,7 @@ public class Trigger extends TenantBaseEntity {
 
 
   private static final long serialVersionUID = -1847061176808850967L;
   private static final long serialVersionUID = -1847061176808850967L;
   /** 设备 */
   /** 设备 */
-  private String deviceId;
+  private String entityId;
   @TableField(typeHandler = EnumTypeHandler.class)
   @TableField(typeHandler = EnumTypeHandler.class)
   private TriggerTypeEnum triggerType;
   private TriggerTypeEnum triggerType;
   @TableField(typeHandler = JacksonTypeHandler.class)
   @TableField(typeHandler = JacksonTypeHandler.class)

@@ -3,17 +3,12 @@ import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import lombok.RequiredArgsConstructor;
 import lombok.RequiredArgsConstructor;
 import org.springframework.stereotype.Service;
 import org.springframework.stereotype.Service;
-import org.thingsboard.server.common.data.id.EntityId;
 import org.thingsboard.server.common.data.yunteng.dto.TriggerDTO;
 import org.thingsboard.server.common.data.yunteng.dto.TriggerDTO;
-import org.thingsboard.server.dao.yunteng.entities.TenantRole;
 import org.thingsboard.server.dao.yunteng.entities.Trigger;
 import org.thingsboard.server.dao.yunteng.entities.Trigger;
-import org.thingsboard.server.dao.yunteng.mapper.RoleMapper;
 import org.thingsboard.server.dao.yunteng.mapper.TriggerMapper;
 import org.thingsboard.server.dao.yunteng.mapper.TriggerMapper;
 import org.thingsboard.server.dao.yunteng.service.AbstractBaseService;
 import org.thingsboard.server.dao.yunteng.service.AbstractBaseService;
 import org.thingsboard.server.dao.yunteng.service.TriggerService;
 import org.thingsboard.server.dao.yunteng.service.TriggerService;
 
 
-import java.util.Optional;
-
 /**
 /**
  * @Description
  * @Description
  * @Author cxy
  * @Author cxy
@@ -28,7 +23,7 @@ public class TriggerServiceImpl extends AbstractBaseService<TriggerMapper, Trigg
     public TriggerDTO getTrigger(String sceneId, String deviceId) {
     public TriggerDTO getTrigger(String sceneId, String deviceId) {
         LambdaQueryWrapper filter = new QueryWrapper<Trigger>().lambda()
         LambdaQueryWrapper filter = new QueryWrapper<Trigger>().lambda()
                 .eq(Trigger::getSceneLinkageId,sceneId)
                 .eq(Trigger::getSceneLinkageId,sceneId)
-                .eq(Trigger::getDeviceId,deviceId);
+                .eq(Trigger::getEntityId,deviceId);
         return triggerMapper.selectOne(filter).getDTO(TriggerDTO.class);
         return triggerMapper.selectOne(filter).getDTO(TriggerDTO.class);
     }
     }
 }
 }

@@ -4,7 +4,7 @@
 <mapper namespace="org.thingsboard.server.dao.yunteng.mapper.DoConditionMapper">
 <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.DoConditionDTO">
         <result property="id" column="id"/>
         <result property="id" column="id"/>
-        <result property="deviceId" column="device_id"/>
+        <result property="entityId" column="entity_id"/>
         <result property="triggerCondition" column="trigger_condition" typeHandler="com.baomidou.mybatisplus.extension.handlers.JacksonTypeHandler"/>
         <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="triggerType" column="trigger_type" typeHandler="org.apache.ibatis.type.EnumTypeHandler"/>
         <result property="sceneLinkageId" column="scene_linkage_id"/>
         <result property="sceneLinkageId" column="scene_linkage_id"/>

@@ -4,7 +4,7 @@
 <mapper namespace="org.thingsboard.server.dao.yunteng.mapper.TriggerMapper">
 <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.TriggerDTO">
         <result property="id" column="id"/>
         <result property="id" column="id"/>
-        <result property="deviceId" column="device_id"/>
+        <result property="entityId" column="entity_id"/>
         <result property="triggerCondition" column="trigger_condition" typeHandler="com.baomidou.mybatisplus.extension.handlers.JacksonTypeHandler"/>
         <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="triggerType" column="trigger_type" typeHandler="org.apache.ibatis.type.EnumTypeHandler"/>
         <result property="sceneLinkageId" column="scene_linkage_id"/>
         <result property="sceneLinkageId" column="scene_linkage_id"/>