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

Merge branch 'feature/REQ-3045' into dev

Browse Source
This commit is contained in:
yanglin 2024-10-21 16:15:05 +08:00
commit 0c7b1d270e
2 changed files with 13 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -24,6 +24,7 @@ import cn.axzo.msg.center.service.pending.response.v3.model.ParsedKV;
import cn.axzo.msg.center.service.pending.response.v3.model.ParsedModelV3;
import cn.axzo.msg.center.service.pending.response.v3.model.PersonInfo;
import lombok.RequiredArgsConstructor;
import org.apache.commons.lang3.StringUtils;
import org.springframework.stereotype.Component;
import java.util.ArrayList;
@ -43,9 +44,6 @@ public class MessageTemplateParserV3 {
GeneralMessagePushVO parse(MessageRecordV3 message, TemplateModelV3 templateModel) {
String orgIcon = templateModel.getTemplate().getIcon();
Subtitle subtitle = new Subtitle();
subtitle.setIconUrl(orgIcon);
subtitle.setTitle(message.getSubtitle());
GeneralMessagePushVO im = new GeneralMessagePushVO();
im.setIdentityCode(message.getIdentityCode());
@ -53,9 +51,14 @@ public class MessageTemplateParserV3 {
im.setCardBannerUrl(orgIcon);
im.setCardTitle(message.getTitle());
im.setCardContent(message.getContent());
im.setSubtitles(Collections.singletonList(subtitle));
im.setBizCode(message.getBizCode());
im.setSendTimestamp(message.getCreateAt().getTime());
if (StringUtils.isNotBlank(message.getSubtitle())) {
Subtitle subtitle = new Subtitle();
subtitle.setIconUrl(orgIcon);
subtitle.setTitle(message.getSubtitle());
im.setSubtitles(Collections.singletonList(subtitle));
}
ParsedModelV3 parsedModel = modelV3Parser.parseModel(
templateModel, message, message.getBizExtParams(), message.getRouterParams());

10
inside-notices/src/main/java/cn/axzo/msg/center/message/service/impl/v3/ModelV3Parser.java
View File

@ -67,9 +67,9 @@ public class ModelV3Parser {
JSONObject bizParam,
JSONObject routerParam,
JSONObject appendRouterParam,
TerminalProvider terminalProvider) {
@Nullable TerminalProvider terminalProvider) {
ParsedModelV3 parsedModel = new ParsedModelV3();
parsedModel.setTemplate(BeanMapper.copyBean(templateModel, ParsedTemplateV3.class));
parsedModel.setTemplate(BeanMapper.copyBean(templateModel.getTemplate(), ParsedTemplateV3.class));
parsedModel.setGroups(copyGroups(templateModel.getGroups()));
parsedModel.setButtons(BeanMapper.copyList(templateModel.getButtons(), ParsedButtonV3.class));
UrlParser urlParser = new UrlParser(entity, routerParam, appendRouterParam);
@ -136,8 +136,10 @@ public class ModelV3Parser {
private UrlInfoForRequest parseUrlInfoForRequest(UrlConfig urlConfig) {
UrlInfoForRequest urlInfo = new UrlInfoForRequest();
urlInfo.setHasAppUrl(hasAppUrl(urlConfig));
urlInfo.setCurrentTerminalCms(
terminalProvider.getAppTerminalType() == AppTerminalTypeEnum.CMS_WEB_PC);
if (terminalProvider != null) {
urlInfo.setCurrentTerminalCms(
terminalProvider.getAppTerminalType() == AppTerminalTypeEnum.CMS_WEB_PC);
}
urlSelector.select(urlConfig).ifPresent(terminalUrl -> {
urlInfo.setUrl(terminalUrl.getUrl().getUrl());
if (terminalUrl.getUrl() instanceof WebUrl)