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

REQ-3828: 指定发送人

Browse Source
This commit is contained in:
yanglin 2024-12-26 12:36:12 +08:00
parent abd7ae103b
commit b9007b4771
2 changed files with 13 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -2,6 +2,7 @@ package cn.axzo.msg.center.message.service.card;
import cn.axzo.basics.common.exception.ServiceException;
import cn.axzo.framework.jackson.utility.JSON;
import cn.axzo.im.center.api.vo.PersonAccountAttribute;
import cn.axzo.im.center.api.vo.req.SendTemplateMessageParam;
import cn.axzo.im.center.common.enums.AppTypeEnum;
import cn.axzo.im.center.common.enums.YesOrNo;
@ -140,7 +141,12 @@ public class CardSupport {
};
PushData pushData = template.parsePushData();
SendTemplateMessageParam imRequest = new SendTemplateMessageParam();
imRequest.setSender(null);
PersonAccountAttribute sender = new PersonAccountAttribute();
sender.setPersonId(sendModel.getRequest().getSender().getPersonIdOrDefault() + "");
sender.setOuId(sendModel.getRequest().getSender().getOuIdOrDefault());
sender.setWorkspaceId(sendModel.getRequest().getSender().getWorkspaceIdOrDefault());
sender.setAppType(sendModel.getRequest().getImSenderAccountAppType());
imRequest.setSender(sender);
imRequest.setMsgHeader(template.getTitle());
imRequest.setMsgContent(template.getContent());
imRequest.setMsgTemplateId(template.getCode());

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

@ -1,5 +1,6 @@
package cn.axzo.msg.center.service.pending.request;
import cn.axzo.im.center.common.enums.AppTypeEnum;
import cn.axzo.msg.center.service.dto.PeerPerson;
import cn.axzo.msg.center.service.enums.CardBizState;
import cn.axzo.msg.center.service.enums.CardState;
@ -60,6 +61,11 @@ public class CardSendRequest implements CardContent {
@NotNull(message = "发送人不能为空")
private PeerPerson sender = PeerPerson.nonPerson();
/**
* im发送人账号的端信息, 如果不传默认使用机器人发送
*/
private AppTypeEnum imSenderAccountAppType;
/**
* 接收人
*/