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

Merge branch 'feature/REQ-1507' of axzsource.com:universal/infrastructure/backend/msg-center-plat into dev

Browse Source
This commit is contained in:
luofu 2023-11-07 14:53:35 +08:00
commit 2027c562bc
11 changed files with 126 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -94,7 +94,7 @@ public class MessageTemplateSaveOrUpdateParam implements Serializable {
public static MessageTemplateSaveOrUpdateParam from(MessageTemplateCreateRequest request) {
return MessageTemplateSaveOrUpdateParam.builder()
.templateName(request.getTemplateName())
.msgCategory(request.getCategory())
.msgCategory(request.getSubCategory())
.leafGroupNodes(request.getLeafGroupNodes())
.title(request.getMsgTitle())
.content(request.getMsgContent())

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

@ -408,7 +408,7 @@ public class MessageTemplateNewServiceImpl implements MessageTemplateNewService
response.setTemplateCode(record.getCode());
response.setTitle(record.getTitle());
response.setContent(record.getContent());
response.setCategory(record.getMsgCategory());
// response.setCategory(record.get);
response.setStatus(record.getStatus());
List<String> nodeNamePaths = groupNodePaths.getOrDefault(record.getCode(), Collections.emptyList()).stream()
.filter(codeNameMap::containsKey)
@ -431,7 +431,7 @@ public class MessageTemplateNewServiceImpl implements MessageTemplateNewService
record.getBizDetailShowStrategy(), routers).orElse(null);
return MessageTemplateDetailResponse.builder()
.templateName(record.getName())
.category(record.getMsgCategory())
// .category(record.getMsgCategory())
.leafGroupNodes(groupNodeCodes)
.pushTerminals(JSON.parseArray(record.getPushTerminal(), PushTerminalEnum.class))
.msgTitle(record.getTitle())

11
msg-center-api/src/main/java/cn/axzo/msg/center/service/dto/MessageRouterButtonDTO.java
View File

@ -1,6 +1,7 @@
package cn.axzo.msg.center.service.dto;
import cn.axzo.msg.center.service.enums.ButtonStyleEnum;
import cn.axzo.msg.center.service.enums.RouterButtonSourceEnum;
import cn.axzo.msg.center.service.enums.RouterCategoryEnum;
import com.alibaba.fastjson.JSON;
import lombok.AllArgsConstructor;
@ -29,6 +30,10 @@ public class MessageRouterButtonDTO implements Serializable {
private static final long serialVersionUID = -9083376003614521781L;
/**
* 按钮唯一标识
*/
private String identityCode;
/**
* 路由描述
*/
@ -40,6 +45,12 @@ public class MessageRouterButtonDTO implements Serializable {
* DETAIL: 页面详情
*/
private RouterCategoryEnum category;
/**
* 按钮来源
* SYSTEM: 系统
* CUSTOM: 自定义
*/
private RouterButtonSourceEnum source;
/**
* 按钮样式配置
* HIGH_LIGHT: 按钮高亮展示

29
msg-center-api/src/main/java/cn/axzo/msg/center/service/enums/BizFinalStateEnum.java Normal file
View File

@ -0,0 +1,29 @@
package cn.axzo.msg.center.service.enums;
/**
* @description
* 业务终态的状态枚举，包含审批流的相关状态
*
* @author cold_blade
* @date 2023/11/7
* @version 1.0
*/
public enum BizFinalStateEnum {
/**
* 已处理
*/
COMPLETED,
/**
* 已撤销
*/
RETRACT,
/**
* 已通过
*/
PASSED,
/**
* 已拒绝
*/
REJECTED;
}

24
msg-center-api/src/main/java/cn/axzo/msg/center/service/enums/RouterButtonSourceEnum.java Normal file
View File

@ -0,0 +1,24 @@
package cn.axzo.msg.center.service.enums;
import lombok.AccessLevel;
import lombok.AllArgsConstructor;
import lombok.Getter;
/**
* @author cold_blade
* @date 2023/11/7
* @version 1.0
*/
@Getter
@AllArgsConstructor(access = AccessLevel.PRIVATE)
public enum RouterButtonSourceEnum {
/**
* 系统
*/
SYSTEM,
/**
* 自定义
*/
CUSTOM;
}

14
msg-center-api/src/main/java/cn/axzo/msg/center/service/template/request/MessageTemplateCreateRequest.java
View File

@ -1,9 +1,10 @@
package cn.axzo.msg.center.service.template.request;
import cn.axzo.msg.center.service.dto.MessageCardContentItemDTO;
import cn.axzo.msg.center.service.dto.BizDetailShowStrategyDTO;
import cn.axzo.msg.center.service.dto.MessageCardContentItemDTO;
import cn.axzo.msg.center.service.dto.MessageRouterButtonDTO;
import cn.axzo.msg.center.service.enums.MessageCategoryEnum;
import cn.axzo.msg.center.service.enums.MessageGroupCategoryEnum;
import cn.axzo.msg.center.service.enums.PushTerminalEnum;
import com.alibaba.fastjson.JSON;
import lombok.Getter;
@ -40,12 +41,17 @@ public class MessageTemplateCreateRequest implements Serializable {
private String templateName;
/**
* 消息类型
* GENERAL_MESSAGE: 通知
* NOTIFICATION: 通知
* PENDING: 待办
*/
@NotNull(message = "category is required")
private MessageGroupCategoryEnum category;
/**
* 消息类型
* BIZ_PENDING_MESSAGE: 业务待办
* APPROVAL_PENDING_MESSAGE: 审批待办
*/
@NotNull(message = "category is required")
private MessageCategoryEnum category;
private MessageCategoryEnum subCategory;
/**
* 消息分类树的叶结点的结点编码列表
*/

10
msg-center-api/src/main/java/cn/axzo/msg/center/service/template/request/MessageTemplatePageRequest.java
View File

@ -2,6 +2,7 @@ package cn.axzo.msg.center.service.template.request;
import cn.axzo.basics.common.page.PageRequest;
import cn.axzo.msg.center.service.enums.MessageCategoryEnum;
import cn.axzo.msg.center.service.enums.MessageGroupCategoryEnum;
import cn.axzo.msg.center.service.enums.StatusEnum;
import com.alibaba.fastjson.JSON;
import lombok.Getter;
@ -30,11 +31,16 @@ public class MessageTemplatePageRequest extends PageRequest implements Serializa
private String templateCode;
/**
* 消息类型
* GENERAL_MESSAGE: 通知
* NOTIFICATION: 通知
* PENDING: 待办
*/
private MessageGroupCategoryEnum category;
/**
* 消息子类型
* BIZ_PENDING_MESSAGE: 业务待办
* APPROVAL_PENDING_MESSAGE: 审批待办
*/
private MessageCategoryEnum category;
private MessageCategoryEnum subCategory;
/**
* 分类树的结点编码
*/

12
msg-center-api/src/main/java/cn/axzo/msg/center/service/template/response/MessageTemplateDetailResponse.java
View File

@ -1,9 +1,10 @@
package cn.axzo.msg.center.service.template.response;
import cn.axzo.msg.center.service.dto.MessageCardContentItemDTO;
import cn.axzo.msg.center.service.dto.BizDetailShowStrategyDTO;
import cn.axzo.msg.center.service.dto.MessageCardContentItemDTO;
import cn.axzo.msg.center.service.dto.MessageRouterButtonDTO;
import cn.axzo.msg.center.service.enums.MessageCategoryEnum;
import cn.axzo.msg.center.service.enums.MessageGroupCategoryEnum;
import cn.axzo.msg.center.service.enums.PushTerminalEnum;
import com.alibaba.fastjson.JSON;
import lombok.AllArgsConstructor;
@ -35,11 +36,16 @@ public class MessageTemplateDetailResponse implements Serializable {
private String templateName;
/**
* 消息类型
* GENERAL_MESSAGE: 通知
* NOTIFICATION: 通知
* PENDING: 待办
*/
private MessageGroupCategoryEnum category;
/**
* 消息子类型
* BIZ_PENDING_MESSAGE: 业务待办
* APPROVAL_PENDING_MESSAGE: 审批待办
*/
private MessageCategoryEnum category;
private MessageCategoryEnum subCategory;
/**
* 消息分类树的叶结点的结点编码列表
*/

13
msg-center-api/src/main/java/cn/axzo/msg/center/service/template/response/MessageTemplateListResponse.java
View File

@ -1,6 +1,7 @@
package cn.axzo.msg.center.service.template.response;
import cn.axzo.msg.center.service.enums.MessageCategoryEnum;
import cn.axzo.msg.center.service.enums.MessageGroupCategoryEnum;
import cn.axzo.msg.center.service.enums.StatusEnum;
import com.alibaba.fastjson.JSON;
import lombok.Getter;
@ -30,10 +31,16 @@ public class MessageTemplateListResponse implements Serializable {
private String templateCode;
/**
* 消息类型
* GENERAL_MESSAGE: 普通消息
* PENDING_MESSAGE: 待办消息
* NOTIFICATION: 通知
* PENDING: 待办
*/
private MessageCategoryEnum category;
private MessageGroupCategoryEnum category;
/**
* 消息子类型
* BIZ_PENDING_MESSAGE: 业务待办
* APPROVAL_PENDING_MESSAGE: 审批待办
*/
private MessageCategoryEnum subCategory;
/**
* 消息标题
*/

10
msg-center-api/src/main/java/cn/axzo/msg/center/service/template/response/MessageTemplatePageResponse.java
View File

@ -1,6 +1,7 @@
package cn.axzo.msg.center.service.template.response;
import cn.axzo.msg.center.service.enums.MessageCategoryEnum;
import cn.axzo.msg.center.service.enums.MessageGroupCategoryEnum;
import cn.axzo.msg.center.service.enums.StatusEnum;
import com.alibaba.fastjson.JSON;
import lombok.Getter;
@ -30,11 +31,16 @@ public class MessageTemplatePageResponse implements Serializable {
private String templateCode;
/**
* 消息类型
* GENERAL_MESSAGE: 通知
* NOTIFICATION: 通知
* PENDING: 待办
*/
private MessageGroupCategoryEnum category;
/**
* 消息子类型
* BIZ_PENDING_MESSAGE: 业务待办
* APPROVAL_PENDING_MESSAGE: 审批待办
*/
private MessageCategoryEnum category;
private MessageCategoryEnum subCategory;
/**
* 消息标题
*/

14
msg-center-domain/src/main/java/cn/axzo/msg/center/domain/entity/PendingMessageRecord.java
View File

@ -2,6 +2,7 @@ package cn.axzo.msg.center.domain.entity;
import cn.axzo.msg.center.domain.persistence.BaseEntity;
import cn.axzo.msg.center.service.enums.BizCategoryEnum;
import cn.axzo.msg.center.service.enums.BizFinalStateEnum;
import cn.axzo.msg.center.service.enums.IdentityTypeEnum;
import cn.axzo.msg.center.service.enums.OrganizationTypeEnum;
import cn.axzo.msg.center.service.enums.PendingMessageStateEnum;
@ -11,6 +12,7 @@ import lombok.Getter;
import lombok.Setter;
import java.io.Serializable;
import java.util.Date;
/**
* @description
@ -30,6 +32,10 @@ public class PendingMessageRecord extends BaseEntity<PendingMessageRecord> imple
* 消息的唯一标识
*/
private String identityCode;
/**
* 请求批次号
*/
private String requestNo;
/**
* 发起者ID
*/
@ -106,6 +112,14 @@ public class PendingMessageRecord extends BaseEntity<PendingMessageRecord> imple
* 路由参数（留存）
*/
private String routerParams;
/**
* 业务终态，可为空
*/
private BizFinalStateEnum bizFinalState;
/**
* 待办的截止时间
*/
private Date deadline;
/**
* 重试次数
*/