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

1、修改字段名
2、修复场景联动保存时，触发器中设备有效性的验证逻辑

@@ -18,8 +18,8 @@ public class DoConditionDTO  extends TenantDTO{
     @ApiModelProperty(value = "触发器类型")
     @ApiModelProperty(value = "触发器类型")
     private TriggerTypeEnum triggerType;
     private TriggerTypeEnum triggerType;
 
 
-    @ApiModelProperty(value = "所属设备id")
-    private String deviceId;
+    @ApiModelProperty(value = "触发器关联实体")
+    private String entityId;
 
 
     @ApiModelProperty(value = "触发条件")
     @ApiModelProperty(value = "触发条件")
     private AlarmCondition triggerCondition;
     private AlarmCondition triggerCondition;

@@ -18,8 +18,8 @@ public class TriggerDTO extends TenantDTO{
     @ApiModelProperty(value = "触发器类型")
     @ApiModelProperty(value = "触发器类型")
     private TriggerTypeEnum triggerType;
     private TriggerTypeEnum triggerType;
 
 
-    @ApiModelProperty(value = "所属设备id")
-    private String deviceId;
+    @ApiModelProperty(value = "触发器关联实体，例如：设备ID、场景联动ID、定时任务CRON表达式")
+    private String entityId;
 
 
     @ApiModelProperty(value = "触发条件")
     @ApiModelProperty(value = "触发条件")
     private AlarmCondition triggerCondition;
     private AlarmCondition triggerCondition;

@@ -10,6 +10,7 @@ import org.springframework.transaction.annotation.Transactional;
 import org.thingsboard.server.common.data.yunteng.constant.FastIotConstants;
 import org.thingsboard.server.common.data.yunteng.constant.FastIotConstants;
 import org.thingsboard.server.common.data.yunteng.core.exception.YtDataValidationException;
 import org.thingsboard.server.common.data.yunteng.core.exception.YtDataValidationException;
 import org.thingsboard.server.common.data.yunteng.dto.*;
 import org.thingsboard.server.common.data.yunteng.dto.*;
+import org.thingsboard.server.common.data.yunteng.enums.TriggerTypeEnum;
 import org.thingsboard.server.common.data.yunteng.utils.ReflectUtils;
 import org.thingsboard.server.common.data.yunteng.utils.ReflectUtils;
 import org.thingsboard.server.common.data.yunteng.utils.tools.YtPageData;
 import org.thingsboard.server.common.data.yunteng.utils.tools.YtPageData;
 import org.thingsboard.server.dao.exception.DataValidationException;
 import org.thingsboard.server.dao.exception.DataValidationException;
@@ -72,14 +73,14 @@ public class SceneLinkageServiceImpl extends AbstractBaseService<SceneLinkageMap
     if (triggerDTOS != null) {
     if (triggerDTOS != null) {
       boolean condition = false;
       boolean condition = false;
       for (TriggerDTO triggerDTO : triggerDTOS) {
       for (TriggerDTO triggerDTO : triggerDTOS) {
-        String deviceId = triggerDTO.getDeviceId();
-        if (deviceId == null) {
-          break;
+        String deviceId = triggerDTO.getEntityId();
+        if (!TriggerTypeEnum.DEVICE_TRIGGER.equals(triggerDTO.getTriggerType()) || deviceId == null) {
+          continue;
         }
         }
         for (YtDevice device : deviceList) {
         for (YtDevice device : deviceList) {
           String id = device.getId();
           String id = device.getId();
           if (deviceId.equals(id)) {
           if (deviceId.equals(id)) {
-            triggerDTO.setDeviceId(id);
+            triggerDTO.setEntityId(id);
             condition = true;
             condition = true;
             break;
             break;
           }
           }
@@ -94,14 +95,14 @@ public class SceneLinkageServiceImpl extends AbstractBaseService<SceneLinkageMap
     if (doConditionList != null) {
     if (doConditionList != null) {
       boolean conditionC = false;
       boolean conditionC = false;
       for (DoConditionDTO conditionDTO : doConditionList) {
       for (DoConditionDTO conditionDTO : doConditionList) {
-        String deviceIdC = conditionDTO.getDeviceId();
-        if (deviceIdC == null) {
-          break;
+        String deviceIdC = conditionDTO.getEntityId();
+        if (!TriggerTypeEnum.DEVICE_TRIGGER.equals(conditionDTO.getTriggerType()) || deviceIdC == null) {
+          continue;
         }
         }
         for (YtDevice deviceC : deviceList) {
         for (YtDevice deviceC : deviceList) {
           String id = deviceC.getId();
           String id = deviceC.getId();
           if (deviceIdC.equals(id)) {
           if (deviceIdC.equals(id)) {
-            conditionDTO.setDeviceId(id);
+            conditionDTO.setEntityId(id);
             conditionC = true;
             conditionC = true;
             break;
             break;
           }
           }