diff --git a/msg-notices/msg-notices-service/src/main/java/cn/axzo/msg/center/notices/service/impl/PlatServiceImpl.java b/msg-notices/msg-notices-service/src/main/java/cn/axzo/msg/center/notices/service/impl/PlatServiceImpl.java index 6576179a..53ec52a5 100644 --- a/msg-notices/msg-notices-service/src/main/java/cn/axzo/msg/center/notices/service/impl/PlatServiceImpl.java +++ b/msg-notices/msg-notices-service/src/main/java/cn/axzo/msg/center/notices/service/impl/PlatServiceImpl.java @@ -49,16 +49,10 @@ public class PlatServiceImpl implements PlatService { @Override @Transactional(rollbackFor = Exception.class) public void createTemplate(CreateTemplateRequestDto request) { - // FIXME: 临时方案,将渠道信息放到remark中 String remark = request.getRemark(); ChannelHandlerEnum channel = parseChannel(remark); checkCreateTemplate(request, channel); - if (StringUtils.isNotBlank(remark)) { - // 恢复remark的原始值 - request.setRemark(PlaceholderResolver.getDefaultResolver().resolve(remark, "")); - } - insertMessageApp(request.getServiceName()); insertMessageTemplate(request); @@ -69,14 +63,9 @@ public class PlatServiceImpl implements PlatService { } private ChannelHandlerEnum parseChannel(String expStr) { - if (StringUtils.isBlank(expStr)) { - return ChannelHandlerEnum.ALI_YUN; - } - // FIXME:临时方案,后期有前端资源的时候需要改造接口的出入参 - return ChannelHandlerEnum.valueOf( - PlaceholderResolver.getDefaultResolver().resolveSequenceParamName(expStr).get(0) - ); + return ChannelHandlerEnum.ALI_YUN; } + /** * 插入app */ @@ -98,26 +87,26 @@ public class PlatServiceImpl implements PlatService { * 参数校验 */ private void checkCreateTemplate(CreateTemplateRequestDto request, ChannelHandlerEnum channel) { - if(request == null){ - throw new BizException(ReturnCodeEnum.FAIL,"参数不能为空"); + if (request == null) { + throw new BizException(ReturnCodeEnum.FAIL, "参数不能为空"); } - if(request.getServiceName() == null){ - throw new BizException(ReturnCodeEnum.FAIL,"服务名称不能为空"); + if (request.getServiceName() == null) { + throw new BizException(ReturnCodeEnum.FAIL, "服务名称不能为空"); } - if(request.getMessageTemplateType() == null){ - throw new BizException(ReturnCodeEnum.FAIL,"模板类型不能为空"); + if (request.getMessageTemplateType() == null) { + throw new BizException(ReturnCodeEnum.FAIL, "模板类型不能为空"); } - if(StringUtils.isBlank(request.getTemplateNo())){ - throw new BizException(ReturnCodeEnum.FAIL,"短信模板编码不能为空"); + if (StringUtils.isBlank(request.getTemplateNo())) { + throw new BizException(ReturnCodeEnum.FAIL, "短信模板编码不能为空"); } - if(StringUtils.isBlank(request.getTemplateAliNo())){ - throw new BizException(ReturnCodeEnum.FAIL,"阿里短信模板编码不能为空"); + if (StringUtils.isBlank(request.getTemplateAliNo())) { + throw new BizException(ReturnCodeEnum.FAIL, "阿里短信模板编码不能为空"); } - if(StringUtils.isBlank(request.getTitle())){ - throw new BizException(ReturnCodeEnum.FAIL,"标题不能为空"); + if (StringUtils.isBlank(request.getTitle())) { + throw new BizException(ReturnCodeEnum.FAIL, "标题不能为空"); } - if(StringUtils.isBlank(request.getTemplateContent())){ - throw new BizException(ReturnCodeEnum.FAIL,"模板内容不能为空"); + if (StringUtils.isBlank(request.getTemplateContent())) { + throw new BizException(ReturnCodeEnum.FAIL, "模板内容不能为空"); } // 判断短信编码是否存在 LambdaQueryWrapper queryWrapper = new LambdaQueryWrapper<>(); @@ -126,12 +115,12 @@ public class PlatServiceImpl implements PlatService { // 一个内部模板可以映射多个渠道商 queryWrapper.eq(MNSChannelMessageTemplate::getInnerTemplateNo, request.getTemplateNo()); List list = mnsChannelMessageTemplateMapper.selectList(queryWrapper); - if(CollectionUtils.isNotEmpty(list)){ + if (CollectionUtils.isNotEmpty(list)) { MNSChannelMessageTemplate channelMessageTemplate = list.get(0); String templateNo = channelMessageTemplate.getTemplateNo(); String innerTemplateNo = channelMessageTemplate.getInnerTemplateNo(); String templatNo = templateNo.equals(request.getTemplateAliNo()) ? templateNo : innerTemplateNo; - throw new BizException(ReturnCodeEnum.FAIL,"模板编码已存在:" + templatNo); + throw new BizException(ReturnCodeEnum.FAIL, "模板编码已存在:" + templatNo); } } @@ -261,8 +250,8 @@ public class PlatServiceImpl implements PlatService { @Override @Transactional(rollbackFor = Exception.class) public void delete(String templateNo) { - if(StringUtils.isBlank(templateNo)){ - throw new BizException(ReturnCodeEnum.FAIL,"短信模板编码不能为空"); + if (StringUtils.isBlank(templateNo)) { + throw new BizException(ReturnCodeEnum.FAIL, "短信模板编码不能为空"); } mnsMessageTemplateMapper.deleteByTemplateNo(templateNo);