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

Merge branch 'feature/REQ-1507' into dev

Browse Source
This commit is contained in:
陈维伟 2023-11-10 16:51:47 +08:00
commit ed45849a45
4 changed files with 14 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -45,17 +45,17 @@ public class PendingMessagePushParam implements Serializable {
*/
private String templateCode;
/**
* 消息所属组织类型
* 消息所属项目部类型
*/
private OrganizationTypeEnum orgType;
/**
* 消息所属组织Id
* 消息所属项目部Id
*/
private Long orgId;
private Long workspaceId;
/**
* 消息所属组织名称
* 消息所属项目部名称
*/
private String orgName;
private String workspaceName;
/**
* 业务类型
*/

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

@ -263,8 +263,8 @@ public class PendingMessageNewServiceImpl implements PendingMessageNewService {
buildTemplateInfo(record, msgTemplate, param.getRouterParams());
// 构建代办所属企业/项目等相关信息
record.setOrgType(Objects.isNull(param.getOrgType()) ? OrganizationTypeEnum.UNKNOWN : param.getOrgType());
record.setOrgId(param.getOrgId());
record.setOrgName(param.getOrgName());
record.setOrgId(param.getWorkspaceId());
record.setOrgName(param.getWorkspaceName());
// 构建业务类信息
buildBusinessInfo(record, param);
return record;

4
msg-center-api/src/main/java/cn/axzo/msg/center/service/enums/OrganizationTypeEnum.java
View File

@ -14,8 +14,8 @@ import lombok.Getter;
@Getter
@AllArgsConstructor(access = AccessLevel.PRIVATE)
public enum OrganizationTypeEnum {
ENT(2, "企业"),
PROJECT(1, "项目"),
ENT(2, "企业工作台"),
PROJECT(1, "项目部工作台"),
UNKNOWN(0, "未知");
private final Integer code;

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

@ -41,17 +41,17 @@ public class PendingMessagePushRequest implements Serializable {
@NotBlank(message = "templateCode is required")
private String templateCode;
/**
* 消息所属组织类型
* 消息所属工作台类型
*/
private OrganizationTypeEnum orgType;
/**
* 消息所属组织Id
* 消息所属工作台ID
*/
private Long orgId;
private Long workspaceId;
/**
* 消息所属组织名称
* 消息所属工作台名称
*/
private String orgName;
private String workspaceName;
/**
* 业务类型
*/