简柏林 / thingskit · Commits

Commit 428a302f27192de9cbd98b64189e11aff278acd2

Authored by xp.Huang
1 parent ec8d1bd3

fix:删除设备配置时，只要有消息模板在使用该配置，都进行相应提示

Inline Side-by-side
Showing 2 changed files with 11 additions and 10 deletions
... ... @@ -113,7 +113,7 @@ public enum ErrorMessage {
113 113 NEED_MAIN_PARAMETER(400021, "缺少必要参数【%s】"),
114 114 REGISTER_VALUE_IS_NONE(400022, "寄存器值不能为空"),
115 115 NOT_ALLOED_ISOLATED_IN_MONOLITH(500003,"【monolith】模式下，不能选择【isolated】类型的租户配置"),
116   - MESSAGE_TEMPLATE_USING_CONFIG(500004,"删除消息配置前，需要禁用使用消息配置的消息模板%s。");
  116 + MESSAGE_TEMPLATE_USING_CONFIG(500004,"消息配置正在被消息模板【%s】使用");
117 117 private final int code;
118 118 private String message;
119 119
... ...
... ... @@ -17,7 +17,6 @@ import org.thingsboard.server.common.data.yunteng.constant.ModelConstants;
17 17 import org.thingsboard.server.common.data.yunteng.core.exception.TkDataValidationException;
18 18 import org.thingsboard.server.common.data.yunteng.core.message.ErrorMessage;
19 19 import org.thingsboard.server.common.data.yunteng.dto.MessageConfigDTO;
20   -import org.thingsboard.server.common.data.yunteng.enums.StatusEnum;
21 20 import org.thingsboard.server.common.data.yunteng.utils.ReflectUtils;
22 21 import org.thingsboard.server.common.data.yunteng.utils.tools.TkPageData;
23 22 import org.thingsboard.server.dao.yunteng.entities.TkMessageConfigEntity;
... ... @@ -26,8 +25,6 @@ import org.thingsboard.server.dao.yunteng.mapper.MessageConfigMapper;
26 25 import org.thingsboard.server.dao.yunteng.mapper.MessageTemplateMapper;
27 26 import org.thingsboard.server.dao.yunteng.service.AbstractBaseService;
28 27 import org.thingsboard.server.dao.yunteng.service.TkMessageConfigService;
29   -import org.thingsboard.server.dao.yunteng.service.TkMessageTemplateService;
30   -import org.thingsboard.server.dao.yunteng.service.TkUserService;
31 28
32 29 @Service
33 30 @Slf4j
... ... @@ -36,6 +33,7 @@ public class TkMessageConfigServiceImpl
36 33 extends AbstractBaseService<MessageConfigMapper, TkMessageConfigEntity>
37 34 implements TkMessageConfigService {
38 35 private final MessageTemplateMapper templateMapper;
  36 +
39 37 @Override
40 38 public TkPageData<MessageConfigDTO> page(String tenantId, Map<String, Object> queryMap) {
41 39 IPage<TkMessageConfigEntity> configIPage =
... ... @@ -76,16 +74,19 @@ public class TkMessageConfigServiceImpl
76 74
77 75 @Override
78 76 @Transactional
79   - public boolean deleteMessageConfig(Set<String> ids,String tenantId) {
  77 + public boolean deleteMessageConfig(Set<String> ids, String tenantId) {
80 78 LambdaQueryWrapper<TkMessageTemplateEntity> filter = new LambdaQueryWrapper<>();
81 79 filter
82 80 .in(TkMessageTemplateEntity::getMessageConfigId, ids)
83   - .eq(TkMessageTemplateEntity::getTenantId, tenantId)
84   - .eq(TkMessageTemplateEntity::getStatus, StatusEnum.ENABLE.getIndex());
  81 + .eq(TkMessageTemplateEntity::getTenantId, tenantId);
85 82 List<TkMessageTemplateEntity> templates = templateMapper.selectList(filter);
86   - if(templates.size()>0){
87   - List<String> templateNames =templates.stream().map(t->t.getTemplateName()).collect(Collectors.toList());
88   - String errMsg = String.format(ErrorMessage.MESSAGE_TEMPLATE_USING_CONFIG.getMessage(), templateNames);
  83 + if (templates.size() > 0) {
  84 + List<String> templateNames =
  85 + templates.stream()
  86 + .map(TkMessageTemplateEntity::getTemplateName)
  87 + .collect(Collectors.toList());
  88 + String errMsg =
  89 + String.format(ErrorMessage.MESSAGE_TEMPLATE_USING_CONFIG.getMessage(), templateNames);
89 90 throw new TkDataValidationException(errMsg);
90 91 }
91 92 return baseMapper.deleteBatchIds(ids) > 0;
... ...