From faba223f4c0530bf25ef28c6d456f46cad9f8d70 Mon Sep 17 00:00:00 2001 From: luofu Date: Sat, 18 Nov 2023 09:53:54 +0800 Subject: [PATCH 1/2] =?UTF-8?q?feat(REQ-1507):=20=E5=A4=84=E7=90=86?= =?UTF-8?q?=E5=8F=98=E6=9B=B4=E6=A8=A1=E6=9D=BF=E5=88=86=E7=B1=BB=E5=85=B3?= =?UTF-8?q?=E8=81=94=E5=85=B3=E7=B3=BB=E7=9A=84BUG?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit 背景： https://jira.axzo.cn/browse/REQ-1507?goToView=1 影响： 无 --- .../impl/MessageTemplateNewServiceImpl.java | 14 ++++++-------- .../impl/MessageTemplateRouterServiceImpl.java | 4 ++-- 2 files changed, 8 insertions(+), 10 deletions(-) diff --git a/inside-notices/src/main/java/cn/axzo/msg/center/message/service/impl/MessageTemplateNewServiceImpl.java b/inside-notices/src/main/java/cn/axzo/msg/center/message/service/impl/MessageTemplateNewServiceImpl.java index fc2a1034..126cb240 100644 --- a/inside-notices/src/main/java/cn/axzo/msg/center/message/service/impl/MessageTemplateNewServiceImpl.java +++ b/inside-notices/src/main/java/cn/axzo/msg/center/message/service/impl/MessageTemplateNewServiceImpl.java @@ -313,20 +313,18 @@ public class MessageTemplateNewServiceImpl implements MessageTemplateNewService .set(MessageBaseTemplate::getUpdaterId, param.getOperatorId()) .set(StringUtils.isNotBlank(param.getTemplateName()), MessageBaseTemplate::getName, param.getTemplateName()) - .set(CollectionUtils.isNotEmpty(param.getPushTerminals()), MessageBaseTemplate::getPushTerminal, - JSON.toJSONString(param.getPushTerminals())) + .set(MessageBaseTemplate::getPushTerminal, JSON.toJSONString(param.getPushTerminals())) .set(StringUtils.isNotBlank(param.getTitle()), MessageBaseTemplate::getTitle, param.getTitle()) - .set(CollectionUtils.isNotEmpty(param.getMsgCardContentItems()), MessageBaseTemplate::getCardContent, - JSONObjectUtil.toJSONString(param.getMsgCardContentItems())) - .set(StringUtils.isNotBlank(param.getContent()), MessageBaseTemplate::getContent, param.getContent()) - .set(StringUtils.isNotBlank(param.getIcon()), MessageBaseTemplate::getIcon, param.getIcon()) - .set(StringUtils.isNotBlank(param.getMinAppVersion()), MessageBaseTemplate::getMinAppVersion, - param.getMinAppVersion()) + .set(MessageBaseTemplate::getCardContent, JSONObjectUtil.toJSONString(param.getMsgCardContentItems())) + .set(MessageBaseTemplate::getContent, param.getContent()) + .set(MessageBaseTemplate::getIcon, param.getIcon()) + .set(MessageBaseTemplate::getMinAppVersion, param.getMinAppVersion()) .update(); } private void updateTemplateGroupRelation(MessageTemplateSaveOrUpdateParam param) { if (CollectionUtils.isEmpty(param.getLeafGroupNodes())) { + messageTemplateGroupService.deleteTemplateGroup(param.getTemplateCode()); return; } messageTemplateGroupService.updateTemplateGroup(param.getTemplateCode(), param.getLeafGroupNodes()); diff --git a/inside-notices/src/main/java/cn/axzo/msg/center/message/service/impl/MessageTemplateRouterServiceImpl.java b/inside-notices/src/main/java/cn/axzo/msg/center/message/service/impl/MessageTemplateRouterServiceImpl.java index d8735e86..8bcb597d 100644 --- a/inside-notices/src/main/java/cn/axzo/msg/center/message/service/impl/MessageTemplateRouterServiceImpl.java +++ b/inside-notices/src/main/java/cn/axzo/msg/center/message/service/impl/MessageTemplateRouterServiceImpl.java @@ -67,8 +67,8 @@ public class MessageTemplateRouterServiceImpl implements MessageTemplateRouterSe @Override @Transactional(rollbackFor = Exception.class) public void saveOrUpdate(MessageTemplateRouterDTO router, boolean isUpdate) { - if (Objects.isNull(router) || router.isInValid()) { - log.info("invalid message template router. router:{}", router); + if (Objects.isNull(router)) { + log.info("invalid message template router."); return; } if (isUpdate) { From fbcdaf1896080af87003c6bfb2c0955d94656306 Mon Sep 17 00:00:00 2001 From: luofu Date: Sat, 18 Nov 2023 09:55:27 +0800 Subject: [PATCH 2/2] =?UTF-8?q?feat(REQ-1507):=20=E5=A4=84=E7=90=86?= =?UTF-8?q?=E5=8F=98=E6=9B=B4=E6=A8=A1=E6=9D=BF=E5=88=86=E7=B1=BB=E5=85=B3?= =?UTF-8?q?=E8=81=94=E5=85=B3=E7=B3=BB=E7=9A=84BUG?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit 背景： https://jira.axzo.cn/browse/REQ-1507?goToView=1 影响： 无 --- .../service/impl/MessageTemplateRouterServiceImpl.java | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/inside-notices/src/main/java/cn/axzo/msg/center/message/service/impl/MessageTemplateRouterServiceImpl.java b/inside-notices/src/main/java/cn/axzo/msg/center/message/service/impl/MessageTemplateRouterServiceImpl.java index 8bcb597d..fdec02b1 100644 --- a/inside-notices/src/main/java/cn/axzo/msg/center/message/service/impl/MessageTemplateRouterServiceImpl.java +++ b/inside-notices/src/main/java/cn/axzo/msg/center/message/service/impl/MessageTemplateRouterServiceImpl.java @@ -68,13 +68,17 @@ public class MessageTemplateRouterServiceImpl implements MessageTemplateRouterSe @Transactional(rollbackFor = Exception.class) public void saveOrUpdate(MessageTemplateRouterDTO router, boolean isUpdate) { if (Objects.isNull(router)) { - log.info("invalid message template router."); + log.info("template router is null."); return; } if (isUpdate) { // 更新的逻辑为删除旧的重新创建 remove(router.fetchTemplateCode().orElse(null)); } + if (!router.isValid()) { + log.info("invalid message template router."); + return; + } saveDetailRouter(router.getRouteDetail()); batchSaveButtonRouter(router.getRouteButtons()); }