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

Merge remote-tracking branch 'origin/feature/REQ-3201' into feature/REQ-3201

Browse Source
This commit is contained in:
yanglin 2024-12-16 10:56:08 +08:00
commit 1f6de32901
2 changed files with 3 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
inside-notices/src/main/java/cn/axzo/msg/center/message/domain/param/MessageTemplateV3SaveOrUpdateParam.java
View File

@ -288,6 +288,7 @@ public class MessageTemplateV3SaveOrUpdateParam implements Serializable {
.templateName(request.getTemplateName())
.detailStyleCode(request.getDetailStyleCode())
.operatorName(request.getOperatorName())
.msgCategory(detail.getSubCategory())
.updatePersonId(request.getOperatorId())
.updatePersonName(request.getOperatorName())
.createPersonId(detail.getCreatePersonId())

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

@ -386,7 +386,7 @@ public class MessageTemplateV3ServiceImpl implements MessageTemplateV3Service {
.eq(MessageTemplateV3::getIsDelete, TableIsDeleteEnum.NORMAL.value)
.set(StringUtils.isNotBlank(param.getTemplateName()),
MessageTemplateV3::getName, param.getTemplateName())
.set(MessageTemplateV3::getPushTerminal, JSON.toJSONString(param.getPushTerminals()))
.set(CollectionUtils.isNotEmpty(param.getPushTerminals()), MessageTemplateV3::getPushTerminal, JSON.toJSONString(param.getPushTerminals()))
.set(StringUtils.isNotBlank(param.getTitle()), MessageTemplateV3::getTitle, param.getTitle())
// .set(MessageBaseTemplate::getCardContent, JSONObjectUtil.toJSONString(param.getMsgCardContentItems()))
.set(MessageTemplateV3::getContent, param.getContent())
@ -399,7 +399,7 @@ public class MessageTemplateV3ServiceImpl implements MessageTemplateV3Service {
.set(MessageTemplateV3::getUpdatePersonId, param.getOperatorId())
.set(MessageTemplateV3::getUpdatePersonName, param.getOperatorName())
.set(MessageTemplateV3::getIcon, param.getIcon())
.set(MessageTemplateV3::getMinAppVersion, param.getMinAppVersion())
.set(StringUtils.isNotBlank(param.getMinAppVersion()), MessageTemplateV3::getMinAppVersion, param.getMinAppVersion())
.set(Objects.nonNull(pushData), MessageTemplateV3::getPushData,
pushData == null ? null : pushData.toJSONString())
//推送终端/最低版本