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-16 19:41:32 +08:00
parent 1e1ab4348a
commit 056ad95a68
9 changed files with 26 additions and 20 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -1,6 +1,7 @@
package cn.axzo.msg.center.message.service.card; package cn.axzo.msg.center.message.service.card;
import cn.axzo.msg.center.service.domain.card.StateImageConfig; import cn.axzo.msg.center.service.domain.card.StateImageConfig;
import cn.axzo.msg.center.service.enums.CardBizState;
import lombok.AccessLevel; import lombok.AccessLevel;
import lombok.RequiredArgsConstructor; import lombok.RequiredArgsConstructor;
@ -18,11 +19,11 @@ public class CardStateImageConfigs {
return new CardStateImageConfigs(images); return new CardStateImageConfigs(images);
} }
public String determineStateImage(String bizStateCode) { public String determineStateImage(CardBizState bizState) {
if (configs == null) return ""; if (configs == null) return "";
return configs.stream() return configs.stream()
.filter(StateImageConfig::isEnabled) .filter(StateImageConfig::isEnabled)
.filter(cfg -> cfg.getStateCode().equals(bizStateCode)) .filter(cfg -> cfg.determineBizState().equals(bizState))
.findFirst() .findFirst()
.map(StateImageConfig::determineImageUrl) .map(StateImageConfig::determineImageUrl)
.orElse(null); .orElse(null);

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

@ -197,7 +197,7 @@ public class CardSupport {
info.setReceiverOuId(card.getReceiverOuId()); info.setReceiverOuId(card.getReceiverOuId());
info.setReceiverWorkspaceId(card.getReceiverWorkspaceId()); info.setReceiverWorkspaceId(card.getReceiverWorkspaceId());
info.setReceiverAppType(card.getReceiverAppType()); info.setReceiverAppType(card.getReceiverAppType());
info.setState(card.getBizState()); info.setBizState(card.getBizState());
info.setImTaskId(card.getImTaskId()); info.setImTaskId(card.getImTaskId());
info.setTemplateCode(card.getTemplateCode()); info.setTemplateCode(card.getTemplateCode());
return info; return info;

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

@ -30,7 +30,6 @@ import cn.axzo.msg.center.service.dto.MessageCardContentItemDTO;
import cn.axzo.msg.center.service.dto.MessageTemplateButtonV3DTO; import cn.axzo.msg.center.service.dto.MessageTemplateButtonV3DTO;
import cn.axzo.msg.center.service.dto.MessageTemplateCardJumpV3DTO; import cn.axzo.msg.center.service.dto.MessageTemplateCardJumpV3DTO;
import cn.axzo.msg.center.service.dto.StateImageConfigDTO; import cn.axzo.msg.center.service.dto.StateImageConfigDTO;
import cn.axzo.msg.center.service.enums.CardBizState;
import cn.axzo.msg.center.service.enums.MessageCategoryEnum; import cn.axzo.msg.center.service.enums.MessageCategoryEnum;
import cn.axzo.msg.center.service.enums.PushTerminalEnum; import cn.axzo.msg.center.service.enums.PushTerminalEnum;
import cn.axzo.msg.center.service.enums.StatusEnum; import cn.axzo.msg.center.service.enums.StatusEnum;
@ -588,8 +587,8 @@ public class MessageTemplateV3ServiceImpl implements MessageTemplateV3Service {
} }
return record.getStateImageConfigs().stream().map(item -> StateImageConfigDTO.builder() return record.getStateImageConfigs().stream().map(item -> StateImageConfigDTO.builder()
.stateCode(item.getStateCode()) .stateCode(item.determineBizState().getCode())
.description(Objects.nonNull(CardBizState.getByCode(item.getStateCode())) ? CardBizState.getByCode(item.getStateCode()).getDescription() : "") .description(item.determineBizState().getDescription())
.enabled(item.isEnabled()) .enabled(item.isEnabled())
.imageUrl(item.getImageUrl()) .imageUrl(item.getImageUrl())
.build()).collect(Collectors.toList()); .build()).collect(Collectors.toList());

14
inside-notices/src/main/java/cn/axzo/msg/center/message/service/todo/TodoWithCardWrapper.java
View File

@ -97,7 +97,7 @@ public class TodoWithCardWrapper {
* 卡片更新状态-完成 * 卡片更新状态-完成
*/ */
public void cardCompleteStateByTodoList(List<Todo> todoList) { public void cardCompleteStateByTodoList(List<Todo> todoList) {
this.cardUpdateStateByTodoList(todoList,CardBizState.END.getCode(), CardState.COMPLETED); this.cardUpdateStateByTodoList(todoList,CardBizState.END, CardState.COMPLETED);
} }
/** /**
@ -105,27 +105,27 @@ public class TodoWithCardWrapper {
* 暂时不需要 * 暂时不需要
*/ */
public void cardRollbackStateByTodoList(List<Todo> todoList) { public void cardRollbackStateByTodoList(List<Todo> todoList) {
this.cardUpdateStateByTodoList(todoList, CardBizState.ABORTED.getCode(), CardState.CREATED); this.cardUpdateStateByTodoList(todoList, CardBizState.ABORTED, CardState.CREATED);
} }
/** /**
* 卡片更新状态-撤销 * 卡片更新状态-撤销
*/ */
public void cardRevokeStateByTodoList(List<Todo> todoList) { public void cardRevokeStateByTodoList(List<Todo> todoList) {
this.cardUpdateStateByTodoList(todoList, CardBizState.REVOKED.getCode(), CardState.CREATED); this.cardUpdateStateByTodoList(todoList, CardBizState.REVOKED, CardState.CREATED);
} }
/** /**
* 卡片更新状态-执行中 * 卡片更新状态-执行中
*/ */
public void cardProcessingStateByTodoList(List<Todo> todoList) { public void cardProcessingStateByTodoList(List<Todo> todoList) {
this.cardUpdateStateByTodoList(todoList, CardBizState.PENDING.getCode(), CardState.CREATED); this.cardUpdateStateByTodoList(todoList, CardBizState.PENDING, CardState.CREATED);
} }
/** /**
* 卡片更新完成状态 * 卡片更新完成状态
*/ */
private void cardUpdateStateByTodoList(List<Todo> todoList, String bizState, CardState cardState) { private void cardUpdateStateByTodoList(List<Todo> todoList, CardBizState bizState, CardState cardState) {
log.info("TodoWithCardWrapper#cardUpdateStateByTodoList start,todoList:{},bizState:{},cardState:{}", JSON.toJSONString(todoList), bizState, cardState); log.info("TodoWithCardWrapper#cardUpdateStateByTodoList start,todoList:{},bizState:{},cardState:{}", JSON.toJSONString(todoList), bizState, cardState);
try { try {
//1 构建对象 //1 构建对象
@ -142,7 +142,7 @@ public class TodoWithCardWrapper {
/** /**
* 构建卡片完成状态 * 构建卡片完成状态
*/ */
private List<CardUpdateStateRequest> buildCardStateByTodoList(List<Todo> todoList, String bizState, CardState cardState) { private List<CardUpdateStateRequest> buildCardStateByTodoList(List<Todo> todoList, CardBizState bizState, CardState cardState) {
if (CollectionUtils.isNotEmpty(todoList)) { if (CollectionUtils.isNotEmpty(todoList)) {
return Lists.newArrayList(); return Lists.newArrayList();
} }
@ -184,7 +184,7 @@ public class TodoWithCardWrapper {
if (StringUtils.isNotBlank(param.getRouterParams())) { if (StringUtils.isNotBlank(param.getRouterParams())) {
sendRequest.setRouterParam(JSON.parseObject(param.getRouterParams())); sendRequest.setRouterParam(JSON.parseObject(param.getRouterParams()));
} }
sendRequest.setStateInfo(CardStateInfo.buildCardStateInfo(CardBizState.PENDING.getCode(), CardState.CREATED)); sendRequest.setStateInfo(CardStateInfo.buildCardStateInfo(CardBizState.PENDING, CardState.CREATED));
sendRequest.setIdempotentCode(new IdBuilder(false) sendRequest.setIdempotentCode(new IdBuilder(false)
.append(param.getBizCode()) .append(param.getBizCode())

5
msg-center-api/src/main/java/cn/axzo/msg/center/service/domain/card/StateImageConfig.java
View File

@ -30,8 +30,11 @@ public class StateImageConfig {
public String determineImageUrl() { public String determineImageUrl() {
if (StringUtils.isNotBlank(imageUrl)) return imageUrl; if (StringUtils.isNotBlank(imageUrl)) return imageUrl;
CardBizState state = CodeDefinition.findByCode(CardBizState.class, stateCode).orElse(null); CardBizState state = determineBizState();
return state == null ? null : state.getDefaultImageUrl(); return state == null ? null : state.getDefaultImageUrl();
} }
public CardBizState determineBizState() {
return CodeDefinition.findByCode(CardBizState.class, stateCode).orElse(null);
}
} }

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

@ -13,9 +13,9 @@ import lombok.Setter;
public class CardStateInfo { public class CardStateInfo {
/** /**
* 业务状态编辑. 可参考 {@link CardBizState#getCode()} * 业务状态编辑
*/ */
private String bizState; private CardBizState bizState;
/** /**
* 卡片状态 * 卡片状态
@ -25,7 +25,7 @@ public class CardStateInfo {
/** /**
* 构建对象 * 构建对象
*/ */
public static CardStateInfo buildCardStateInfo(String bizStateCode, CardState cardState) { public static CardStateInfo buildCardStateInfo(CardBizState bizStateCode, CardState cardState) {
CardStateInfo cardStateInfo = new CardStateInfo(); CardStateInfo cardStateInfo = new CardStateInfo();
cardStateInfo.setBizState(bizStateCode); cardStateInfo.setBizState(bizStateCode);
cardStateInfo.setCardState(cardState); cardStateInfo.setCardState(cardState);

3
msg-center-api/src/main/java/cn/axzo/msg/center/service/pending/response/CardInfo.java
View File

@ -1,6 +1,7 @@
package cn.axzo.msg.center.service.pending.response; package cn.axzo.msg.center.service.pending.response;
import cn.axzo.im.center.common.enums.AppTypeEnum; import cn.axzo.im.center.common.enums.AppTypeEnum;
import cn.axzo.msg.center.service.enums.CardBizState;
import lombok.Getter; import lombok.Getter;
import lombok.Setter; import lombok.Setter;
@ -17,7 +18,7 @@ public class CardInfo {
private Long receiverOuId; private Long receiverOuId;
private Long receiverWorkspaceId; private Long receiverWorkspaceId;
private AppTypeEnum receiverAppType; private AppTypeEnum receiverAppType;
private String state; private CardBizState bizState;
private Long imTaskId; private Long imTaskId;
private String templateCode; private String templateCode;
} }

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

@ -5,6 +5,7 @@ import cn.axzo.im.center.common.enums.AppTypeEnum;
import cn.axzo.im.center.common.enums.YesOrNo; import cn.axzo.im.center.common.enums.YesOrNo;
import cn.axzo.msg.center.domain.persistence.BaseEntityExt; import cn.axzo.msg.center.domain.persistence.BaseEntityExt;
import cn.axzo.msg.center.domain.utils.IgnorePropsJsonTypeHandler; import cn.axzo.msg.center.domain.utils.IgnorePropsJsonTypeHandler;
import cn.axzo.msg.center.service.enums.CardBizState;
import cn.axzo.msg.center.service.enums.CardState; import cn.axzo.msg.center.service.enums.CardState;
import cn.axzo.msg.center.service.pending.card.domain.CardButtonState; import cn.axzo.msg.center.service.pending.card.domain.CardButtonState;
import cn.axzo.msg.center.service.pending.card.domain.CardButtonStates; import cn.axzo.msg.center.service.pending.card.domain.CardButtonStates;
@ -72,7 +73,7 @@ public class Card extends BaseEntityExt<Card> implements CardContent {
/** /**
* 业务状态 * 业务状态
*/ */
private String bizState; private CardBizState bizState;
/** /**
* 卡片状态 * 卡片状态

3
msg-center-domain/src/main/java/cn/axzo/msg/center/domain/entity/CardLog.java
View File

@ -3,6 +3,7 @@ package cn.axzo.msg.center.domain.entity;
import cn.axzo.im.center.common.enums.AppTypeEnum; import cn.axzo.im.center.common.enums.AppTypeEnum;
import cn.axzo.msg.center.domain.persistence.BaseEntityExt; import cn.axzo.msg.center.domain.persistence.BaseEntityExt;
import cn.axzo.msg.center.domain.utils.IgnorePropsJsonTypeHandler; import cn.axzo.msg.center.domain.utils.IgnorePropsJsonTypeHandler;
import cn.axzo.msg.center.service.enums.CardBizState;
import cn.axzo.msg.center.service.enums.CardState; import cn.axzo.msg.center.service.enums.CardState;
import com.alibaba.fastjson.JSONObject; import com.alibaba.fastjson.JSONObject;
import com.baomidou.mybatisplus.annotation.TableField; import com.baomidou.mybatisplus.annotation.TableField;
@ -93,7 +94,7 @@ public class CardLog extends BaseEntityExt<CardLog> {
/** /**
* 业务状态 * 业务状态
*/ */
private String bizState; private CardBizState bizState;
/** /**
* 上下文 * 上下文