From 45612919267989c65a22e90eb519f9e8837f41f9 Mon Sep 17 00:00:00 2001 From: xudawei Date: Fri, 11 Oct 2024 11:51:22 +0800 Subject: [PATCH] =?UTF-8?q?feat:(REQ-3045)=20=E6=A8=A1=E7=89=88=E7=AE=A1?= =?UTF-8?q?=E7=90=86V3-=E8=AF=A6=E6=83=85=E6=8C=89=E9=92=AE=E4=B8=AD?= =?UTF-8?q?=E5=A2=9E=E5=8A=A0identityCode?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../impl/MessageTemplateButtonV3ServiceImpl.java | 4 +++- .../service/impl/MessageTemplateV3ServiceImpl.java | 11 ++++++++++- .../service/dto/MessageTemplateButtonV3DTO.java | 5 +++++ 3 files changed, 18 insertions(+), 2 deletions(-) diff --git a/inside-notices/src/main/java/cn/axzo/msg/center/message/service/impl/MessageTemplateButtonV3ServiceImpl.java b/inside-notices/src/main/java/cn/axzo/msg/center/message/service/impl/MessageTemplateButtonV3ServiceImpl.java index 843964d4..07dbee07 100644 --- a/inside-notices/src/main/java/cn/axzo/msg/center/message/service/impl/MessageTemplateButtonV3ServiceImpl.java +++ b/inside-notices/src/main/java/cn/axzo/msg/center/message/service/impl/MessageTemplateButtonV3ServiceImpl.java @@ -14,6 +14,7 @@ import org.apache.commons.lang3.StringUtils; import org.springframework.stereotype.Service; import java.util.List; +import java.util.concurrent.atomic.AtomicInteger; import java.util.stream.Collectors; /** @@ -34,10 +35,11 @@ public class MessageTemplateButtonV3ServiceImpl implements MessageTemplateButton if (StringUtils.isBlank(messageTemplateCode) || CollectionUtils.isEmpty(buttonV3List)) { return; } - + AtomicInteger priority = new AtomicInteger(1); List buttonV3s = buttonV3List.stream().map(item -> { MessageTemplateButtonV3 buttonV3 = BeanUtil.copyProperties(item, MessageTemplateButtonV3.class); buttonV3.setTemplateCode(messageTemplateCode); + buttonV3.setPriority(priority.getAndIncrement()); return buttonV3; }).collect(Collectors.toList()); log.info("ButtonV3#saveTemplateButton,code:{},buttonV3s:{}",messageTemplateCode, JSON.toJSONString(buttonV3s)); diff --git a/inside-notices/src/main/java/cn/axzo/msg/center/message/service/impl/MessageTemplateV3ServiceImpl.java b/inside-notices/src/main/java/cn/axzo/msg/center/message/service/impl/MessageTemplateV3ServiceImpl.java index c9ea693c..9d2e2d72 100644 --- a/inside-notices/src/main/java/cn/axzo/msg/center/message/service/impl/MessageTemplateV3ServiceImpl.java +++ b/inside-notices/src/main/java/cn/axzo/msg/center/message/service/impl/MessageTemplateV3ServiceImpl.java @@ -496,6 +496,15 @@ public class MessageTemplateV3ServiceImpl implements MessageTemplateV3Service { cardJumpV3DTO = MessageTemplateCardJumpV3DTO.builder().cardUrlConfig(record.getCardUrlConfig()).cardUrlOpenStrategy(record.getCardUrlOpenStrategy()).build(); } + List buttons = Lists.newArrayList(); + if (CollectionUtils.isNotEmpty(buttonV3List)) { + buttons = buttonV3List.stream().map(item -> { + MessageTemplateButtonV3DTO messageTemplateButtonV3DTO = BeanUtil.copyProperties(item, MessageTemplateButtonV3DTO.class); + messageTemplateButtonV3DTO.setIdentityCode(item.getTemplateCode() + item.getId()); + return messageTemplateButtonV3DTO; + }).collect(Collectors.toList()); + } + return MessageTemplateV3DetailResponse.builder() .templateCode(record.getCode()) .templateName(record.getName()) @@ -507,7 +516,7 @@ public class MessageTemplateV3ServiceImpl implements MessageTemplateV3Service { .msgTitle(record.getTitle()) .msgContent(record.getContent()) .groups(CollectionUtils.isNotEmpty(messageTemplateGroups) ? BeanUtil.copyToList(messageTemplateGroups, MessageTemplateGroupV3DTO.class) : Lists.newArrayList()) - .buttons(CollectionUtils.isNotEmpty(buttonV3List) ? BeanUtil.copyToList(buttonV3List, MessageTemplateButtonV3DTO.class) : Lists.newArrayList()) + .buttons(buttons) .cardJump(cardJumpV3DTO) .msgIcon(record.getIcon()) .minAppVersion(record.getMinAppVersion()) diff --git a/msg-center-api/src/main/java/cn/axzo/msg/center/service/dto/MessageTemplateButtonV3DTO.java b/msg-center-api/src/main/java/cn/axzo/msg/center/service/dto/MessageTemplateButtonV3DTO.java index 99c050f8..3dff7b84 100644 --- a/msg-center-api/src/main/java/cn/axzo/msg/center/service/dto/MessageTemplateButtonV3DTO.java +++ b/msg-center-api/src/main/java/cn/axzo/msg/center/service/dto/MessageTemplateButtonV3DTO.java @@ -84,6 +84,11 @@ public class MessageTemplateButtonV3DTO implements Serializable { */ private String name; + /** + * 标识 + */ + private String identityCode; + /** *

要改2处都要记得改 */