Merge branch 'fix/delete_device_profile_tip' into 'master_dev'

perf: 删除产品时验证产品是否被组态使用

See merge request yunteng/thingskit!445

@@ -209,7 +209,7 @@ non.existent.tenant = Rule chain is referencing to non-existent tenant!
 root.rule.chain.is.present = Another root rule chain is present in scope of current tenant!
 edge.root.rule.chain.is.present = Another edge template root rule chain is present in scope of current tenant!
 app.openapi.api.isnull = The current application does not have a callable API. Please contact the administrator
-
+device.profile.used.for.configuration.center = The product used for [%s] configuration center and cannot delete!!!
 
 
 

@@ -209,5 +209,5 @@ non.existent.tenant =规则链正在引用不存在的租户
 root.rule.chain.is.present =当前租户范围内存在另一个根规则链
 edge.root.rule.chain.is.present =当前租户范围内存在另一个边缘模板根规则链
 app.openapi.api.isnull = 当前应用不存在可调用api请联系管理员
-
+device.profile.used.for.configuration.center = 产品被【%s】组态使用,不能删除！！！
 

@@ -203,7 +203,7 @@ public enum ErrorMessage {
   ROOT_RULE_CHAIN_IS_PRESENT (400167,"当前租户范围内存在另一个根规则链！","root.rule.chain.is.present"),
   EDGE_ROOT_RULE_CHAIN_IS_PRESENT(400168,"当前租户范围内存在另一个边缘模板根规则链！","edge.root.rule.chain.is.present"),
   APP_OPENAPI_API_ISNULL(400169,"当前应用不存在可调用api请联系管理员","app.openapi.api.isnull"),
-
+  DEVICE_PROFILE_USED_FOR_CENTER(400170,"产品被【%s】组态使用,不能删除！！！","device.profile.used.for.configuration.center"),
 
   HAVE_NO_PERMISSION(500002, "没有修改权限", "have.no.permission"),
   NOT_ALLOWED_ISOLATED_IN_MONOLITH(500003, "【monolith】模式下，不能选择【isolated】类型的租户配置", "not.allowed.isolated.in.monolith"),

@@ -31,13 +31,11 @@ import org.thingsboard.server.common.data.yunteng.utils.i18n.MessageUtils;
 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.mapper.ConfigurationCenterMapper;
 import org.thingsboard.server.dao.yunteng.mapper.DeviceMapper;
 import org.thingsboard.server.dao.yunteng.mapper.TkDeviceProfileCategoryMapper;
 import org.thingsboard.server.dao.yunteng.mapper.TkDeviceProfileMapper;
-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 org.thingsboard.server.dao.yunteng.service.*;
 
 import java.time.LocalDateTime;
 import java.util.*;
@@ -60,6 +58,8 @@ public class TkDeviceProfileServiceImpl
 
     private final SceneLinkageService sceneLinkageService;
 
+    private final ConfigurationCenterMapper configurationCenterMapper;
+
 
 
     @Override
@@ -313,6 +313,15 @@ public class TkDeviceProfileServiceImpl
         if (count > 0) {
             throw new TkDataValidationException(MessageUtils.message(ErrorMessage.DEVICE_PROFILE_USED_BY_DEVICE.getI18nCode()));
         }
+        for (String deviceProfileId:ids){
+            //删除检查产品是否被组态使用
+            List<ConfigurationCenterDTO> checkResult = configurationCenterMapper.getConfigurationCenterByDeviceProfileId(deviceProfileId,tenantId);
+            if(null != checkResult && !checkResult.isEmpty()){
+                throw new TkDataValidationException(String.format(MessageUtils.message(ErrorMessage.
+                                DEVICE_PROFILE_USED_FOR_CENTER.getI18nCode())
+                        ,checkResult.get(0).getName()));
+            }
+        }
     }
 
     @Override

@@ -18,4 +18,13 @@ public interface ConfigurationCenterMapper extends BaseMapper<TkConfigurationCen
 
   List<ConfigurationContentInfoDTO> getConfigurationInfoById(
       @Param("id") String id, @Param("tenantId") String tenantId);
+
+  /**
+   * 通过产品ID和租户ID查询被哪些组态使用
+   * @param deviceProfileId 产品ID
+   * @param tenantId 租户ID
+   * @return 组态中心列表
+   */
+  List<ConfigurationCenterDTO> getConfigurationCenterByDeviceProfileId(
+      @Param("deviceProfileId") String deviceProfileId, @Param("tenantId") String tenantId);
 }

@@ -40,11 +40,11 @@
 
     <sql id="columns">
         a.id,a.name,a.platform,a.organization_id,a.thumbnail, a.remark,a.update_time,a.create_time,a.creator,a.tenant_id,
-        a.updater,io.name AS organization_name,a.view_type,a.access_credentials,a.product_and_device,a.template_id
+        a.updater,a.view_type,a.access_credentials,a.product_and_device,a.template_id
     </sql>
     <select id="getConfigurationCenterPage" resultMap="configurationCenterMap">
         SELECT
-        <include refid="columns"/>
+        <include refid="columns"/>,io.name AS organization_name
         FROM tk_configuration_center a
         LEFT JOIN tk_organization io ON io.id = a.organization_id
         <where>
@@ -74,4 +74,14 @@
         tk_configuration_content icct ON icc.id = icct.configuration_id
         WHERE icc.id = #{id} AND icc.tenant_id = #{tenantId}
     </select>
+
+    <select id="getConfigurationCenterByDeviceProfileId" resultMap="configurationCenterMap">
+        SELECT
+        <include refid="columns"/>
+        FROM
+            tk_configuration_center a
+        WHERE
+            a.tenant_id = #{tenantId}
+          AND POSITION ( #{deviceProfileId} IN product_and_device ) >0
+    </select>
 </mapper>