wangli/msg-center-plat
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

feat:(REQ-3045) 模版管理V3-详情按钮中增加identityCode

Browse Source
This commit is contained in:
xudawei 2024-10-11 11:51:22 +08:00
parent ce862772cd
commit 4561291926
3 changed files with 18 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
inside-notices/src/main/java/cn/axzo/msg/center/message/service/impl/MessageTemplateButtonV3ServiceImpl.java
View File

@ -14,6 +14,7 @@ import org.apache.commons.lang3.StringUtils;
import org.springframework.stereotype.Service; import org.springframework.stereotype.Service;
import java.util.List; import java.util.List;
import java.util.concurrent.atomic.AtomicInteger;
import java.util.stream.Collectors; import java.util.stream.Collectors;
/** /**
@ -34,10 +35,11 @@ public class MessageTemplateButtonV3ServiceImpl implements MessageTemplateButton
if (StringUtils.isBlank(messageTemplateCode) || CollectionUtils.isEmpty(buttonV3List)) { if (StringUtils.isBlank(messageTemplateCode) || CollectionUtils.isEmpty(buttonV3List)) {
return; return;
} }
AtomicInteger priority = new AtomicInteger(1);
List<MessageTemplateButtonV3> buttonV3s = buttonV3List.stream().map(item -> { List<MessageTemplateButtonV3> buttonV3s = buttonV3List.stream().map(item -> {
MessageTemplateButtonV3 buttonV3 = BeanUtil.copyProperties(item, MessageTemplateButtonV3.class); MessageTemplateButtonV3 buttonV3 = BeanUtil.copyProperties(item, MessageTemplateButtonV3.class);
buttonV3.setTemplateCode(messageTemplateCode); buttonV3.setTemplateCode(messageTemplateCode);
buttonV3.setPriority(priority.getAndIncrement());
return buttonV3; return buttonV3;
}).collect(Collectors.toList()); }).collect(Collectors.toList());
log.info("ButtonV3#saveTemplateButton,code:{},buttonV3s:{}",messageTemplateCode, JSON.toJSONString(buttonV3s)); log.info("ButtonV3#saveTemplateButton,code:{},buttonV3s:{}",messageTemplateCode, JSON.toJSONString(buttonV3s));

11
inside-notices/src/main/java/cn/axzo/msg/center/message/service/impl/MessageTemplateV3ServiceImpl.java
View File

@ -496,6 +496,15 @@ public class MessageTemplateV3ServiceImpl implements MessageTemplateV3Service {
cardJumpV3DTO = MessageTemplateCardJumpV3DTO.builder().cardUrlConfig(record.getCardUrlConfig()).cardUrlOpenStrategy(record.getCardUrlOpenStrategy()).build(); cardJumpV3DTO = MessageTemplateCardJumpV3DTO.builder().cardUrlConfig(record.getCardUrlConfig()).cardUrlOpenStrategy(record.getCardUrlOpenStrategy()).build();
} }
List<MessageTemplateButtonV3DTO> 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() return MessageTemplateV3DetailResponse.builder()
.templateCode(record.getCode()) .templateCode(record.getCode())
.templateName(record.getName()) .templateName(record.getName())
@ -507,7 +516,7 @@ public class MessageTemplateV3ServiceImpl implements MessageTemplateV3Service {
.msgTitle(record.getTitle()) .msgTitle(record.getTitle())
.msgContent(record.getContent()) .msgContent(record.getContent())
.groups(CollectionUtils.isNotEmpty(messageTemplateGroups) ? BeanUtil.copyToList(messageTemplateGroups, MessageTemplateGroupV3DTO.class) : Lists.newArrayList()) .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) .cardJump(cardJumpV3DTO)
.msgIcon(record.getIcon()) .msgIcon(record.getIcon())
.minAppVersion(record.getMinAppVersion()) .minAppVersion(record.getMinAppVersion())

5
msg-center-api/src/main/java/cn/axzo/msg/center/service/dto/MessageTemplateButtonV3DTO.java
View File

@ -84,6 +84,11 @@ public class MessageTemplateButtonV3DTO implements Serializable {
*/ */
private String name; private String name;
/**
* 标识
*/
private String identityCode;
/** /**
* <p>要改2处都要记得改 * <p>要改2处都要记得改
*/ */