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

Merge branch 'feature/REQ-1898' into 'pre'

Browse Source 
REQ-1898: 去掉身份字段

See merge request universal/infrastructure/backend/msg-center-plat!278
This commit is contained in:
杨林 2024-01-15 10:32:43 +00:00
commit fe90481dff
5 changed files with 8 additions and 37 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/inside/notices/service/impl/v3/msg/MessageTemplateParser.java
View File

@ -85,11 +85,11 @@ public class MessageTemplateParser {
}
private GeneralMessagePushVO.Subtitle parseSubtitle(MessageRecordV3 message, String orgIcon) {
if (StringUtils.isBlank(message.getReceiverOrgName())) {
if (StringUtils.isBlank(message.getSubtitle())) {
return null;
}
return GeneralMessagePushVO.Subtitle.builder()
.title(message.getReceiverOrgName())
.title(message.getSubtitle())
.iconUrl(orgIcon)
.build();
}

3
inside-notices/src/main/java/cn/axzo/msg/center/inside/notices/service/impl/v3/msg/TemplateMessage.java
View File

@ -12,7 +12,6 @@ import cn.axzo.msg.center.message.domain.dto.MessageTemplateDTO;
import cn.axzo.msg.center.message.domain.vo.GeneralMessagePushVO;
import cn.axzo.msg.center.service.bizevent.request.ReachDto;
import cn.axzo.msg.center.service.dto.PersonV3DTO;
import cn.axzo.msg.center.service.enums.BizCategoryEnum;
import cn.axzo.msg.center.utils.UUIDUtil;
import com.alibaba.fastjson.JSONObject;
import lombok.Getter;
@ -82,7 +81,7 @@ public class TemplateMessage {
message.setTitle(parseTitle());
message.setContent(parseContent());
message.setReceiverOrgType(req.getReceiversOrgType());
message.setReceiverOrgName(req.getReceiversOrgName());
message.setSubtitle(req.getSubtitle());
message.setState(MsgStateV3Enum.UNSENT);
message.setBizCode(req.getBizCode());
message.setRouterParams(req.getRouterParams());

22
msg-center-api/src/main/java/cn/axzo/msg/center/api/request/v3/MessageSendReqV3.java
View File

@ -2,7 +2,6 @@ package cn.axzo.msg.center.api.request.v3;
import cn.axzo.basics.common.util.AssertUtil;
import cn.axzo.msg.center.service.dto.PersonV3DTO;
import cn.axzo.msg.center.service.enums.IdentityTypeEnum;
import cn.axzo.msg.center.service.enums.OrganizationTypeEnum;
import com.alibaba.fastjson.JSONObject;
import lombok.Getter;
@ -85,13 +84,12 @@ public class MessageSendReqV3 implements Serializable {
/**
* 接收者(消息)所属组织类型
*/
@NotNull(message = "工作台类型不能为空")
private OrganizationTypeEnum receiversOrgType;
/**
* 接收都组织名称
* 副标题
*/
private String receiversOrgName;
private String subtitle;
/**
* 渠道参数
@ -145,23 +143,7 @@ public class MessageSendReqV3 implements Serializable {
for (PersonV3DTO receiver : receivers) {
AssertUtil.notNull(receiver.getId(), "接收者ID不能为空");
AssertUtil.notNull(receiver.getIdentity(), "接收者身份信息不能为空");
AssertUtil.notNull(receiver.getIdentity().getType(), "接收者身份信息类型不能为空");
}
validateReceiverTypes();
}
private void validateReceiverTypes() {
if (receiversOuId != null) {
return;
}
boolean includeNotSupport = receivers.stream()
.anyMatch(r -> r.getIdentity().getType() == IdentityTypeEnum.NOT_SUPPORT);
AssertUtil.isFalse(includeNotSupport, "不能传<NOT_SUPPORT>身份类型");
boolean includeNonWorker = receivers.stream()
.anyMatch(r -> r.getIdentity().getType() != IdentityTypeEnum.WORKER);
AssertUtil.isFalse(includeNonWorker, "<非工人>接收者必须要传接收者ouId. 在没有提供<接收者ouId>的情况下，<工人>和<非工人>分别调用接口");
}
@Override

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

@ -2,7 +2,6 @@ package cn.axzo.msg.center.domain.entity;
import cn.axzo.msg.center.api.enums.MsgStateV3Enum;
import cn.axzo.msg.center.domain.persistence.BaseEntityExt;
import cn.axzo.msg.center.service.enums.BizCategoryEnum;
import cn.axzo.msg.center.service.enums.OrganizationTypeEnum;
import com.alibaba.fastjson.JSON;
import com.alibaba.fastjson.JSONObject;
@ -79,9 +78,9 @@ public class MessageRecordV3 extends BaseEntityExt<MessageRecordV3> implements S
private OrganizationTypeEnum receiverOrgType;
/**
* 消息所属名称
* 副标题
*/
private String receiverOrgName;
private String subtitle;
/**
* 发送者项目部ID

11
start/src/test/java/cn/axzo/msg/center/inside/notices/service/MessageServiceV3Test.java
View File

@ -4,9 +4,7 @@ import cn.axzo.msg.center.MsgCenterApplication;
import cn.axzo.msg.center.api.request.v3.MessageSendReqV3;
import cn.axzo.msg.center.api.response.v3.MessageSendRespV3;
import cn.axzo.msg.center.common.utils.MiscUtils;
import cn.axzo.msg.center.service.dto.IdentityDTO;
import cn.axzo.msg.center.service.dto.PersonV3DTO;
import cn.axzo.msg.center.service.enums.IdentityTypeEnum;
import cn.axzo.msg.center.service.enums.OrganizationTypeEnum;
import com.alibaba.fastjson.JSON;
import com.alibaba.fastjson.JSONObject;
@ -44,22 +42,15 @@ class MessageServiceV3Test {
req.setSenderWorkspaceId(2L);
req.setReceiversOuId(3L);
req.setReceiversWorkspaceId(4L);
req.setReceiversOrgName("receiver-org-name");
req.setSubtitle("receiver-org-name");
req.setReceiversOrgType(OrganizationTypeEnum.UNKNOWN);
req.setSender(
PersonV3DTO.builder()
.id(84982L)
.identity(IdentityDTO
.builder()
.build())
.build());
req.setReceivers(Collections.singletonList(
PersonV3DTO.builder()
.id(85026L)
.identity(IdentityDTO
.builder()
.type(IdentityTypeEnum.OPERATOR)
.build())
.build()));
MessageSendRespV3 resp = messageServiceV3.send(req);