fix: 场景联动是否使用产品校验

@@ -136,6 +136,14 @@ public class TkDeviceProfileServiceImpl
         Optional.ofNullable(deviceProfileDTO.getCategoryId()).ifPresent(tbDeviceProfile::setCategoryId);
         Optional.ofNullable(deviceProfileDTO.getCategoryId()).ifPresent(tbDeviceProfile::setCategoryId);
 
 
         String chainIdStr = deviceProfileDTO.getDefaultRuleChainId();
         String chainIdStr = deviceProfileDTO.getDefaultRuleChainId();
+        if(StringUtils.isNotEmpty(deviceProfileDTO.getId())){
+            //编辑的时候判断，是否更换了规则链
+            DeviceProfileDTO queryDeviceProfile = findByTbDeviceProfileId(user.getTenantId().getId(),UUID.fromString(deviceProfileDTO.getId()));
+            if(!chainIdStr.equals(queryDeviceProfile.getDefaultRuleChainId())){
+                //如果更换了规则链,要进行check
+                checkDeviceProfilesCanChangeRuleChain(List.of(deviceProfileDTO.getId()),user.getTenantId());
+            }
+        }
         // 获取当前租户的默认规则链
         // 获取当前租户的默认规则链
         if (StringUtils.isNotBlank(chainIdStr)) {
         if (StringUtils.isNotBlank(chainIdStr)) {
             RuleChainId chainId = new RuleChainId(UUID.fromString(chainIdStr));
             RuleChainId chainId = new RuleChainId(UUID.fromString(chainIdStr));
@@ -222,16 +230,16 @@ public class TkDeviceProfileServiceImpl
                 JsonNode datasource = convertEntity.getDatasourceContent();
                 JsonNode datasource = convertEntity.getDatasourceContent();
                 if(null != datasource){
                 if(null != datasource){
                     JsonNode usedDeviceProfileIds = datasource.get("convertProducts");
                     JsonNode usedDeviceProfileIds = datasource.get("convertProducts");
-                    List<String> ids = null;
+                    List<String> ids = new ArrayList<>();;
                     if(usedDeviceProfileIds.isArray()){
                     if(usedDeviceProfileIds.isArray()){
                         Iterator<JsonNode> iteratorNodes = usedDeviceProfileIds.iterator();
                         Iterator<JsonNode> iteratorNodes = usedDeviceProfileIds.iterator();
                         while (iteratorNodes.hasNext()){
                         while (iteratorNodes.hasNext()){
                             ids.add(iteratorNodes.next().asText());
                             ids.add(iteratorNodes.next().asText());
                         }
                         }
                     }
                     }
-                    if(null != ids){
-                        classification.entrySet().forEach(key->{
-                            for (TkDeviceProfileEntity entity : classification.get(key)) {
+                    if(!ids.isEmpty()){
+                        classification.entrySet().forEach(entry->{
+                            for (TkDeviceProfileEntity entity : classification.get(entry.getKey())) {
                                 if(ids.contains(entity.getId().toString())){
                                 if(ids.contains(entity.getId().toString())){
                                     throw new TkDataValidationException(String.format(ErrorMessage.
                                     throw new TkDataValidationException(String.format(ErrorMessage.
                                             CHOICE_DEVICE_PROFILE_RULE_CHAIN_IS_USED_FOR_CONVERT.getMessage(),entity.getName(),convertEntity.getName()));
                                             CHOICE_DEVICE_PROFILE_RULE_CHAIN_IS_USED_FOR_CONVERT.getMessage(),entity.getName(),convertEntity.getName()));

@@ -45,11 +45,6 @@ public class TkDoActionServiceImpl extends AbstractBaseService<DoActionMapper, T
 
 
   @Override
   @Override
   public List<DoActionDTO> findDoActionsBySceneLinkageIds(String tenantId, List<String> sceneLinkageIds) {
   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;
+    return baseMapper.listBySceneLinkageIds(tenantId,sceneLinkageIds);
   }
   }
 }
 }