fix(DEFECT-582): 告警配置被占用，提示信息修改

1、细化提示内容

fix(DEFECT-582): 告警配置被占用，提示信息修改
1、细化提示内容
云中非
1 parent 9d0dcf47
Showing 2 changed files with 30 additions and 8 deletions
common/data/src/main/java/org/thingsboard/server/common/data/yunteng/core/message/ErrorMessage.java
dao/src/main/java/org/thingsboard/server/dao/yunteng/impl/AlarmProfileServiceImpl.java
--- a/common/data/src/main/java/org/thingsboard/server/common/data/yunteng/core/message/ErrorMessage.java
View file @cbeabb1
+++ b/common/data/src/main/java/org/thingsboard/server/common/data/yunteng/core/message/ErrorMessage.java
View file @cbeabb1
@@ -59,7 +59,7 @@ public enum ErrorMessage {
   DEVICE_LOSED(400039,"设备相关参数丢失"),
   SCENE_REACT_NOT_EXTIED(400040,"场景联动不存在"),
   DEVICE_USED_SCENE_REACT(400041,"场景联动【%s】正在使用该设备"),
-  SCENE_REACT_USED_ALARM_PROFILE(400042,"场景联动正在使用该告警配置"),
+  SCENE_REACT_USED_ALARM_PROFILE(400042,"场景联动【%s】正在使用该告警配置"),
   APP_USER_BINDED(400043,"平台用户【%s】已被其它账号绑定"),
   THIRD_PLATFORM_EXCEPTION(400044,"【%s】，第三方异常【%s】"),
   DEVICE_NOT_EXTIED(400045,"设备不存在"),
--- a/dao/src/main/java/org/thingsboard/server/dao/yunteng/impl/AlarmProfileServiceImpl.java
View file @cbeabb1
+++ b/dao/src/main/java/org/thingsboard/server/dao/yunteng/impl/AlarmProfileServiceImpl.java
View file @cbeabb1
 package org.thingsboard.server.dao.yunteng.impl;
 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
+import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import lombok.RequiredArgsConstructor;
 import lombok.extern.slf4j.Slf4j;
@@ -15,8 +16,10 @@ import org.thingsboard.server.common.data.yunteng.dto.*;
 import org.thingsboard.server.common.data.yunteng.utils.ReflectUtils;
 import org.thingsboard.server.common.data.yunteng.utils.tools.YtPageData;
 import org.thingsboard.server.dao.yunteng.entities.AlarmProfile;
+import org.thingsboard.server.dao.yunteng.entities.SceneLinkage;
 import org.thingsboard.server.dao.yunteng.mapper.AlarmProfileMapper;
 import org.thingsboard.server.dao.yunteng.mapper.OrganizationMapper;
+import org.thingsboard.server.dao.yunteng.mapper.SceneLinkageMapper;
 import org.thingsboard.server.dao.yunteng.service.AbstractBaseService;
 import org.thingsboard.server.dao.yunteng.service.AlarmProfileService;
 import org.thingsboard.server.dao.yunteng.service.DoActionService;
@@ -35,6 +38,7 @@ public class AlarmProfileServiceImpl extends AbstractBaseService<AlarmProfileMap
     private final UserOrganizationMappingServiceImpl userOrganizationMappingService;
     private final OrganizationMapper ytOrganizationMapper;
+    private final SceneLinkageMapper sceneLinkageMapper;
     @Override
     public YtPageData<AlarmProfileDTO> page(
@@ -74,10 +78,9 @@ public class AlarmProfileServiceImpl extends AbstractBaseService<AlarmProfileMap
             if (!alarmProfile.getOrganizationId().equals(alarmProfileDTO.getOrganizationId())) {
                 Set<String> profiles = new HashSet<>();
                 profiles.add(alarmProfileDTO.getId());
-                List<DoActionDTO> list =
-                        doActionService.findDoActionByAlarmProfileIds(alarmProfileDTO.getTenantId(), profiles);
-                if (list.size() > FastIotConstants.MagicNumber.ZERO) {
-                    throw new YtDataValidationException(ErrorMessage.SCENE_REACT_USED_ALARM_PROFILE.getMessage());
+                Set<String>names = alarmProfileUsed(alarmProfileDTO.getTenantId(), profiles);
+                if(!names.isEmpty()){
+                    throw new YtDataValidationException(String.format(ErrorMessage.SCENE_REACT_USED_ALARM_PROFILE.getMessage(), names));
                 }
             }
             baseMapper.updateById(alarmProfileDTO.getEntity(AlarmProfile.class));
@@ -106,13 +109,32 @@ public class AlarmProfileServiceImpl extends AbstractBaseService<AlarmProfileMap
     @Override
     @Transactional
     public boolean deleteAlarmProFile(DeleteDTO deleteDTO) {
+        Set<String>names = alarmProfileUsed(deleteDTO.getTenantId(), deleteDTO.getIds());
+        if(!names.isEmpty()){
+            throw new YtDataValidationException(String.format(ErrorMessage.SCENE_REACT_USED_ALARM_PROFILE.getMessage(), names));
+        }
+        return baseMapper.deleteBatchIds(deleteDTO.getIds()) > 0;
+    }
+
+    private Set<String> alarmProfileUsed(String tenantId, Set<String> profileIds) {
+
+        Set<String> sceneNames = new HashSet<>();
         // 如果有场景联动使用告警配置，则不能删除
         List<DoActionDTO> list =
-                doActionService.findDoActionByAlarmProfileIds(deleteDTO.getTenantId(), deleteDTO.getIds());
+                doActionService.findDoActionByAlarmProfileIds(tenantId, profileIds);
         if (list.size() > FastIotConstants.MagicNumber.ZERO) {
-            throw new YtDataValidationException(ErrorMessage.EXIST_LEADER_MEMBER_RELATION.getMessage());
+            Set<String> sceneIds = new HashSet<>();
+            for(DoActionDTO action:list){
+                sceneIds.add(action.getSceneLinkageId());
+            }
+            List<SceneLinkage> scenes = sceneLinkageMapper.selectList(new QueryWrapper<SceneLinkage>().lambda()
+                    .eq(SceneLinkage::getId, sceneIds)
+            );
+            for(SceneLinkage item: scenes){
+                sceneNames.add(item.getName());
+            }
         }
-        return baseMapper.deleteBatchIds(deleteDTO.getIds()) > 0;
+        return sceneNames;
     }
     @Override