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

REQ-3201: 引入业务状态

Browse Source
This commit is contained in:
yanglin 2024-12-13 11:13:40 +08:00
parent e3363a0cc1
commit 61df10e194
5 changed files with 6 additions and 6 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/card/CardParser.java
View File

@ -60,11 +60,11 @@ class CardParser {
CardStateInfo stateInfo = card.getStateInfo(); CardStateInfo stateInfo = card.getStateInfo();
if (cardTemplate.isUpdatable()) { if (cardTemplate.isUpdatable()) {
content.setCardState(stateInfo.getCardState()); content.setCardState(stateInfo.getCardState());
content.setBizState(stateInfo.getBizStateCode()); content.setBizState(stateInfo.getBizState());
} }
content.setStateImage(CardStateImageConfigs content.setStateImage(CardStateImageConfigs
.create(template.getStateImageConfigs()) .create(template.getStateImageConfigs())
.determineStateImage(stateInfo.getBizStateCode())); .determineStateImage(stateInfo.getBizState()));
if (StringUtils.isNotBlank(card.getSubtitle())) { if (StringUtils.isNotBlank(card.getSubtitle())) {
GeneralMessagePushVO.Subtitle subtitle = new GeneralMessagePushVO.Subtitle(); GeneralMessagePushVO.Subtitle subtitle = new GeneralMessagePushVO.Subtitle();
subtitle.setIconUrl(messageSystemConfig.getOrgIcon()); subtitle.setIconUrl(messageSystemConfig.getOrgIcon());

2
inside-notices/src/main/java/cn/axzo/msg/center/message/service/card/CardSupport.java
View File

@ -76,7 +76,7 @@ public class CardSupport {
card.setSubBizCode(sendModel.getRequest().getSubBizCode()); card.setSubBizCode(sendModel.getRequest().getSubBizCode());
card.setTemplateCode(sendModel.getRequest().getTemplateCode()); card.setTemplateCode(sendModel.getRequest().getTemplateCode());
CardStateInfo stateInfo = sendModel.getRequest().getStateInfo(); CardStateInfo stateInfo = sendModel.getRequest().getStateInfo();
card.setBizState(stateInfo.getBizStateCode()); card.setBizState(stateInfo.getBizState());
card.setCardState(stateInfo.getCardState()); card.setCardState(stateInfo.getCardState());
card.setTitle(sendModel.getTemplate().getTitle()); card.setTitle(sendModel.getTemplate().getTitle());
card.setContent(sendModel.getTemplate().getContent()); card.setContent(sendModel.getTemplate().getContent());

2
msg-center-api/src/main/java/cn/axzo/msg/center/service/pending/request/CardStateInfo.java
View File

@ -14,7 +14,7 @@ public class CardStateInfo {
/** /**
* 业务状态编辑 * 业务状态编辑
*/ */
private String bizStateCode; private String bizState;
/** /**
* 卡片状态 * 卡片状态

2
msg-center-dal/src/main/java/cn/axzo/msg/center/dal/CardDao.java
View File

@ -33,7 +33,7 @@ public class CardDao extends ServiceImpl<CardMapper, Card> {
.collect(Collectors.toList()); .collect(Collectors.toList());
lambdaUpdate() lambdaUpdate()
.in(Card::getId, cardIds) .in(Card::getId, cardIds)
.set(stateInfo.getBizStateCode() != null, Card::getBizState, stateInfo.getBizStateCode()) .set(stateInfo.getBizState() != null, Card::getBizState, stateInfo.getBizState())
.set(stateInfo.getCardState() != null, Card::getCardState, stateInfo.getCardState()) .set(stateInfo.getCardState() != null, Card::getCardState, stateInfo.getCardState())
.update(); .update();
} }

2
msg-center-domain/src/main/java/cn/axzo/msg/center/domain/entity/Card.java
View File

@ -177,7 +177,7 @@ public class Card extends BaseEntityExt<Card> implements CardContent {
@Override @Override
public CardStateInfo getStateInfo() { public CardStateInfo getStateInfo() {
CardStateInfo cardStateInfo = new CardStateInfo(); CardStateInfo cardStateInfo = new CardStateInfo();
cardStateInfo.setBizStateCode(bizState); cardStateInfo.setBizState(bizState);
cardStateInfo.setCardState(cardState); cardStateInfo.setCardState(cardState);
return cardStateInfo; return cardStateInfo;
} }