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

Merge branch 'feature/REQ-1465' of axzsource.com:universal/infrastructure/backend/msg-center-plat into dev

Browse Source
This commit is contained in:
luofu 2023-10-27 17:02:52 +08:00
commit cb4e306884
1 changed files with 14 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
inside-notices/src/main/java/cn/axzo/msg/center/message/domain/vo/GeneralMessagePushVO.java
View File

@ -12,10 +12,12 @@ import lombok.Getter;
import lombok.NoArgsConstructor; import lombok.NoArgsConstructor;
import lombok.Setter; import lombok.Setter;
import org.apache.commons.collections.CollectionUtils; import org.apache.commons.collections.CollectionUtils;
import org.apache.commons.lang3.StringUtils;
import java.io.Serializable; import java.io.Serializable;
import java.util.Collections; import java.util.Collections;
import java.util.List; import java.util.List;
import java.util.Optional;
import java.util.stream.Collectors; import java.util.stream.Collectors;
/** /**
@ -95,13 +97,18 @@ public class GeneralMessagePushVO implements Serializable {
cardContentItems.stream() cardContentItems.stream()
.map(CardExtensionItem::from) .map(CardExtensionItem::from)
.collect(Collectors.toList()); .collect(Collectors.toList());
List<Subtitle> subtitles = Collections.emptyList();
Optional<Subtitle> subtitleOp = Subtitle.from(record, orgIcon);
if (subtitleOp.isPresent()) {
subtitles = Lists.newArrayList(subtitleOp.get());
}
return GeneralMessagePushVO.builder() return GeneralMessagePushVO.builder()
.identityCode(record.getIdentityCode()) .identityCode(record.getIdentityCode())
.templateCode(record.getTemplateCode()) .templateCode(record.getTemplateCode())
.cardBannerUrl(templateIcon) .cardBannerUrl(templateIcon)
.cardTitle(record.getTitle()) .cardTitle(record.getTitle())
.cardDetailButton(cardDetailButton) .cardDetailButton(cardDetailButton)
.subtitles(Lists.newArrayList(Subtitle.from(record, orgIcon))) .subtitles(subtitles)
.cardContent(record.getContent()) .cardContent(record.getContent())
.cardExtension(cardExtension) .cardExtension(cardExtension)
.cardButtons(cardButtons) .cardButtons(cardButtons)
@ -131,11 +138,14 @@ public class GeneralMessagePushVO implements Serializable {
*/ */
private String title; private String title;
static Subtitle from(GeneralMessageRecord record, String orgIcon) { static Optional<Subtitle> from(GeneralMessageRecord record, String orgIcon) {
return Subtitle.builder() if (StringUtils.isBlank(record.getOrgName())) {
return Optional.empty();
}
return Optional.of(Subtitle.builder()
.title(record.getOrgName()) .title(record.getOrgName())
.iconUrl(orgIcon) .iconUrl(orgIcon)
.build(); .build());
} }
@Override @Override