Merge branch '20220913' into 'master_dev'

fix(DEFECT-1017): 住户配置选择错误异常信息调整

See merge request yunteng/thingskit!230

@@ -22,6 +22,8 @@ import org.thingsboard.server.common.data.id.UserId;
 import org.thingsboard.server.common.data.plugin.ComponentLifecycleEvent;
 import org.thingsboard.server.common.data.yunteng.common.DeleteGroup;
 import org.thingsboard.server.common.data.yunteng.common.UpdateGroup;
+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.data.yunteng.dto.MenuDTO;
 import org.thingsboard.server.common.data.yunteng.dto.TenantDTO;
@@ -30,6 +32,7 @@ import org.thingsboard.server.common.data.yunteng.dto.request.TenantReqDTO;
 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.exception.DataValidationException;
 import org.thingsboard.server.dao.tenant.TenantService;
 import org.thingsboard.server.dao.user.UserService;
 import org.thingsboard.server.dao.yunteng.service.MenuService;
@@ -219,10 +222,17 @@ public class TkAdminController extends BaseController {
       updateOrSaveTenant(tenantReqDTO, isCreate);
       result = tkTenantService.updateOrCreateTenant(tenantReqDTO, isCreate);
     } catch (Exception e) {
-      if (isCreate) {
+      if (isCreate && result != null) {
         deleteTenant(tenantReqDTO.getTenantId());
-        throw handleException(e);
       }
+      if(e instanceof DataValidationException){
+        String errMsg = e.getMessage();
+        if(errMsg.contains("isolated tenant profiles")){
+          errMsg = ErrorMessage.NOT_ALLOED_ISOLATED_IN_MONOLITH.getMessage();
+        }
+        throw new DataValidationException(errMsg);
+      }
+      throw handleException(e);
     }
     return result;
   }

