fix: 场景联动、数据流转、规则链转换脚本加上规则链筛选

@@ -64,10 +64,15 @@ import org.thingsboard.server.common.data.rule.RuleChainMetaData;
 import org.thingsboard.server.common.data.rule.RuleChainOutputLabelsUsage;
 import org.thingsboard.server.common.data.rule.RuleChainType;
 import org.thingsboard.server.common.data.script.ScriptLanguage;
+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.DeleteDTO;
 import org.thingsboard.server.common.msg.TbMsg;
 import org.thingsboard.server.common.msg.TbMsgDataType;
 import org.thingsboard.server.common.msg.TbMsgMetaData;
 import org.thingsboard.server.dao.event.EventService;
+import org.thingsboard.server.dao.yunteng.service.ConvertConfigService;
+import org.thingsboard.server.dao.yunteng.service.TkDeviceProfileService;
 import org.thingsboard.server.queue.util.TbCoreComponent;
 import org.thingsboard.server.service.rule.TbRuleChainService;
 import org.thingsboard.server.service.script.RuleNodeJsScriptEngine;
@@ -152,6 +157,12 @@ public class RuleChainController extends BaseController {
     @Autowired(required = false)
     private ActorSystemContext actorContext;
 
+    @Autowired
+    private TkDeviceProfileService tkDeviceProfileService;
+
+    @Autowired
+    private ConvertConfigService convertConfigService;
+
     @Value("${actors.rule.chain.debug_mode_rate_limits_per_tenant.enabled}")
     private boolean debugPerTenantEnabled;
 
@@ -325,7 +336,15 @@ public class RuleChainController extends BaseController {
         checkParameter(RULE_CHAIN_ID, strRuleChainId);
         RuleChainId ruleChainId = new RuleChainId(toUUID(strRuleChainId));
         RuleChain ruleChain = checkRuleChain(ruleChainId, Operation.DELETE);
+        //判断规则链是否被产品在使用 thingskit
+        String tenantId = getCurrentUser().getCurrentTenantId();
+        List<String> deviceProfileNames = tkDeviceProfileService.checkRuleChainIdUsedByDeviceProfiles(tenantId,ruleChainId.getId());
+        if(null !=deviceProfileNames && !deviceProfileNames.isEmpty()){
+            throw new TkDataValidationException(String.format(ErrorMessage.RULE_CHAIN_USED_BY_DEVICE_PROFILE.getMessage(),deviceProfileNames.get(0)));
+        }
         tbRuleChainService.delete(ruleChain, getCurrentUser());
+        //删除规则链转换脚本
+        convertConfigService.deleteConvertConfigByRuleChainId(tenantId, ruleChainId.getId().toString(),0);
     }
 
     @ApiOperation(value = "Get latest input message (getLatestRuleNodeDebugInput)",

@@ -9,6 +9,8 @@ import io.swagger.annotations.ApiOperation;
 import io.swagger.annotations.ApiParam;
 import java.util.*;
 import java.util.concurrent.ConcurrentMap;
+import java.util.stream.Collectors;
+
 import lombok.RequiredArgsConstructor;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.beans.factory.annotation.Value;
@@ -20,10 +22,9 @@ import org.thingsboard.common.util.JacksonUtil;
 import org.thingsboard.server.actors.ActorSystemContext;
 import org.thingsboard.server.actors.tenant.DebugTbRateLimits;
 import org.thingsboard.server.common.data.StringUtils;
-import org.thingsboard.server.common.data.audit.ActionType;
 import org.thingsboard.server.common.data.exception.ThingsboardException;
+import org.thingsboard.server.common.data.id.RuleChainId;
 import org.thingsboard.server.common.data.id.TenantId;
-import org.thingsboard.server.common.data.plugin.ComponentLifecycleEvent;
 import org.thingsboard.server.common.data.rule.*;
 import org.thingsboard.server.common.data.yunteng.common.DeleteGroup;
 import org.thingsboard.server.common.data.yunteng.common.UpdateGroup;
@@ -34,12 +35,12 @@ import org.thingsboard.server.common.data.yunteng.dto.DeleteDTO;
 import org.thingsboard.server.common.data.yunteng.dto.convert.ConvertConfigDTO;
 import org.thingsboard.server.common.data.yunteng.dto.convert.ConvertConfigReqDTO;
 import org.thingsboard.server.common.data.yunteng.dto.convert.ConvertReqDTO;
+import org.thingsboard.server.common.data.yunteng.dto.scene.SceneLinkageDTO;
 import org.thingsboard.server.common.data.yunteng.enums.OrderTypeEnum;
 import org.thingsboard.server.common.data.yunteng.utils.tools.TkPageData;
 import org.thingsboard.server.controller.BaseController;
 import org.thingsboard.server.dao.yunteng.service.ConvertConfigService;
 import org.thingsboard.server.dao.yunteng.service.SceneLinkageService;
-import org.thingsboard.server.dao.yunteng.service.TkRuleChainService;
 import org.thingsboard.server.queue.util.TbCoreComponent;
 import org.thingsboard.server.service.rule.TbRuleChainService;
 import org.thingsboard.server.service.security.permission.Operation;
@@ -51,7 +52,6 @@ import org.thingsboard.server.service.security.permission.Operation;
 @Api(tags = {"数据流转控制器"})
 @PreAuthorize("hasAnyAuthority('TENANT_ADMIN')")
 public class TkConvertDataToController extends BaseController {
-  private final TkRuleChainService tkRuleChainService;
   private final ConvertConfigService convertConfigService;
   private final SceneLinkageService sceneLinkageService;
 
@@ -75,7 +75,8 @@ public class TkConvertDataToController extends BaseController {
       @RequestParam(value = ORDER_FILED, required = false) String orderBy,
       @RequestParam(value = "startTime", required = false) Long startTime,
       @RequestParam(value = "endTime", required = false) Long endTime,
-      @RequestParam(value = ORDER_TYPE, required = false) OrderTypeEnum orderType)
+      @RequestParam(value = ORDER_TYPE, required = false) OrderTypeEnum orderType,
+      @RequestParam(value = "ruleChainId",required = false) String ruleChainId)
       throws ThingsboardException {
 
     HashMap<String, Object> queryMap = new HashMap<>();
@@ -85,6 +86,7 @@ public class TkConvertDataToController extends BaseController {
     queryMap.put("nodeType", nodeType);
     queryMap.put("name", name);
     queryMap.put("status", status);
+    queryMap.put("ruleChainId",ruleChainId);
     checkTimeAndPut(queryMap, startTime, endTime);
     if (orderType != null) {
       queryMap.put(ORDER_TYPE, orderType.name());
@@ -156,8 +158,8 @@ public class TkConvertDataToController extends BaseController {
   }
 
   @PostMapping("update/config")
-  @ApiOperation("启用或禁用配置")
-  public RuleChainMetaData updateConfig(
+  @ApiOperation("启用或禁用数据流转")
+  public ResponseEntity<Boolean> updateConfig(
       @Validated(UpdateGroup.class) @RequestBody ConvertConfigReqDTO convertConfigReqDTO)
           throws Exception {
     if (convertConfigService.checkConvertConfigStatusExist(
@@ -171,47 +173,53 @@ public class TkConvertDataToController extends BaseController {
     List<RuleNode> nodes =
         convertConfigService.getRuleNodesByConvertConfigIds(
             ids, null, FastIotConstants.CONVERT_DATA);
-    RuleChainMetaData ruleChainMetaData = new RuleChainMetaData();
     if (null != nodes && nodes.size() > 0) {
-      ruleChainMetaData = saveRuleChain(nodes, status, FastIotConstants.CONVERT_DATA,null);
+      classificationSaveRuleChain(nodes,status,FastIotConstants.CONVERT_DATA,null);
     }
-    convertConfigService.updateConvertStatusByIds(
-        ids, status, getCurrentUser().getCurrentTenantId());
-    return ruleChainMetaData;
+    return ResponseEntity.ok(convertConfigService.updateConvertStatusByIds(
+            ids, status, getCurrentUser().getCurrentTenantId()));
   }
 
   @PostMapping("update/js")
   @ApiOperation("启用或禁用转换脚本")
-  public RuleChainMetaData updateJs(
+  public ResponseEntity<Boolean> updateJs(
       @Validated(UpdateGroup.class) @RequestBody ConvertReqDTO convertJSReqDTO)
           throws Exception {
     int status = convertJSReqDTO.getStatus();
+    ConvertConfigDTO checkConfig = convertConfigService.findConvertConfigDTOById(getCurrentUser().getCurrentTenantId(),
+            convertJSReqDTO.getId());
+    if(null == checkConfig){
+      throw new TkDataValidationException(ErrorMessage.NOT_BELONG_CURRENT_CUSTOMER.getMessage());
+    }
     if (status == FastIotConstants.StateValue.ENABLE
-        && convertConfigService.checkConvertJSStatusEnable(getCurrentUser().getCurrentTenantId())) {
+            && convertConfigService.checkConvertJSStatusEnable(getCurrentUser().getCurrentTenantId(),checkConfig.getRuleChainId())) {
       throw new TkDataValidationException(ErrorMessage.CONVERT_JS_IS_ALONE.getMessage());
     }
     List<String> ids = new ArrayList<>();
-    ids.add(convertJSReqDTO.getId());
+    ids.add(checkConfig.getId());
     List<RuleNode> nodes =
         convertConfigService.getRuleNodesByConvertConfigIds(
             ids, null, FastIotConstants.JAVA_SCRIPT);
-
-    RuleChainMetaData ruleChainMetaData =
-        saveRuleChain(nodes, status, FastIotConstants.JAVA_SCRIPT,null);
-    convertConfigService.updateConvertStatusByIds(
-        ids, status, getCurrentUser().getCurrentTenantId());
-    return ruleChainMetaData;
+    RuleChainId ruleChainId = StringUtils.isEmpty(checkConfig.getRuleChainId())?null:new RuleChainId(UUID.fromString(checkConfig.getRuleChainId()));
+    saveRuleChain(ruleChainId,nodes, status, FastIotConstants.JAVA_SCRIPT,null);
+    return ResponseEntity.ok(
+            convertConfigService.updateConvertStatusByIds(
+                    ids, status, getCurrentUser().getCurrentTenantId()));
   }
 
   @PostMapping("update/scene")
   @PreAuthorize("hasAnyAuthority('TENANT_ADMIN', 'CUSTOMER_USER')")
   @ApiOperation("启用或禁用场景联动")
-  public RuleChainMetaData updateScene(
+  public ResponseEntity<Boolean> updateScene(
       @Validated(UpdateGroup.class) @RequestBody ConvertReqDTO convertReqDTO)
           throws Exception {
-    int status = -1;
-    String sceneId = convertReqDTO.getId();
     String currentTenant = getCurrentUser().getCurrentTenantId();
+    SceneLinkageDTO querySceneLink = sceneLinkageService.selectById(currentTenant, convertReqDTO.getId());
+    if(null == querySceneLink){
+      throw new TkDataValidationException(ErrorMessage.NOT_BELONG_CURRENT_TENANT.getMessage());
+    }
+    int status = -1;
+    String sceneId = querySceneLink.getId();
     Integer sceneStatus = convertReqDTO.getStatus();
     JsonNode configuration =
         sceneLinkageService.getRuleNodeConfig(
@@ -255,9 +263,10 @@ public class TkConvertDataToController extends BaseController {
       objectNode.remove(otherKey);
       scene.setConfiguration(objectNode);
     }
-    RuleChainMetaData result = saveRuleChain(ruleNodes, status, FastIotConstants.SCENE_REACT,nodeConnectionName);
+    RuleChainId ruleChainId = StringUtils.isEmpty(querySceneLink.getRuleChainId())?null:new RuleChainId(UUID.fromString(querySceneLink.getRuleChainId()));
+    saveRuleChain(ruleChainId,ruleNodes, status, FastIotConstants.SCENE_REACT,nodeConnectionName);
     sceneLinkageService.updateSceneStatus(sceneId, sceneStatus, currentTenant);
-    return result;
+    return ResponseEntity.ok(true);
   }
 
   /**
@@ -265,33 +274,17 @@ public class TkConvertDataToController extends BaseController {
    *
    * @param nodes 规则节点
    * @param status 0禁用 1启用
+   * @param nodeType
+   * @param nodeConnectionName
    * @return 规则节点数据
    */
-  private RuleChainMetaData saveRuleChain(List<RuleNode> nodes, Integer status, Integer nodeType,
+  private void saveRuleChain(RuleChainId ruleChainId,List<RuleNode> nodes, Integer status, Integer nodeType,
                                           String nodeConnectionName)
           throws Exception {
-    boolean needSaveRuleNode;
     TenantId tenantId = getTenantId();
-    // 1. GET DEFAULT RULE CHAIN
-    RuleChain ruleChain = tkRuleChainService.getRootTenantRuleChain(getTenantId());
-    // 2. GET RULE CHAIN METADATA
-    RuleChainMetaData ruleChainMetaData =
-        ruleChainService.loadRuleChainMetaData(getTenantId(), ruleChain.getId());
-    // 3. SETUP CONNECTION AND ADD OR DELETE RULE NODE
-    if (status == FastIotConstants.MagicNumber.ZERO) {
-      needSaveRuleNode =
-          convertConfigService.deleteRuleNode(
-              nodes, ruleChainMetaData, nodeType, getCurrentUser().getCurrentTenantId());
-    } else {
-      convertConfigService.addRuleNode(
-          nodes, ruleChainMetaData, nodeType, getCurrentUser().getCurrentTenantId());
-      //添加节点连接信息
-      addConnectionInfo(nodeConnectionName,nodeType,ruleChainMetaData);
-      needSaveRuleNode = true;
-    }
-    // 4. SAVE METADATA
-    RuleChainMetaData savedRuleChainMetaData = null;
-    if (needSaveRuleNode) {
+    RuleChain ruleChain;
+    RuleChainMetaData savedRuleChainMetaData = convertConfigService.getTenantRuleChainMetaData(tenantId,ruleChainId,nodes,status,nodeType,nodeConnectionName);
+    if (null !=savedRuleChainMetaData && savedRuleChainMetaData.isNeedSaveRuleNode()) {
       if (debugPerTenantEnabled) {
         ConcurrentMap<TenantId, DebugTbRateLimits> debugPerTenantLimits =
             actorContext.getDebugPerTenantLimits();
@@ -300,42 +293,32 @@ public class TkConvertDataToController extends BaseController {
           debugPerTenantLimits.remove(tenantId, debugTbRateLimits);
         }
       }
-      ruleChain = checkRuleChain(ruleChainMetaData.getRuleChainId(), Operation.WRITE);
-      savedRuleChainMetaData = tbRuleChainService.saveRuleChainMetaData(tenantId, ruleChain, ruleChainMetaData, true, getCurrentUser());
+      ruleChain = checkRuleChain(savedRuleChainMetaData.getRuleChainId(), Operation.WRITE);
+      tbRuleChainService.saveRuleChainMetaData(tenantId, ruleChain, savedRuleChainMetaData, true, getCurrentUser());
     }
-    return savedRuleChainMetaData;
   }
 
-  private ResponseEntity<Boolean> delete(DeleteDTO deleteDTO, Integer nodeType)
-          throws Exception {
+  private ResponseEntity<Boolean> delete(DeleteDTO deleteDTO, Integer nodeType){
     List<RuleNode> nodes =
         convertConfigService.getRuleNodesByConvertConfigIds(
             new ArrayList<>(deleteDTO.getIds()), FastIotConstants.StateValue.ENABLE, nodeType);
-    if (nodes != null && nodes.size() > FastIotConstants.MagicNumber.ZERO) {
-      saveRuleChain(nodes, 0, nodeType,null);
-    }
+    classificationSaveRuleChain(nodes,0,nodeType,null);
     return ResponseEntity.ok(convertConfigService.deleteConvertConfig(deleteDTO, nodeType));
   }
-  private void addConnectionInfo(String nodeConnectionName,Integer nodeType,RuleChainMetaData ruleChainMetaData){
-    if(null != nodeConnectionName && nodeType == FastIotConstants.SCENE_REACT){
-      int i = 0;
-      //查找事件节点下标
-      int formIndex = 0;
-      int toIndex = 0;
-      for(RuleNode ruleNode : ruleChainMetaData.getNodes()){
-        if(ruleNode.getType().equals(nodeConnectionName)){
-          formIndex = i;
-        }
-        if(ruleNode.getType().equals(FastIotConstants.TkNodeClassName.GET_ORIGINATOR_FIELDS_NODE)){
-          toIndex = i;
-        }
-        i++;
+
+  private void classificationSaveRuleChain(List<RuleNode> nodes,Integer saveStatus,Integer nodeType,String nodeConnectionName){
+    if (nodes != null && nodes.size() > FastIotConstants.MagicNumber.ZERO) {
+      //将规则节点按规则链分类
+      Map<RuleChainId,List<RuleNode>> classification = nodes.stream().collect(Collectors.groupingBy(RuleNode::getRuleChainId));
+      if(classification !=null && !classification.isEmpty()){
+        classification.keySet().forEach(key->{
+          try {
+            saveRuleChain(key,nodes, saveStatus, nodeType,nodeConnectionName);
+          } catch (Exception e) {
+            throw new RuntimeException(e);
+          }
+        });
       }
-      NodeConnectionInfo newConnectionInfo = new NodeConnectionInfo();
-      newConnectionInfo.setFromIndex(formIndex);
-      newConnectionInfo.setToIndex(toIndex);
-      newConnectionInfo.setType("SUCCESS");
-      ruleChainMetaData.getConnections().add(newConnectionInfo);
     }
   }
 }

@@ -106,16 +106,16 @@ public class TkDeviceProfileController extends BaseController {
   }
 
   @GetMapping("/me/list")
-  @ApiOperation("选项列表")
-  @PreAuthorize("@check.checkPermissions({'TENANT_ADMIN','CUSTOMER_USER'},{})")
+  @ApiOperation("产品列表")
+  @PreAuthorize("hasAnyAuthority('TENANT_ADMIN', 'CUSTOMER_USER')")
   public ResponseEntity listDeviceProfile(
           @ApiParam(value = "设备类型") @RequestParam(value = "deviceType", required = false)
-          DeviceTypeEnum deviceType,DeviceTransportType transportType,Boolean isSceneLinkage)
+          DeviceTypeEnum deviceType,DeviceTransportType transportType,Boolean isSceneLinkage,String ruleChainId)
           throws ThingsboardException {
     List<DeviceProfileDTO> results;
     TenantId tenantId = getCurrentUser().getTenantId();
     if (getCurrentUser().isTenantAdmin()) {
-      results = tkDeviceProfileService.findDeviceProfile(tenantId, null,deviceType,transportType,isSceneLinkage);
+      results = tkDeviceProfileService.findDeviceProfile(tenantId, null,deviceType,transportType,isSceneLinkage,ruleChainId);
     } else {
       List<TkDeviceProfileEntity>   listEntity =
               tkDeviceProfileService.findCustomerDeviceProfiles(

@@ -94,7 +94,8 @@ public class TkSceneLinkageController extends BaseController {
       @RequestParam(value = "name", required = false) String name,
       @RequestParam(value = "status", required = false) Integer status,
       @RequestParam(value = "organizationId", required = false) String organizationId,
-      @RequestParam(value = "triggers", required = false) List<TriggerDTO> triggers)
+      @RequestParam(value = "triggers", required = false) List<TriggerDTO> triggers,
+      @RequestParam(value = "ruleChainId",required = false) String ruleChainId)
       throws ThingsboardException {
     HashMap<String, Object> queryMap = new HashMap<>();
     queryMap.put(PAGE_SIZE, pageSize);
@@ -103,6 +104,7 @@ public class TkSceneLinkageController extends BaseController {
     queryMap.put("status", status);
     queryMap.put("organizationId", organizationId);
     queryMap.put("triggers", triggers);
+    queryMap.put("ruleChainId",ruleChainId);
     queryMap.put("currentUser",getCurrentUser().getCurrentUserId());
     //如果是普通租户在最外层默认放入组织id
     if(getCurrentUser().isPtCommonTenant()){

@@ -238,7 +238,7 @@ public class DefaultEdgeNotificationService implements EdgeNotificationService {
                     if (TkEdgeProcessorFactory.isTkProcessorExist(type.getEntityType())) {
                         TkEdgeProcessorFactory.getTkProcessor(type.getEntityType()).processEntityNotification(tenantId, edgeNotificationMsg);
                     } else {
-                        log.error("[{}] Edge event type [{}] is not designed to be pushed to edge", tenantId, type);
+                        log.warn("[{}] Edge event type [{}] is not designed to be pushed to edge", tenantId, type);
                     }
                 } catch (Exception e) {
                     callBackFailure(tenantId, edgeNotificationMsg, callback, e);

@@ -69,6 +69,9 @@ public class RpcCommandTask {
             if (null != tkTaskCenterDTO) {
               TargetTypeEnum targetType = tkTaskCenterDTO.getTargetType();
               TargetContentDTO targetContent = tkTaskCenterDTO.getExecuteTarget();
+              if(null == targetContent){
+                return;
+              }
               JsonNode cmdJsonNode = tkTaskCenterDTO.getExecuteContent().getPushContent();
               SecurityUser securityUser = new SecurityUser();
               String taskCenterId = tkTaskCenterDTO.getId();

@@ -45,6 +45,9 @@ public class RuleChainMetaData {
     @ApiModelProperty(position = 5, required = true, value = "List of JSON objects that represent connections between rule nodes and other rule chains.")
     private List<RuleChainConnectionInfo> ruleChainConnections;
 
+    //thingskit
+    private boolean needSaveRuleNode;
+
     public void addConnectionInfo(int fromIndex, int toIndex, String type) {
         NodeConnectionInfo connectionInfo = new NodeConnectionInfo();
         connectionInfo.setFromIndex(fromIndex);

@@ -43,7 +43,7 @@ public enum ErrorMessage {
   DEVICE_NOT_EXISTENCE_IN_TENANT(400021,"当前租户下不存在该设备"),
   DEVICE_RELATION_IS_ABSENT(400022,"设备关联关系已不存在"),
   DATA_IS_DELETED(400023,"数据已经删除"),
-  CONVERT_JS_IS_ALONE(400024,"转换脚本只能启用一个"),
+  CONVERT_JS_IS_ALONE(400024,"同一个规则链转换脚本只能启用一个"),
   PHONE_OR_EMAIL_HAS_REGISTER(400025,"手机或邮箱已被使用"),
   CONTACT_ALREADY_ASSOCIATED(400026,"当前联系人已与告警配置【%s】关联"),
   MSG_CODE_NOT_MATCHED(400027,"验证码不正确"),
@@ -142,6 +142,10 @@ public enum ErrorMessage {
   CUSTOMER_USER_UPDATE_ERROR(400117,"已分配设备给该客户，请取消分配后重试"),
   SCRIPT_EVAL_FAILED(400118,"租户【%s】启动脚本【%s】失败,失败原因【%s】"),
   SCENE_REACT_IS_EDGE(400119,"场景联动来自于边端请勿操作"),
+  RULE_CHAIN_USED_BY_DEVICE_PROFILE(400120,"该规则链正在被【%s】产品使用,不能被删除！！"),
+  NODE_NAME_ALREADY_EXISTS(400121,"同类型的节点名称已被使用"),
+  CHOICE_DEVICE_PROFILE_RULE_CHAIN_IS_USED_FOR_CONVERT(400122,"选中的产品【%s】正在被数据流转【%s】使用，不能更换规则链！！"),
+  CHOICE_DEVICE_PROFILE_RULE_CHAIN_IS_USED_FOR_SCENE(400123,"选中的产品【%s】正在被场景联动【%s】使用，不能更换规则链！！"),
   HAVE_NO_PERMISSION(500002,"没有修改权限"),
   NOT_ALLOED_ISOLATED_IN_MONOLITH(500003,"【monolith】模式下，不能选择【isolated】类型的租户配置");
 

@@ -25,6 +25,12 @@ public class ConvertConfigDTO extends TenantDTO {
   @NotNull(message = "配置参数不能为空或者空字符串")
   private JsonNode configuration;
 
+  @ApiModelProperty(value = "规则链ID")
+  private String ruleChainId;
+
+  @ApiModelProperty(value = "规则链名称")
+  private String ruleChainName;
+
   @ApiModelProperty(value = "附加信息")
   private JsonNode additionalInfo;
 

@@ -49,6 +49,9 @@ public class DoActionDTO extends TenantDTO {
   @ApiModelProperty(value = "场景联动id")
   private String sceneLinkageId;
 
+  @ApiModelProperty(value = "场景联动名称")
+  private String sceneLinkageName;
+
   @ApiModelProperty(value = "输出目标为告警才进行配置")
   private String alarmProfileId;
 }

@@ -38,4 +38,7 @@ public class DoConditionDTO extends TenantDTO {
   @ApiModelProperty(value = "场景联动id")
   private String sceneLinkageId;
 
+  @ApiModelProperty(value = "场景联动名称")
+  private String sceneLinkageName;
+
 }

@@ -44,4 +44,13 @@ public class SceneLinkageDTO extends TenantDTO implements HasName {
 
   @ApiModelProperty(value = "创建用户")
   private String creatorName;
+
+  @NotEmpty(
+          message = "规则链ID不能为空或者空字符串",
+          groups = {AddGroup.class})
+  @ApiModelProperty(value = "规则链ID", required = true)
+  private String ruleChainId;
+
+  @ApiModelProperty(value = "规则链名称")
+  private String ruleChainName;
 }

+package org.thingsboard.server.common.data.yunteng.dto.scene;
+
+import lombok.Data;
+
+import java.io.Serializable;
+import java.util.List;
+
+@Data
+public class SceneLinkageDeviceProfileDTO implements Serializable {
+    private String sceneId;
+    private String sceneName;
+    private List<String> deviceProfileIds;
+
+    public SceneLinkageDeviceProfileDTO(String sceneId, String sceneName, List<String> deviceProfileIds) {
+        this.sceneId = sceneId;
+        this.sceneName = sceneName;
+        this.deviceProfileIds = deviceProfileIds;
+    }
+}

@@ -43,6 +43,9 @@ public class TriggerDTO extends TenantDTO {
   @ApiModelProperty(value = "场景联动id")
   private String sceneLinkageId;
 
+  @ApiModelProperty(value = "场景联动名称")
+  private String sceneLinkageName;
+
   public AlarmRule getTriggerCondition() {
     return JacksonUtil.convertValue(triggerCondition,AlarmRule.class);
   }

@@ -197,7 +197,7 @@ public class TenantServiceImpl extends AbstractCachedEntityService<TenantId, Ten
         publishEvictEvent(new TenantEvictEvent(savedTenant.getId(), create));
         eventPublisher.publishEvent(SaveEntityEvent.builder().tenantId(savedTenant.getId()).entityId(savedTenant.getId()).created(create).build());
         if (tenant.getId() == null) {
-            DeviceProfile deviceProfile = deviceProfileService.createDefaultDeviceProfile(savedTenant.getId());
+            deviceProfileService.createDefaultDeviceProfile(savedTenant.getId());
             assetProfileService.createDefaultAssetProfile(savedTenant.getId());
 			//Thingskit function
             deviceProfileService.createDeviceProfile(savedTenant.getId(),"默认MQTT网关设备", DeviceTypeEnum.GATEWAY);

@@ -18,6 +18,7 @@ public class ConvertConfig extends TenantBaseEntity {
   private String name;
   private String type;
 
+  private String ruleChainId;
   @TableField(typeHandler = EnumTypeHandler.class)
   private DatasourceTypeEnum datasourceType;
 

@@ -21,4 +21,6 @@ public class TkSceneLinkageEntity extends TenantBaseEntity {
   private String description;
 
   private String organizationId;
+
+  private String ruleChainId;
 }

@@ -11,6 +11,8 @@ import org.apache.commons.lang3.StringUtils;
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
 import org.thingsboard.common.util.JacksonUtil;
+import org.thingsboard.server.common.data.id.RuleChainId;
+import org.thingsboard.server.common.data.id.TenantId;
 import org.thingsboard.server.common.data.rule.NodeConnectionInfo;
 import org.thingsboard.server.common.data.rule.RuleChainMetaData;
 import org.thingsboard.server.common.data.rule.RuleNode;
@@ -22,54 +24,36 @@ import org.thingsboard.server.common.data.yunteng.dto.convert.ConvertConfigDTO;
 import org.thingsboard.server.common.data.yunteng.dto.DeleteDTO;
 import org.thingsboard.server.common.data.yunteng.enums.DatasourceTypeEnum;
 import org.thingsboard.server.common.data.yunteng.utils.tools.TkPageData;
+import org.thingsboard.server.dao.rule.RuleChainService;
 import org.thingsboard.server.dao.yunteng.ConvertConfig;
 import org.thingsboard.server.dao.yunteng.mapper.ConvertConfigMapper;
 import org.thingsboard.server.dao.yunteng.service.AbstractBaseService;
 import org.thingsboard.server.dao.yunteng.service.ConvertConfigService;
 
-import java.time.LocalDateTime;
 import java.util.*;
 import java.util.concurrent.ConcurrentHashMap;
 import java.util.concurrent.atomic.AtomicInteger;
+import java.util.stream.Collectors;
 
 @Slf4j
 @Service
 @RequiredArgsConstructor
 public class TkConvertConfigServiceImpl
-    extends AbstractBaseService<ConvertConfigMapper, ConvertConfig>
-    implements ConvertConfigService {
+        extends AbstractBaseService<ConvertConfigMapper, ConvertConfig>
+        implements ConvertConfigService {
   private final String connectionType = "Success";
   private final String originatorType =
-      "org.thingsboard.rule.engine.metadata.TbGetOriginatorFieldsNode";
+          "org.thingsboard.rule.engine.metadata.TbGetOriginatorFieldsNode";
   private final String sceneOriginatorName = "scene@thingskit";
   private final String scriptType = "org.thingsboard.rule.engine.transform.TbTransformMsgNode";
   private final String filterScriptType = "org.thingsboard.rule.engine.filter.TbJsFilterNode";
   private final String convertNodeName = "dataConvert@thingskit";
+  private final RuleChainService ruleChainService;
 
   @Override
   public TkPageData<ConvertConfigDTO> page(String tenantId, Map<String, Object> queryMap) {
-    LocalDateTime startTime = (LocalDateTime) queryMap.get("startTime");
-    LocalDateTime endTime = (LocalDateTime) queryMap.get("endTime");
-    IPage<ConvertConfig> iPage =
-        baseMapper.selectPage(
-            getPage(queryMap, FastIotConstants.DefaultOrder.CREATE_TIME, false),
-            new LambdaQueryWrapper<ConvertConfig>()
-                .eq(ConvertConfig::getTenantId, tenantId)
-                .eq(
-                    null != queryMap.get("status"),
-                    ConvertConfig::getStatus,
-                    queryMap.get("status"))
-                .eq(ConvertConfig::getNodeType, queryMap.get("nodeType"))
-                .and(
-                    null != startTime && null != endTime,
-                    qr ->
-                        qr.ge(ConvertConfig::getCreateTime, startTime)
-                            .le(ConvertConfig::getCreateTime, endTime))
-                .like(
-                    null != queryMap.get("name"),
-                    ConvertConfig::getName,
-                    String.valueOf(queryMap.get("name")))
-                );
+    IPage<ConvertConfigDTO> iPage = baseMapper.getConvertPage(
+            getPage(queryMap, FastIotConstants.DefaultOrder.CREATE_TIME, false),tenantId,queryMap);
     return getPageData(iPage, ConvertConfigDTO.class);
   }
 
@@ -77,6 +61,8 @@ public class TkConvertConfigServiceImpl
   @Transactional
   public ConvertConfigDTO createOrUpdate(ConvertConfigDTO convertConfig) {
     ConvertConfig config = convertConfig.getEntity(ConvertConfig.class);
+    //设置规则链ID
+    config.setRuleChainId(getRuleChainId(convertConfig));
     config.setDatasourceContent(
         JacksonUtil.convertValue(convertConfig.getDatasourceContent(), JsonNode.class));
     if (StringUtils.isNotEmpty(convertConfig.getId())) {
@@ -92,10 +78,9 @@ public class TkConvertConfigServiceImpl
       if (!checkConfig.getName().equals(config.getName())) {
         // Check Name
         boolean result =
-            checkConvertConfigNameExist(
-                convertConfig.getId(), config.getName(), config.getType(), config.getTenantId());
+            checkConvertConfigNameExist(null, config.getName(), config.getType(), config.getTenantId());
         if (result) {
-          throw new TkDataValidationException(ErrorMessage.NAME_ALREADY_EXISTS.getMessage());
+          throw new TkDataValidationException(ErrorMessage.NODE_NAME_ALREADY_EXISTS.getMessage());
         }
       }
       // 修改不改状态
@@ -107,7 +92,7 @@ public class TkConvertConfigServiceImpl
           checkConvertConfigNameExist(
               null, config.getName(), config.getType(), config.getTenantId());
       if (result) {
-        throw new TkDataValidationException(ErrorMessage.NAME_ALREADY_EXISTS.getMessage());
+        throw new TkDataValidationException(ErrorMessage.NODE_NAME_ALREADY_EXISTS.getMessage());
       }
       // DEFAULT DISABLE
       config.setStatus(FastIotConstants.StateValue.DISABLE);
@@ -143,12 +128,13 @@ public class TkConvertConfigServiceImpl
 
   @Override
   public ConvertConfigDTO findConvertConfigDTOByName(
-      String tenantId, String name, Integer nodeType) {
+      String tenantId, String name,String type, Integer nodeType) {
     ConvertConfig convertConfig =
         baseMapper.selectOne(
             new LambdaQueryWrapper<ConvertConfig>()
                 .eq(ConvertConfig::getTenantId, tenantId)
                 .eq(ConvertConfig::getName, name)
+                .eq(ConvertConfig::getType,type)
                 .eq(ConvertConfig::getNodeType, nodeType));
     return null != convertConfig ? convertConfig.getDTO(ConvertConfigDTO.class) : null;
   }
@@ -173,7 +159,12 @@ public class TkConvertConfigServiceImpl
           ruleNode.setType(convertConfig.getType());
           ruleNode.setConfiguration(convertConfig.getConfiguration());
           ruleNode.setAdditionalInfo(convertConfig.getAdditionalInfo());
-
+          if (StringUtils.isNotEmpty(convertConfig.getRuleChainId())) {
+            ruleNode.setRuleChainId(
+                new RuleChainId(UUID.fromString(convertConfig.getRuleChainId())));
+          } else {
+            ruleNode.setRuleChainId(ruleChainService.getRootTenantRuleChain(new TenantId(UUID.fromString(convertConfig.getTenantId()))).getId());
+          }
           ruleNodes.add(ruleNode);
         });
     return ruleNodes;
@@ -204,15 +195,16 @@ public class TkConvertConfigServiceImpl
   }
 
   @Override
-  public boolean checkConvertJSStatusEnable(String tenantId) {
+  public boolean checkConvertJSStatusEnable(String tenantId,String ruleChainId) {
     return baseMapper
             .selectList(
-                new LambdaQueryWrapper<ConvertConfig>()
-                    .eq(ConvertConfig::getTenantId, tenantId)
-                    .eq(ConvertConfig::getStatus, FastIotConstants.StateValue.ENABLE)
-                    .eq(ConvertConfig::getNodeType, FastIotConstants.JAVA_SCRIPT))
+                    new LambdaQueryWrapper<ConvertConfig>()
+                            .eq(ConvertConfig::getTenantId, tenantId)
+                            .eq(ConvertConfig::getStatus, FastIotConstants.StateValue.ENABLE)
+                            .eq(ConvertConfig::getNodeType, FastIotConstants.JAVA_SCRIPT)
+                            .eq(ConvertConfig::getRuleChainId,ruleChainId))
             .size()
-        > FastIotConstants.MagicNumber.ZERO;
+            > FastIotConstants.MagicNumber.ZERO;
   }
   /**
    * 删除规则节点
@@ -254,6 +246,41 @@ public class TkConvertConfigServiceImpl
     }
   }
 
+  @Override
+  public RuleChainMetaData getTenantRuleChainMetaData(TenantId tenantId, RuleChainId  ruleChainId,List<RuleNode> nodes,
+                                                      int status,int nodeType,String nodeConnectionName) {
+    boolean needSaveRuleNode = true;
+    RuleChainMetaData ruleChainMetaData =
+            ruleChainService.loadRuleChainMetaData(tenantId, ruleChainId);
+    if (status == FastIotConstants.MagicNumber.ZERO) {
+      needSaveRuleNode = deleteRuleNode(nodes, ruleChainMetaData, nodeType, tenantId.getId().toString());
+    } else {
+      addRuleNode(nodes, ruleChainMetaData, nodeType, tenantId.getId().toString());
+      //添加节点连接信息
+      addConnectionInfo(nodeConnectionName,nodeType,ruleChainMetaData);
+    }
+    ruleChainMetaData.setNeedSaveRuleNode(needSaveRuleNode);
+    return ruleChainMetaData;
+  }
+
+  @Override
+  public boolean deleteConvertConfigByRuleChainId(String tenantId, String ruleChainId, Integer nodeType) {
+    nodeType = null == nodeType?0:nodeType;
+    return baseMapper.delete(new LambdaQueryWrapper<ConvertConfig>().eq(ConvertConfig::getTenantId,tenantId).
+            eq(ConvertConfig::getRuleChainId,ruleChainId).eq(ConvertConfig::getNodeType,nodeType)) > FastIotConstants.MagicNumber.ZERO;
+  }
+
+  @Override
+  public List<ConvertConfigDTO> getConvertConfigUsedByRuleChainIds(String tenantId, List<String> ruleChainIds,Integer nodeType) {
+    List<ConvertConfig> convertConfigs = baseMapper.selectList(new LambdaQueryWrapper<ConvertConfig>().
+            eq(ConvertConfig::getTenantId,tenantId).eq(null != nodeType,ConvertConfig::getNodeType,nodeType)
+            .in(ConvertConfig::getRuleChainId,ruleChainIds));
+    if(null != convertConfigs && !convertConfigs.isEmpty()){
+      return convertConfigs.stream().map(entity->entity.getDTO(ConvertConfigDTO.class)).collect(Collectors.toList());
+    }
+    return null;
+  }
+
   private boolean deleteConvertJS(List<RuleNode> nodes, RuleChainMetaData ruleChainMetaData) {
     boolean needDelete = false;
     // 1. Get firstNodeIndex
@@ -329,7 +356,7 @@ public class TkConvertConfigServiceImpl
           // 判断数据源是产品、设备、全部
           ConvertConfigDTO convertConfigDTO =
               findConvertConfigDTOByName(
-                  tenantId, deleteRuleNode.getName(), FastIotConstants.CONVERT_DATA.intValue());
+                  tenantId, deleteRuleNode.getName(),deleteRuleNode.getType(), FastIotConstants.CONVERT_DATA.intValue());
           boolean haveFilterNode = false;
           String filterNodeName = null;
           String filterType = null;
@@ -522,7 +549,7 @@ public class TkConvertConfigServiceImpl
     // estimate datasource type
     ConvertConfigDTO convertConfigDTO =
         findConvertConfigDTOByName(
-            tenantId, ruleNode.getName(), FastIotConstants.CONVERT_DATA.intValue());
+            tenantId, ruleNode.getName(),ruleNode.getType(), FastIotConstants.CONVERT_DATA.intValue());
     if (null != convertConfigDTO
         && null != convertConfigDTO.getDatasourceType()
         && !Objects.equals(convertConfigDTO.getDatasourceType(), DatasourceTypeEnum.ALL)) {
@@ -849,4 +876,33 @@ public class TkConvertConfigServiceImpl
     objectNode.put("layoutY", layoutY + randomNum);
     return objectNode;
   }
+
+  private String getRuleChainId(ConvertConfigDTO convertConfig){
+    //通过nodeType区分是转换脚本（0）、数据流转（1）
+    return  StringUtils.isNotEmpty(convertConfig.getRuleChainId()) ? convertConfig.getRuleChainId():
+            ruleChainService.getRootTenantRuleChain(new TenantId(UUID.fromString(convertConfig.getTenantId()))).getId().toString();
+  }
+
+  private void addConnectionInfo(String nodeConnectionName,Integer nodeType,RuleChainMetaData ruleChainMetaData){
+    if(null != nodeConnectionName && nodeType == FastIotConstants.SCENE_REACT){
+      int i = 0;
+      //查找事件节点下标
+      int formIndex = 0;
+      int toIndex = 0;
+      for(RuleNode ruleNode : ruleChainMetaData.getNodes()){
+        if(ruleNode.getType().equals(nodeConnectionName)){
+          formIndex = i;
+        }
+        if(ruleNode.getType().equals(FastIotConstants.TkNodeClassName.GET_ORIGINATOR_FIELDS_NODE)){
+          toIndex = i;
+        }
+        i++;
+      }
+      NodeConnectionInfo newConnectionInfo = new NodeConnectionInfo();
+      newConnectionInfo.setFromIndex(formIndex);
+      newConnectionInfo.setToIndex(toIndex);
+      newConnectionInfo.setType("SUCCESS");
+      ruleChainMetaData.getConnections().add(newConnectionInfo);
+    }
+  }
 }

@@ -15,33 +15,30 @@ import org.thingsboard.server.common.data.device.profile.*;
 import org.thingsboard.server.common.data.id.*;
 import org.thingsboard.server.common.data.rule.RuleChain;
 import org.thingsboard.server.common.data.yunteng.constant.FastIotConstants;
-import org.thingsboard.server.common.data.yunteng.constant.ModelConstants;
 import org.thingsboard.server.common.data.yunteng.constant.QueryConstant;
 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.convert.ConvertConfigDTO;
+import org.thingsboard.server.common.data.yunteng.dto.scene.SceneLinkageDeviceProfileDTO;
 import org.thingsboard.server.common.data.yunteng.enums.DeviceTypeEnum;
-import org.thingsboard.server.common.data.yunteng.enums.FunctionTypeEnum;
 import org.thingsboard.server.common.data.yunteng.enums.TcpAuthTypeEnum;
 import org.thingsboard.server.common.data.yunteng.enums.TransportTypeEnum;
-import org.thingsboard.server.common.data.yunteng.id.TkThingsModelId;
 import org.thingsboard.server.common.data.yunteng.utils.CopyUtils;
 import org.thingsboard.server.common.data.yunteng.utils.DateTimeUtils;
 import org.thingsboard.server.common.data.yunteng.utils.JacksonUtil;
 import org.thingsboard.server.common.data.yunteng.utils.tools.TkPageData;
 import org.thingsboard.server.dao.rule.RuleChainService;
 import org.thingsboard.server.dao.yunteng.entities.*;
-import org.thingsboard.server.dao.yunteng.event.TkEdgeSyncService;
 import org.thingsboard.server.dao.yunteng.mapper.DeviceMapper;
-import org.thingsboard.server.dao.yunteng.mapper.ThingsModelMapper;
 import org.thingsboard.server.dao.yunteng.mapper.TkDeviceProfileCategoryMapper;
 import org.thingsboard.server.dao.yunteng.mapper.TkDeviceProfileMapper;
-import org.thingsboard.server.dao.yunteng.service.AbstractBaseService;
 import org.thingsboard.server.dao.yunteng.service.AbstractTbBaseService;
+import org.thingsboard.server.dao.yunteng.service.ConvertConfigService;
+import org.thingsboard.server.dao.yunteng.service.SceneLinkageService;
 import org.thingsboard.server.dao.yunteng.service.TkDeviceProfileService;
 
 import java.time.LocalDateTime;
-import java.time.ZoneOffset;
 import java.util.*;
 import java.util.stream.Collectors;
 
@@ -58,6 +55,10 @@ public class TkDeviceProfileServiceImpl
 
     private final RuleChainService ruleChainService;
 
+    private final ConvertConfigService convertConfigService;
+
+    private final SceneLinkageService sceneLinkageService;
+
 
 
     @Override
@@ -184,6 +185,83 @@ public class TkDeviceProfileServiceImpl
         return tbDeviceProfile;
     }
 
+    @Override
+    public List<String> checkRuleChainIdUsedByDeviceProfiles(String tenantId, UUID ruleChainId) {
+     List<TkDeviceProfileEntity> entities=baseMapper.selectList(new LambdaQueryWrapper<TkDeviceProfileEntity>().eq(TkDeviceProfileEntity::getTenantId,
+                UUID.fromString(tenantId)).eq(TkDeviceProfileEntity::getDefaultRuleChainId,ruleChainId));
+     if(null == entities || entities.isEmpty()){
+         return null;
+     }
+    return entities.stream().map(entity->entity.getName()).collect(Collectors.toList());
+    }
+
+    @Override
+    public void checkDeviceProfilesCanChangeRuleChain(List<String> deviceProfileIds, TenantId tenantId) {
+        List<UUID> queryDeviceProfileIds = deviceProfileIds.stream().map(UUID::fromString).collect(Collectors.toList());
+        //判断以上产品配置是否都属于该租户
+        List<TkDeviceProfileEntity> entities = baseMapper.selectList(new LambdaQueryWrapper<TkDeviceProfileEntity>().
+                eq(TkDeviceProfileEntity::getTenantId,tenantId.getId()).in(TkDeviceProfileEntity::getId,queryDeviceProfileIds));
+        if(null == entities || entities.size() != deviceProfileIds.size()){
+            throw new TkDataValidationException(ErrorMessage.NOT_BELONG_CURRENT_TENANT.getMessage());
+        }
+        Set<String> ruleChainIds = new HashSet<>(entities.stream().map(entity->entity.getDefaultRuleChainId().toString()).collect(Collectors.toList()));
+        //按规则链进行分类,找到具体的产品
+        Map<UUID,List<TkDeviceProfileEntity>> classification = entities.stream().collect(Collectors.groupingBy(TkDeviceProfileEntity::getDefaultRuleChainId));
+        //判断数据流转是否使用该规则链
+        checkDataConvertUsedDeviceProfile(tenantId.getId().toString(),new ArrayList<>(ruleChainIds),classification);
+        // 判断选中的产品是否被场景联动使用
+        checkSceneLinkageUsedDeviceProfile(
+        tenantId.getId().toString(), entities, deviceProfileIds, new ArrayList<>(ruleChainIds));
+    }
+
+    private void checkDataConvertUsedDeviceProfile(String tenantId,List<String>ruleChainIds,Map<UUID,List<TkDeviceProfileEntity>> classification){
+        List<ConvertConfigDTO> convertConfigs = convertConfigService.getConvertConfigUsedByRuleChainIds(tenantId,ruleChainIds,1);
+        if(null !=convertConfigs && !convertConfigs.isEmpty()){
+            convertConfigs.stream().forEach(convertEntity->{
+                //找出这个规则链里面，有哪些产品被数据流转使用了
+                JsonNode datasource = convertEntity.getDatasourceContent();
+                if(null != datasource){
+                    JsonNode usedDeviceProfileIds = datasource.get("convertProducts");
+                    List<String> ids = null;
+                    if(usedDeviceProfileIds.isArray()){
+                        Iterator<JsonNode> iteratorNodes = usedDeviceProfileIds.iterator();
+                        while (iteratorNodes.hasNext()){
+                            ids.add(iteratorNodes.next().asText());
+                        }
+                    }
+                    if(null != ids){
+                        classification.entrySet().forEach(key->{
+                            for (TkDeviceProfileEntity entity : classification.get(key)) {
+                                if(ids.contains(entity.getId().toString())){
+                                    throw new TkDataValidationException(String.format(ErrorMessage.
+                                            CHOICE_DEVICE_PROFILE_RULE_CHAIN_IS_USED_FOR_CONVERT.getMessage(),entity.getName(),convertEntity.getName()));
+                                }
+                            }
+                        });
+
+                    }
+                }
+            });
+        }
+    }
+    private void checkSceneLinkageUsedDeviceProfile(String tenantId,List<TkDeviceProfileEntity> entityList,List<String> choiceDeviceProfileIds,List<String> ruleChainIds){
+        //通过选中产品ID列表，判断是否有被场景联动使用
+        SceneLinkageDeviceProfileDTO usedSceneLinkage = sceneLinkageService.checkDeviceProfileIdsUsedForSceneLinkage(tenantId,choiceDeviceProfileIds,ruleChainIds);
+        if(null != usedSceneLinkage){
+            //被场景联动使用了，才进行逻辑处理
+            String sceneName = usedSceneLinkage.getSceneName();
+            List<String> deviceProfileIds = usedSceneLinkage.getDeviceProfileIds();
+            if(null != deviceProfileIds && !deviceProfileIds.isEmpty()){
+                entityList.forEach(deviceProfileEntity->{
+                    if(deviceProfileIds.contains(deviceProfileEntity.getId().toString())){
+                        throw new TkDataValidationException(String.format(ErrorMessage.
+                                        CHOICE_DEVICE_PROFILE_RULE_CHAIN_IS_USED_FOR_SCENE.getMessage(),
+                                deviceProfileEntity.getName(),sceneName));
+                    }
+                });
+            }
+        }
+    }
     private void setDeviceScriptId(DeviceProfile profile, DeviceProfileTransportConfiguration transportConfiguration) {
         JsonNode jsonNode = JacksonUtil.convertValue(transportConfiguration, JsonNode.class);
         if (null != jsonNode) {
@@ -266,9 +344,10 @@ public class TkDeviceProfileServiceImpl
 
     @Override
     public List<DeviceProfileDTO> findDeviceProfile(
-            TenantId tenantId, String scriptId, DeviceTypeEnum deviceType, DeviceTransportType transportType,Boolean isSceneLinkage) {
+            TenantId tenantId, String scriptId, DeviceTypeEnum deviceType, DeviceTransportType transportType,
+            Boolean isSceneLinkage,String ruleChainId) {
         List<TkDeviceProfileEntity> listEntity =
-                baseMapper.profileByScriptId(tenantId.getId(), scriptId, deviceType, transportType, null,isSceneLinkage);
+                baseMapper.profileByScriptId(tenantId.getId(), scriptId, deviceType, transportType, null,isSceneLinkage,ruleChainId);
         return  listEntity.stream().map(entity -> {
                     return CopyUtils.copyAndReturn(entity, new DeviceProfileDTO());
                 }
@@ -291,7 +370,7 @@ public class TkDeviceProfileServiceImpl
         if (null == deviceProfileIds || deviceProfileIds.isEmpty()) {
             return null;
         }
-        return   baseMapper.profileByScriptId(tenantId.getId(), null, deviceType, transportType, deviceProfileIds,false);
+        return   baseMapper.profileByScriptId(tenantId.getId(), null, deviceType, transportType, deviceProfileIds,false,null);
     }
 
     @Override
@@ -299,7 +378,11 @@ public class TkDeviceProfileServiceImpl
         if (tenantId == null || null == ids) {
             throw new TkDataValidationException(ErrorMessage.INVALID_PARAMETER.getMessage());
         }
-        return baseMapper.profileByTransportAndIds(tenantId, ids, transportType);
+        List<TkDeviceProfileEntity> entities = baseMapper.profileByTransportAndIds(tenantId, ids, transportType);
+        if(null == entities || entities.isEmpty()){
+            return null;
+        }
+        return entities.stream().map(entity->entity.getDTO(DeviceProfileDTO.class)).collect(Collectors.toList());
     }
 
     @Override

@@ -42,4 +42,14 @@ public class TkDoActionServiceImpl extends AbstractBaseService<DoActionMapper, T
         .map(doAction -> doAction.getDTO(DoActionDTO.class))
         .collect(Collectors.toList());
   }
+
+  @Override
+  public List<DoActionDTO> findDoActionsBySceneLinkageIds(String tenantId, List<String> sceneLinkageIds) {
+    List<TkDoActionEntity> entities = baseMapper.selectList(new LambdaQueryWrapper<TkDoActionEntity>().eq(TkDoActionEntity::getTenantId,tenantId)
+            .in(TkDoActionEntity::getSceneLinkageId,sceneLinkageIds));
+    if(null !=entities && !entities.isEmpty()){
+      return entities.stream().map(entity->entity.getDTO(DoActionDTO.class)).collect(Collectors.toList());
+    }
+    return null;
+  }
 }

@@ -4,6 +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.scene.DoConditionDTO;
 import org.thingsboard.server.dao.yunteng.entities.TkDoConditionEntity;
 import org.thingsboard.server.dao.yunteng.mapper.DoConditionMapper;
 import org.thingsboard.server.dao.yunteng.service.AbstractBaseService;
@@ -20,12 +21,16 @@ import java.util.List;
 @RequiredArgsConstructor
 public class TkDoConditionServiceImpl extends AbstractBaseService<DoConditionMapper, TkDoConditionEntity>
         implements DoConditionService {
-    private final DoConditionMapper triggerMapper;
+    private final DoConditionMapper baseMapper;
     @Override
     public List<TkDoConditionEntity> getConditions(String sceneId) {
         LambdaQueryWrapper filter = new QueryWrapper<TkDoConditionEntity>().lambda()
                 .eq(TkDoConditionEntity::getSceneLinkageId,sceneId);
-        return triggerMapper.selectList(filter);
+        return baseMapper.selectList(filter);
     }
 
+    @Override
+    public List<DoConditionDTO> listByDeviceProfileIds(String tenantId, List<String> deviceProfileIds) {
+        return baseMapper.listByDeviceProfileIds(tenantId,deviceProfileIds);
+    }
 }

@@ -7,6 +7,7 @@ import com.fasterxml.jackson.databind.JsonNode;
 import com.fasterxml.jackson.databind.node.ObjectNode;
 import java.util.*;
 import java.util.concurrent.atomic.AtomicBoolean;
+import java.util.concurrent.atomic.AtomicReference;
 import java.util.stream.Collectors;
 import lombok.RequiredArgsConstructor;
 import org.apache.commons.lang3.StringUtils;
@@ -635,7 +636,54 @@ public class TkSceneLinkageServiceImpl
   }
 
   @Override
-  public SceneLinkageDTO selectById( String id) {
-    return baseMapper.findById(id);
+  public SceneLinkageDTO selectById(String tenantId,String id) {
+    return baseMapper.findById(tenantId,id);
+  }
+  @Override
+  public SceneLinkageDeviceProfileDTO checkDeviceProfileIdsUsedForSceneLinkage(String tenantId, List<String> deviceProfileIds,List<String> ruleChainIds) {
+    //先判断触发器是否被场景联动使用
+    List<TriggerDTO> triggers = triggerService.getTriggersByDeviceProfileIds(tenantId,deviceProfileIds);
+    if(null != triggers && !triggers.isEmpty()){
+      TriggerDTO triggerDTO = triggers.get(0);
+      return new SceneLinkageDeviceProfileDTO(triggerDTO.getSceneLinkageId(),triggerDTO.getSceneLinkageName(),List.of(triggerDTO.getDeviceProfileId()));
+    }
+    //再判断执行条件是否被场景联动使用
+    List<DoConditionDTO> doConditions = doConditionService.listByDeviceProfileIds(tenantId,deviceProfileIds);
+    if(null != doConditions && !doConditions.isEmpty()){
+      DoConditionDTO doCondition = doConditions.get(0);
+      return new SceneLinkageDeviceProfileDTO(doCondition.getSceneLinkageId(),doCondition.getSceneLinkageName(),List.of(doCondition.getDeviceProfileId()));
+    }
+    //最后判断执行动作是否被场景联动使用
+    List<TkSceneLinkageEntity>entities = baseMapper.selectList(new LambdaQueryWrapper<TkSceneLinkageEntity>().eq(TkSceneLinkageEntity::getTenantId,tenantId)
+            .in(TkSceneLinkageEntity::getRuleChainId,ruleChainIds));
+    if(null !=entities && !entities.isEmpty()){
+      List<String> sceneLinkageIds = entities.stream().map(entity->entity.getId()).collect(Collectors.toList());
+      List<DoActionDTO> doActionList = doActionService.findDoActionsBySceneLinkageIds(tenantId,sceneLinkageIds);
+      if(null !=doActionList && !doActionList.isEmpty()){
+        for (DoActionDTO entity :doActionList){
+          if(entity.getOutTarget().equals(ActionTypeEnum.DEVICE_OUT)){
+            if(deviceProfileIds.contains(entity.getDeviceProfileId())){
+              return new SceneLinkageDeviceProfileDTO(entity.getSceneLinkageId(), entity.getSceneLinkageName(), List.of(entity.getDeviceProfileId()));
+            }
+          }
+          if(entity.getOutTarget().equals(ActionTypeEnum.MSG_NOTIFY)){
+            JsonNode doContext = entity.getDoContext();
+            if(null !=doContext){
+              JsonNode clearRuleJsonNode = doContext.get("clearRule");
+              if(null !=clearRuleJsonNode && clearRuleJsonNode.isArray()){
+                Iterator<JsonNode> iteratorNodes = clearRuleJsonNode.iterator();
+                while (iteratorNodes.hasNext()){
+                  String deviceProfileId = iteratorNodes.next().get("deviceProfileId").asText();
+                  if(deviceProfileIds.contains(deviceProfileId)){
+                    return new SceneLinkageDeviceProfileDTO(entity.getSceneLinkageId(), entity.getSceneLinkageName(), List.of(deviceProfileId));
+                  }
+                }
+              }
+            }
+          }
+        }
+      }
+    }
+    return null;
   }
 }

@@ -39,4 +39,9 @@ public class TkTriggerServiceImpl extends AbstractBaseService<TriggerMapper, TkT
                 .map(item -> item.getDTO(TriggerDTO.class))
                 .collect(Collectors.toList());
     }
+
+    @Override
+    public List<TriggerDTO> getTriggersByDeviceProfileIds(String tenantId, List<String> deviceProfileIds) {
+        return triggerMapper.listByDeviceProfileIds(tenantId,deviceProfileIds);
+    }
 }

 package org.thingsboard.server.dao.yunteng.mapper;
 
 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.convert.ConvertConfigDTO;
 import org.thingsboard.server.dao.yunteng.ConvertConfig;
 
 import java.util.List;
+import java.util.Map;
 
 @Mapper
 public interface ConvertConfigMapper extends BaseMapper<ConvertConfig> {
+  IPage<ConvertConfigDTO> getConvertPage(
+          IPage<?> page,@Param("tenantId") String tenantId, @Param("queryMap") Map<String, Object> queryMap);
   boolean updateConvertStatusByIds(
           @Param("tenantId") String tenantId, @Param("ids") List<String> ids, @Param("status") Integer status);
 }

@@ -16,4 +16,6 @@ import java.util.List;
 @Mapper
 public interface DoActionMapper extends BaseMapper<TkDoActionEntity> {
     List<DoActionDTO> listBySceneId(@Param("sceneId") String sceneId);
+
+    List<DoActionDTO> listBySceneLinkageIds(@Param("tenantId") String tenantId,@Param("sceneLinkageIds") List<String> sceneLinkageIds);
 }

@@ -16,4 +16,6 @@ import java.util.List;
 @Mapper
 public interface DoConditionMapper extends BaseMapper<TkDoConditionEntity> {
     List<DoConditionDTO> listBySceneId(@Param("sceneId") String sceneId);
+
+    List<DoConditionDTO> listByDeviceProfileIds(@Param("tenantId")String tenantId,@Param("deviceProfileIds")List<String> deviceProfileIds);
 }

@@ -30,6 +30,6 @@ public interface SceneLinkageMapper extends BaseMapper<TkSceneLinkageEntity> {
      * @param id
      * @return
      */
-    SceneLinkageDTO findById( @Param("id") String id);
+    SceneLinkageDTO findById(@Param("tenantId") String tenantId, @Param("id") String id);
 
 }

@@ -5,9 +5,6 @@ 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.DeviceTransportType;
-import org.thingsboard.server.common.data.id.DeviceProfileId;
-import org.thingsboard.server.common.data.id.TenantId;
-import org.thingsboard.server.common.data.yunteng.dto.*;
 import org.thingsboard.server.common.data.yunteng.enums.DeviceTypeEnum;
 import org.thingsboard.server.common.data.yunteng.enums.TransportTypeEnum;
 import org.thingsboard.server.dao.yunteng.entities.TkDeviceProfileEntity;
@@ -39,9 +36,10 @@ public interface TkDeviceProfileMapper extends BaseMapper<TkDeviceProfileEntity>
           @Param("deviceType") DeviceTypeEnum deviceType,
           @Param("transportType")DeviceTransportType transportType,
           @Param("deviceProfileIds")List<UUID> deviceProfileIds,
-          @Param("isSceneLinkage") Boolean isSceneLinkage);
+          @Param("isSceneLinkage") Boolean isSceneLinkage,
+          @Param("ruleChainId") String ruleChainId);
 
-  List<DeviceProfileDTO> profileByTransportAndIds(
+  List<TkDeviceProfileEntity> profileByTransportAndIds(
           @Param("tenantId") UUID tenantId,
           @Param("projectIds") List<String> projectIds,
           @Param("deviceType") TransportTypeEnum transportType);

@@ -17,4 +17,6 @@ import java.util.List;
 public interface TriggerMapper extends BaseMapper<TkTriggerEntity> {
 
     List<TriggerDTO> listBySceneId(@Param("sceneId") String sceneId);
+
+    List<TriggerDTO> listByDeviceProfileIds(@Param("tenantId")String tenantId,@Param("deviceProfileIds")List<String> deviceProfileIds);
 }

 package org.thingsboard.server.dao.yunteng.service;
 
+import org.thingsboard.server.common.data.id.RuleChainId;
+import org.thingsboard.server.common.data.id.TenantId;
 import org.thingsboard.server.common.data.rule.RuleChainMetaData;
 import org.thingsboard.server.common.data.rule.RuleNode;
 import org.thingsboard.server.common.data.yunteng.dto.convert.ConvertConfigDTO;
@@ -21,7 +23,7 @@ public interface ConvertConfigService extends BaseService<ConvertConfig> {
 
   boolean deleteConvertConfig(DeleteDTO deleteDTO, Integer nodeType);
 
-  ConvertConfigDTO findConvertConfigDTOByName(String tenantId,String name,Integer nodeType);
+  ConvertConfigDTO findConvertConfigDTOByName(String tenantId,String name,String type,Integer nodeType);
   /**
    * 通过数据转换的IDS获取需要组装的节点
    *
@@ -57,12 +59,35 @@ public interface ConvertConfigService extends BaseService<ConvertConfig> {
    * 检查该租户下是否已启用转换脚本状态
    *
    * @param tenantId 租户ID
+   * @param ruleChainId 规则链ID
    * @return true已启用 false未启用
    */
-  boolean checkConvertJSStatusEnable(String tenantId);
+  boolean checkConvertJSStatusEnable(String tenantId,String ruleChainId);
 
   boolean deleteRuleNode(
       List<RuleNode> nodes, RuleChainMetaData ruleChainMetaData, Integer nodeType,String tenantId);
 
   void addRuleNode(List<RuleNode> nodes, RuleChainMetaData ruleChainMetaData, Integer nodeType,String tenantId);
+
+  RuleChainMetaData getTenantRuleChainMetaData(TenantId tenantId, RuleChainId  ruleChainId, List<RuleNode> nodes,
+                                               int status, int nodeType, String nodeConnectionName);
+
+  /**
+   * 根据规则链ID删除对应的转换脚本
+   * @param tenantId
+   * @param ruleChainId
+   * @param nodeType
+   * @return
+   */
+  boolean deleteConvertConfigByRuleChainId(String tenantId,String ruleChainId,Integer nodeType);
+
+
+  /**
+   * 检查数据流转或规则链转换脚本使用了以下规则链
+   * @param tenantId 租户ID
+   * @param ruleChainIds 规则链ID列表
+   * @param nodeType 0 转换脚本 1数据流转
+   * @return 返回使用以下规则链的数据流转或规则链转换脚本信息
+   */
+  List<ConvertConfigDTO> getConvertConfigUsedByRuleChainIds(String tenantId,List<String> ruleChainIds,Integer nodeType);
 }

@@ -16,4 +16,6 @@ public interface DoActionService extends BaseService<TkDoActionEntity>{
     List<TkDoActionEntity> getActionsByAll(String sceneId,String tenantId);
 
     List<DoActionDTO> findDoActionByAlarmProfileIds(String tenantId, Set<String> alarmProfileIds);
+
+    List<DoActionDTO> findDoActionsBySceneLinkageIds(String tenantId,List<String> sceneLinkageIds);
 }

 package org.thingsboard.server.dao.yunteng.service;
 
+import org.thingsboard.server.common.data.yunteng.dto.scene.DoConditionDTO;
 import org.thingsboard.server.dao.yunteng.entities.TkDoConditionEntity;
 
 import java.util.List;
@@ -11,4 +12,6 @@ import java.util.List;
  */
 public interface DoConditionService extends BaseService<TkDoConditionEntity>{
     List<TkDoConditionEntity> getConditions(String sceneId);
+
+    List<DoConditionDTO> listByDeviceProfileIds(String tenantId,List<String> deviceProfileIds);
 }

@@ -2,6 +2,7 @@ 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.scene.SceneLinkageDTO;
+import org.thingsboard.server.common.data.yunteng.dto.scene.SceneLinkageDeviceProfileDTO;
 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;
@@ -92,6 +93,14 @@ public interface SceneLinkageService extends BaseService<TkSceneLinkageEntity>{
      * 详情
      * @return
      */
-    SceneLinkageDTO selectById(String id);
+    SceneLinkageDTO selectById(String tenantId,String id);
 
+    /**
+     * 判断哪些产品被产品联动使用了，并返回被使用的产品ID列表
+     * @param tenantId 租户ID
+     * @param deviceProfileIds 检查的场景联动
+     * @param ruleChainIds 规则链ID列表
+     * @return
+     */
+    SceneLinkageDeviceProfileDTO checkDeviceProfileIdsUsedForSceneLinkage(String tenantId, List<String> deviceProfileIds,List<String> ruleChainIds);
 }

@@ -23,8 +23,8 @@ public interface TkDeviceProfileService extends TbBaseService<TkDeviceProfileEnt
 
   TkPageData<DeviceProfileDTO> page(Map<String, Object> queryMap, boolean isTenantAdmin);
 
-  List<DeviceProfileDTO> findDeviceProfile(
-          TenantId tenantId, String scriptId, DeviceTypeEnum deviceType, DeviceTransportType transportType,Boolean isSceneLinkage);
+  List<DeviceProfileDTO> findDeviceProfile(TenantId tenantId, String scriptId, DeviceTypeEnum deviceType,
+                                           DeviceTransportType transportType,Boolean isSceneLinkage,String ruleChainId);
 
   List<TkDeviceProfileEntity> findCustomerDeviceProfiles(
       TenantId tenantId, CustomerId customerId, DeviceTypeEnum deviceType,DeviceTransportType transportType);
@@ -64,4 +64,19 @@ public interface TkDeviceProfileService extends TbBaseService<TkDeviceProfileEnt
 
   DeviceProfile buildTbDeviceProfileFromDeviceProfileDTO(DeviceProfileDTO deviceProfileDTO, User user);
 
+  /**
+   * 判断规则链ID被哪些产品使用了
+   * @param tenantId 租户ID
+   * @param ruleChainId 规则链ID
+   * @return 产品名称列表
+   */
+  List<String> checkRuleChainIdUsedByDeviceProfiles(String tenantId,UUID ruleChainId);
+
+  /**
+   * 检查产品（设备配置）是否允许修改规则链
+   * @param deviceProfileIds 设备配置ID列表
+   * @param tenantId 租户ID
+   */
+  void checkDeviceProfilesCanChangeRuleChain(List<String> deviceProfileIds,TenantId tenantId);
+
 }

@@ -12,4 +12,6 @@ import java.util.List;
  */
 public interface TriggerService extends BaseService<TkTriggerEntity>{
     List<TriggerDTO> getTrigger(String sceneId);
+
+    List<TriggerDTO> getTriggersByDeviceProfileIds(String tenantId, List<String> deviceProfileIds);
 }

@@ -9,6 +9,11 @@
         <result property="configuration" column="configuration"
                 typeHandler="com.baomidou.mybatisplus.extension.handlers.JacksonTypeHandler"/>
         <result property="tenantId" column="tenant_id"/>
+        <result property="ruleChainId" column="rule_chain_id"/>
+        <result property="ruleChainName" column="rule_chain_name"/>
+        <result property="datasourceType" column="datasource_type" typeHandler="org.apache.ibatis.type.EnumTypeHandler"/>
+        <result property="datasourceContent" column="datasource_content"
+                typeHandler="com.baomidou.mybatisplus.extension.handlers.JacksonTypeHandler"/>
         <result property="status" column="status"/>
         <result property="nodeType" column="node_type"/>
         <result property="createTime" column="create_time"/>
@@ -17,6 +22,10 @@
         <result property="updater" column="updater"/>
         <result property="remark" column="remark"/>
     </resultMap>
+    <sql id="columns">
+        tcc.id,tcc.name,tcc.type,tcc.configuration,tcc.tenant_id,tcc.rule_chain_id,tcc.status,tcc.node_type,
+        tcc.datasource_type,tcc.datasource_content,tcc.create_time,tcc.update_time,tcc.creator,tcc.updater,tcc.remark
+    </sql>
     <update id="updateConvertStatusByIds">
         UPDATE tk_convert_config
         SET status =#{status}
@@ -30,4 +39,27 @@
             </if>
         </where>
     </update>
+    <select id="getConvertPage" resultMap="convertMap">
+        SELECT
+        <include refid="columns"/>,rc.name as rule_chain_name
+        FROM tk_convert_config tcc LEFT JOIN rule_chain rc ON tcc.rule_chain_id = rc.id ::TEXT
+        <where>
+            tcc.tenant_id = #{tenantId}
+            <if test="queryMap.name != null and queryMap.name != ''">
+                AND tcc.name LIKE concat('%',#{queryMap.name}::TEXT,'%')
+            </if>
+            <if test="queryMap.status != null">
+                AND tcc.status = #{queryMap.status}
+            </if>
+            <if test="queryMap.nodeType != null">
+                AND tcc.node_type = #{queryMap.nodeType}
+            </if>
+            <if test="queryMap.startTime != null and queryMap.endTime != null">
+                AND tcc.create_time &gt;= #{queryMap.startTime} AND tcc.create_time &lt; #{queryMap.endTime}
+            </if>
+            <if test="queryMap.ruleChainId != null and queryMap.ruleChainId != ''">
+                AND tcc.rule_chain_id = #{queryMap.ruleChainId}
+            </if>
+        </where>
+    </select>
 </mapper>

@@ -15,6 +15,7 @@
         <result property="commandType" column="command_type"/>
         <result property="thingsModelId" column="things_model_id"/>
         <result property="sceneLinkageId" column="scene_linkage_id"/>
+        <result property="sceneLinkageName" column="scene_linkage_name"/>
         <result property="deviceProfileId" column="device_profile_id"/>
         <result property="alarmProfileId" column="alarm_profile_id"/>
         <result property="tenantId" column="tenant_id"/>
@@ -24,12 +25,21 @@
         <result property="creator" column="creator"/>
     </resultMap>
     <sql id="columns">
-        id,device_id,entity_type,device_type,do_context,out_target,call_type,scene_linkage_id,alarm_profile_id,
-        tenant_id,updater,update_time,create_time,creator,command_type,things_model_id,device_profile_id
+        tda.id,tda.device_id,tda.entity_type,tda.device_type,tda.do_context,tda.out_target,tda.call_type,tda.scene_linkage_id,tda.alarm_profile_id,
+        tda.tenant_id,tda.updater,tda.update_time,tda.create_time,tda.creator,tda.command_type,tda.things_model_id,tda.device_profile_id
     </sql>
     <select id="listBySceneId" resultMap="actionDTO">
         SELECT
         <include refid="columns"/>
-        FROM tk_do_action WHERE scene_linkage_id = #{sceneId}
+        FROM tk_do_action tda WHERE tda.scene_linkage_id = #{sceneId}
+    </select>
+    <select id="listBySceneLinkageIds" resultMap="actionDTO">
+        SELECT
+        <include refid="columns"/>,tsl.name as scene_linkage_name
+        FROM tk_do_action tda LEFT JOIN tk_scene_linkage tsl ON tsl.id = tda.scene_linkage_id
+        WHERE tda.tenant_id = #{tenantId} AND tda.scene_linkage_id IN
+        <foreach collection="sceneLinkageIds" item="sceneLinkageId" open="(" separator="," close=")">
+            #{sceneLinkageId}
+        </foreach>
     </select>
 </mapper>

@@ -12,6 +12,7 @@
                 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"/>
+        <result property="sceneLinkageName" column="scene_linkage_name"/>
         <result property="tenantId" column="tenant_id"/>
         <result property="updater" column="updater"/>
         <result property="deviceProfileId" column="device_profile_id"/>
@@ -21,13 +22,24 @@
     </resultMap>
 
     <sql id="columns">
-        id,entity_id,entity_type,device_type,trigger_condition,trigger_type,scene_linkage_id,tenant_id
-        ,creator,updater,create_time,update_time,device_profile_id
+        tdc.id,tdc.entity_id,tdc.entity_type,tdc.device_type,tdc.trigger_condition,tdc.trigger_type,tdc.scene_linkage_id,tdc.tenant_id
+        ,tdc.creator,tdc.updater,tdc.create_time,tdc.update_time,tdc.device_profile_id
     </sql>
 
     <select id="listBySceneId" resultMap="conditionDTO">
         SELECT
         <include refid="columns"/>
-        FROM tk_do_condition WHERE scene_linkage_id = #{sceneId}
+        FROM tk_do_condition tdc WHERE tdc.scene_linkage_id = #{sceneId}
+    </select>
+
+    <select id="listByDeviceProfileIds" resultMap="conditionDTO">
+        SELECT
+        <include refid="columns"/>,tsl.name as scene_linkage_name
+        FROM tk_do_condition tdc
+        LEFT JOIN tk_scene_linkage tsl ON tdc.scene_linkage_id = tsl.id
+        WHERE tdc.tenant_id = #{tenantId} AND tdc.device_profile_id IN
+        <foreach collection="deviceProfileIds" item="deviceProfileId" open="(" separator="," close=")">
+            #{deviceProfileId}
+        </foreach>
     </select>
 </mapper>

@@ -6,6 +6,8 @@
         <result property="id" column="id"/>
         <result property="name" column="name"/>
         <result property="organizationId" column="organization_id"/>
+        <result property="ruleChainId" column="rule_chain_id"/>
+        <result property="ruleChainName" column="rule_chain_name"/>
         <result property="status" column="status"/>
         <result property="description" column="description"/>
         <result property="tenantId" column="tenant_id"/>
@@ -20,14 +22,15 @@
 
     </resultMap>
     <sql id="columns">
-        s.id,s.name,s.organization_id,s.status,s.description,s.tenant_id,s.updater,s.update_time,s.create_time,s.creator
+        s.id,s.name,s.organization_id,s.rule_chain_id,s.status,s.description,s.tenant_id,s.updater,s.update_time,s.create_time,s.creator
     </sql>
     <select id="getScenePage" resultMap="sceneLinkageMap">
         SELECT
-        <include refid="columns"/>,su.real_name creator_name
+        <include refid="columns"/>,su.real_name creator_name,rc.name as rule_chain_name
         FROM tk_scene_linkage s
         LEFT JOIN sys_user su ON su.id = s.creator
         LEFT JOIN tk_organization io ON io.id = s.organization_id
+        LEFT JOIN rule_chain rc ON rc.id::TEXT = s.rule_chain_id
         <where>
             <if test="queryMap.tenantId !=null and queryMap.tenantId !=''">
                 AND s.tenant_id = #{queryMap.tenantId}
@@ -44,6 +47,9 @@
                     #{organizationId}
                 </foreach>
             </if>
+            <if test="queryMap.ruleChainId != null and queryMap.ruleChainId != ''">
+                AND s.rule_chain_id = #{queryMap.ruleChainId}
+            </if>
             <if test="queryMap.currentUser !=null">
                 AND s.creator = #{queryMap.currentUser}
             </if>
@@ -58,6 +64,7 @@
         LEFT JOIN sys_user su ON su.id = s.creator
         LEFT JOIN tk_organization io ON io.id = s.organization_id
         <where>
+            s.tenant_id = #{tenantId}
             <if test="id !=null">
                 AND s.id = #{id}
             </if>

@@ -107,6 +107,9 @@
             <if test="scriptId !=null and scriptId !=''">
                 AND base.script_id = #{scriptId}
             </if>
+            <if test="ruleChainId !=null and ruleChainId !=''">
+                AND base.default_rule_chain_id::TEXT = #{ruleChainId}
+            </if>
             <if test="deviceType !=null">
                 AND base.device_type = #{deviceType}
             </if>

@@ -13,6 +13,7 @@
                 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"/>
+        <result property="sceneLinkageName" column="scene_linkage_name"/>
         <result property="tenantId" column="tenant_id"/>
         <result property="updater" column="updater"/>
         <result property="updateTime" column="update_time"/>
@@ -21,13 +22,24 @@
     </resultMap>
 
     <sql id="columns">
-        id,entity_id,entity_type,device_type,trigger_condition,trigger_type,scene_linkage_id,tenant_id,creator
-        ,updater,create_time,update_time,device_profile_id
+        tt.id,tt.entity_id,tt.entity_type,tt.device_type,tt.trigger_condition,tt.trigger_type,tt.scene_linkage_id,tt.tenant_id,tt.creator
+        ,tt.updater,tt.create_time,tt.update_time,tt.device_profile_id
     </sql>
 
     <select id="listBySceneId" resultMap="triggerDTO">
         SELECT
         <include refid="columns"/>
-        FROM tk_trigger WHERE scene_linkage_id = #{sceneId}
+        FROM tk_trigger tt WHERE tt.scene_linkage_id = #{sceneId}
+    </select>
+
+    <select id="listByDeviceProfileIds" resultMap="triggerDTO">
+        SELECT
+        <include refid="columns"/>,tsl.name as scene_linkage_name
+        FROM tk_trigger tt
+        LEFT JOIN tk_scene_linkage tsl ON tt.scene_linkage_id = tsl.id
+        WHERE tt.tenant_id = #{tenantId} AND tt.device_profile_id IN
+        <foreach collection="deviceProfileIds" item="deviceProfileId" open="(" separator="," close=")">
+            #{deviceProfileId}
+        </foreach>
     </select>
 </mapper>