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

REQ-2010: 返回模版类型, 处理按钮可见性问题

Browse Source
This commit is contained in:
yanglin 2024-03-01 10:21:20 +08:00
parent 8c7a1cc3b9
commit ba37de1a12
5 changed files with 28 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
inside-notices/src/main/java/cn/axzo/msg/center/message/domain/dto/PendingMessageDTO.java
View File

@ -130,6 +130,11 @@ public class PendingMessageDTO implements Serializable {
*/
private Date hideUntil;
/**
* 模版类型
*/
private MessageCategoryEnum templateCategory;
public static PendingMessageDTO from(PendingMessageRecord pendingMessageRecord) {
// 代办发起者信息
PersonDTO promoter = PersonDTO.builder()
@ -179,6 +184,7 @@ public class PendingMessageDTO implements Serializable {
public PendingMessageResponse toResponse(TerminalTypeEnum terminalType) {
return PendingMessageResponse.builder()
.templateCategory(templateCategory)
.identityCode(this.identityCode)
.templateCode(this.templateCode)
.title(this.title)

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

@ -119,6 +119,7 @@ import java.util.Map;
import java.util.Objects;
import java.util.Optional;
import java.util.Set;
import java.util.function.Function;
import java.util.function.Supplier;
import java.util.stream.Collectors;
@ -721,6 +722,12 @@ public class PendingMessageNewServiceImpl implements PendingMessageNewService {
private PendingMessageDTO convert(PendingMessageRecord pendingMessageRecord, List<MessageTemplateDTO> messageTemplates) {
PendingMessageDTO pendingMessage = PendingMessageDTO.from(pendingMessageRecord);
Map<String, MessageTemplateDTO> templateCode2Template = messageTemplates.stream()
.collect(toMap(MessageTemplateDTO::getCode, identity()));
MessageTemplateDTO template = templateCode2Template.get(pendingMessageRecord.getTemplateCode());
if (template != null) {
pendingMessage.setTemplateCategory(template.getMsgCategory());
}
// 对应模板的路由策略
MessageTemplateRouterDTO msgTemplateRouter = messageTemplates.stream()
.filter(e -> Objects.equals(e.getCode(), pendingMessageRecord.getTemplateCode()))

4
msg-center-api/src/main/java/cn/axzo/msg/center/api/response/MessageNewRes.java
View File

@ -77,6 +77,10 @@ public class MessageNewRes {
*/
private String router;
public void setRouter(String router) {
this.router = router;
}
/**
* 路由参数 JsonString
*/

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

@ -5,6 +5,7 @@ import cn.axzo.msg.center.service.dto.DetailRouterDTO;
import cn.axzo.msg.center.service.dto.IdentityDTO;
import cn.axzo.msg.center.service.dto.MessageCardContentItemDTO;
import cn.axzo.msg.center.service.enums.BizCategoryEnum;
import cn.axzo.msg.center.service.enums.MessageCategoryEnum;
import cn.axzo.msg.center.service.enums.PendingMessageStateEnum;
import com.alibaba.fastjson.JSON;
import lombok.*;
@ -138,6 +139,11 @@ public class PendingMessageResponse implements Serializable {
*/
private Date hideUntil;
/**
* 模版类型
*/
private MessageCategoryEnum templateCategory;
@Override
public String toString() {
return JSON.toJSONString(this);

5
msg-center-domain/src/main/java/cn/axzo/msg/center/domain/entity/MessageRecord.java
View File

@ -79,6 +79,11 @@ public class MessageRecord extends BaseEntity<MessageRecord> {
* 路由参数（留存）
*/
private String routerParams;
public String getRouterParams() {
return routerParams;
}
/**
* JSON 格式扩展信息
*/