@@ -73,8 +73,8 @@ public class TkMessageConfigController extends BaseController {
   @DeleteMapping
   @PreAuthorize("@check.checkPermissions({},{'api:yt:message:delete'})")
   public ResponseResult<String> deleteMessageConfig(
-      @Validated({DeleteGroup.class}) @RequestBody DeleteDTO deleteDTO) {
-    return messageConfigService.deleteMessageConfig(deleteDTO.getIds())
+      @Validated({DeleteGroup.class}) @RequestBody DeleteDTO deleteDTO) throws ThingsboardException {
+    return messageConfigService.deleteMessageConfig(deleteDTO.getIds(),getCurrentUser().getCurrentTenantId())
         ? ResponseResult.success(FastIotConstants.StateValue.DELETE_SUCCESS)
         : ResponseResult.failed(FastIotConstants.StateValue.DELETE_FAILED);
   }

@@ -84,7 +84,7 @@ public interface FastIotConstants {
 
     /** 定时任务白名单配置（仅允许访问的包名，如其他需要可以自行添加） */
     public static final String[] JOB_WHITELIST_STR = {
-      "org.thingsboard.server.dao.util.yunteng.task"
+      "org.thingsboard.server.dao.util.yunteng.task","org.thingsboard.server.utils.yunteng"
     };
     /** http请求 */
     public static final String HTTP = "http://";

@@ -107,7 +107,10 @@ public enum ErrorMessage {
   HIKVISION_GET_URL_ERROR(400083,"海康威视视API调用获取URL失败！！"),
   HIKVISION_API_ERROR(400084,"海康威视视频预览API调用失败【%s】，错误码【%s】"),
   RESET_PASSWORD_SUCCESS(400085,"重置成功，请使用默认密码登录"),
-  HAVE_NO_PERMISSION(500002,"没有修改权限");
+  HAVE_NO_PERMISSION(500002,"没有修改权限"),
+  MESSAGE_TEMPLATE_DELETED(400020,"消息模板不存在！"),
+  NOT_ALLOED_ISOLATED_IN_MONOLITH(500003,"【monolith】模式下，不能选择【isolated】类型的租户配置"),
+  MESSAGE_TEMPLATE_USING_CONFIG(500003,"删除消息配置前，需要禁用使用消息配置的消息模板%s。");
   private final int code;
   private String message;
 

 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 java.util.List;
-import java.util.Map;
-import java.util.Set;
+
+import java.util.*;
+import java.util.stream.Collectors;
+
 import lombok.RequiredArgsConstructor;
 import lombok.extern.slf4j.Slf4j;
 import org.apache.commons.lang3.StringUtils;
@@ -15,12 +17,17 @@ import org.thingsboard.server.common.data.yunteng.constant.ModelConstants;
 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.MessageConfigDTO;
+import org.thingsboard.server.common.data.yunteng.enums.StatusEnum;
 import org.thingsboard.server.common.data.yunteng.utils.ReflectUtils;
 import org.thingsboard.server.common.data.yunteng.utils.tools.TkPageData;
 import org.thingsboard.server.dao.yunteng.entities.TkMessageConfigEntity;
+import org.thingsboard.server.dao.yunteng.entities.TkMessageTemplateEntity;
 import org.thingsboard.server.dao.yunteng.mapper.MessageConfigMapper;
+import org.thingsboard.server.dao.yunteng.mapper.MessageTemplateMapper;
 import org.thingsboard.server.dao.yunteng.service.AbstractBaseService;
 import org.thingsboard.server.dao.yunteng.service.TkMessageConfigService;
+import org.thingsboard.server.dao.yunteng.service.TkMessageTemplateService;
+import org.thingsboard.server.dao.yunteng.service.TkUserService;
 
 @Service
 @Slf4j
@@ -28,7 +35,7 @@ import org.thingsboard.server.dao.yunteng.service.TkMessageConfigService;
 public class TkMessageConfigServiceImpl
     extends AbstractBaseService<MessageConfigMapper, TkMessageConfigEntity>
     implements TkMessageConfigService {
-
+  private final MessageTemplateMapper templateMapper;
   @Override
   public TkPageData<MessageConfigDTO> page(String tenantId, Map<String, Object> queryMap) {
     IPage<TkMessageConfigEntity> configIPage =
@@ -69,7 +76,18 @@ public class TkMessageConfigServiceImpl
 
   @Override
   @Transactional
-  public boolean deleteMessageConfig(Set<String> ids) {
+  public boolean deleteMessageConfig(Set<String> ids,String tenantId) {
+    LambdaQueryWrapper<TkMessageTemplateEntity> filter = new LambdaQueryWrapper<>();
+    filter
+        .in(TkMessageTemplateEntity::getMessageConfigId, ids)
+        .eq(TkMessageTemplateEntity::getTenantId, tenantId)
+        .eq(TkMessageTemplateEntity::getStatus, StatusEnum.ENABLE.getIndex());
+    List<TkMessageTemplateEntity> templates = templateMapper.selectList(filter);
+    if(templates.size()>0){
+      List<String> templateNames =templates.stream().map(t->t.getTemplateName()).collect(Collectors.toList());
+      String errMsg = String.format(ErrorMessage.MESSAGE_TEMPLATE_USING_CONFIG.getMessage(), templateNames);
+      throw new TkDataValidationException(errMsg);
+    }
     return baseMapper.deleteBatchIds(ids) > 0;
   }
 

@@ -10,7 +10,9 @@ import org.thingsboard.server.common.data.yunteng.core.exception.TkDataValidatio
 import org.thingsboard.server.common.data.yunteng.core.message.ErrorMessage;
 import org.thingsboard.server.common.data.yunteng.dto.MessageTemplateDTO;
 import org.thingsboard.server.common.data.yunteng.utils.tools.TkPageData;
+import org.thingsboard.server.dao.yunteng.entities.TkMessageConfigEntity;
 import org.thingsboard.server.dao.yunteng.entities.TkMessageTemplateEntity;
+import org.thingsboard.server.dao.yunteng.mapper.MessageConfigMapper;
 import org.thingsboard.server.dao.yunteng.mapper.MessageTemplateMapper;
 import org.thingsboard.server.dao.yunteng.service.AbstractBaseService;
 import org.thingsboard.server.dao.yunteng.service.TkMessageTemplateService;
@@ -25,6 +27,7 @@ import java.util.Set;
 public class TkMessageTemplateServiceImpl
     extends AbstractBaseService<MessageTemplateMapper, TkMessageTemplateEntity>
     implements TkMessageTemplateService {
+  private final MessageConfigMapper configMapper;
   @Override
   public TkPageData<MessageTemplateDTO> page(Map<String, Object> queryMap) {
     IPage<TkMessageTemplateEntity> configIPage = getPage(queryMap, FastIotConstants.DefaultOrder.CREATE_TIME,false);
@@ -52,7 +55,6 @@ public class TkMessageTemplateServiceImpl
   @Override
   @Transactional
   public MessageTemplateDTO updateMessageTemplate(MessageTemplateDTO templateDTO) {
-
     //查询该租户下 是否已经启用相同消息类型、相同用途的模板
     if(null!=templateDTO.getStatus() && templateDTO.getStatus() == FastIotConstants.MagicNumber.ONE){
       MessageTemplateDTO queryTemplate = new MessageTemplateDTO();
@@ -69,6 +71,13 @@ public class TkMessageTemplateServiceImpl
       }
     }
     TkMessageTemplateEntity messageTemplate = baseMapper.selectById(templateDTO.getId());
+    if(messageTemplate == null){
+      throw new TkDataValidationException(ErrorMessage.MESSAGE_TEMPLATE_DELETED.getMessage());
+    }
+    TkMessageConfigEntity configEntity =configMapper.selectById(StringUtils.isNotBlank(templateDTO.getMessageConfigId())?templateDTO.getMessageConfigId():messageTemplate.getMessageConfigId());
+    if(configEntity == null){
+      throw new TkDataValidationException(ErrorMessage.MESSAGE_CONFIG_NOT_EXISTS.getMessage());
+    }
     templateDTO.copyToEntity(messageTemplate);
     baseMapper.updateById(messageTemplate);
     messageTemplate.copyToDTO(templateDTO);

@@ -14,7 +14,7 @@ public interface TkMessageConfigService extends BaseService<TkMessageConfigEntit
 
   MessageConfigDTO saveMessageConfig(String tenantId,MessageConfigDTO configDTO);
 
-  boolean deleteMessageConfig(Set<String> ids);
+  boolean deleteMessageConfig(Set<String> ids,String tenantId);
 
   MessageConfigDTO updateMessageConfig(String tenantId,MessageConfigDTO configDTO);