From fc62645227c53aa60254c498350b4341e911157c Mon Sep 17 00:00:00 2001 From: yanglin Date: Wed, 22 Jan 2025 11:27:46 +0800 Subject: [PATCH] =?UTF-8?q?REQ-3345:=20=E5=90=91=E7=BE=A4=E9=87=8C?= =?UTF-8?q?=E5=8F=91=E5=8D=A1=E7=89=87=E6=B6=88=E6=81=AF?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../message/service/card/CardManager.java | 4 +- .../message/service/card/CardSupport.java | 66 +++++++++++-------- .../service/card/domain/CardGroup.java | 31 ++++++--- .../message/service/card/log/CardLoggers.java | 1 + .../pending/request/CardSendRequest.java | 13 ++++ .../axzo/msg/center/domain/entity/Card.java | 5 ++ .../msg/center/domain/entity/CardLog.java | 5 ++ 7 files changed, 89 insertions(+), 36 deletions(-) diff --git a/inside-notices/src/main/java/cn/axzo/msg/center/message/service/card/CardManager.java b/inside-notices/src/main/java/cn/axzo/msg/center/message/service/card/CardManager.java index 2a4da9fc..b5ff068b 100644 --- a/inside-notices/src/main/java/cn/axzo/msg/center/message/service/card/CardManager.java +++ b/inside-notices/src/main/java/cn/axzo/msg/center/message/service/card/CardManager.java @@ -81,7 +81,9 @@ public class CardManager { public CardSendResponse send(CardSendRequest request) { // 校验参数 BizAssertions.assertNotNull(request.getSender(), "发送人不能为空"); - BizAssertions.assertNotEmpty(request.getReceivers(), "接收人不能为空"); + BizAssertions.assertFalse( + request.getReceivers().isEmpty() + && request.getImReceiveAccounts().isEmpty(), "接收人不能为空"); RequestInfo requestInfo = new RequestInfo(); requestInfo.setTemplateCode(request.getTemplateCode()); requestInfo.setBizCode(request.getBizCode()); diff --git a/inside-notices/src/main/java/cn/axzo/msg/center/message/service/card/CardSupport.java b/inside-notices/src/main/java/cn/axzo/msg/center/message/service/card/CardSupport.java index a69a9423..84d1c212 100644 --- a/inside-notices/src/main/java/cn/axzo/msg/center/message/service/card/CardSupport.java +++ b/inside-notices/src/main/java/cn/axzo/msg/center/message/service/card/CardSupport.java @@ -98,39 +98,52 @@ public class CardSupport { GeneralMessagePushVO cardContent = cardParser.parseCardContent( sendModel.getCardTemplate(), sendModel.getRequest()); sendModel.setCardContent(cardContent); - for (PeerPerson person : sendModel.getRequest().getReceivers()) { + Supplier cardFactory = () -> { + Card card = new Card(); + sendModel.addCard(card); + card.setBatchNo(sendModel.getRequestContext().getBatchNo()); + card.setAppCode(sendModel.getRequest().getAppCode()); + card.setImTaskId(0L); + card.setBizMessageId(""); + card.setIdentityCode(UUIDUtil.uuidString()); + card.setBizCode(sendModel.getRequest().determineBizCode()); + card.setSubBizCode(sendModel.getRequest().determineSubBizCode()); + card.setTemplateCode(sendModel.getRequest().getTemplateCode()); + card.setBizState(sendModel.getRequest().getStateInfo().getBizState()); + card.setCardState(sendModel.getRequest().getStateInfo().getCardState()); + card.setTitle(sendModel.getTemplate().getTitle()); + card.setContent(sendModel.getTemplate().getContent()); + card.setCardContent(cardContent); + card.setBizParam(sendModel.getRequest().getBizParam()); + card.setRouterParam(sendModel.getRequest().getRouterParam()); + card.setSenderAppType(AppTypeEnum.SYSTEM); + card.setIsSenderRobot(YesOrNo.YES); + card.setSenderPersonId(sendModel.getRequest().getSender().getPersonIdOrDefault()); + card.setSenderOuId(sendModel.getRequest().getSender().getOuIdOrDefault()); + card.setSenderWorkspaceId(sendModel.getRequest().getSender().getWorkspaceIdOrDefault()); + card.setSubtitle(sendModel.getRequest().getSubtitle()); + card.setButtonStates(Collections.emptyList()); + card.setUpdatable(sendModel.getCardTemplate().isUpdatable() ? YesOrNo.YES : YesOrNo.NO); + return card; + }; + for (PeerPerson person : sendModel.getRequest().receiversOrEmpty()) { for (AppTypeEnum appType : sendModel.getCardTemplate().ensureAppTypesPresent()) { - Card card = new Card(); - sendModel.addCard(card); - card.setBatchNo(sendModel.getRequestContext().getBatchNo()); - card.setAppCode(sendModel.getRequest().getAppCode()); - card.setImTaskId(0L); - card.setBizMessageId(""); - card.setIdentityCode(UUIDUtil.uuidString()); - card.setBizCode(sendModel.getRequest().determineBizCode()); - card.setSubBizCode(sendModel.getRequest().determineSubBizCode()); - card.setTemplateCode(sendModel.getRequest().getTemplateCode()); - card.setBizState(sendModel.getRequest().getStateInfo().getBizState()); - card.setCardState(sendModel.getRequest().getStateInfo().getCardState()); - card.setTitle(sendModel.getTemplate().getTitle()); - card.setContent(sendModel.getTemplate().getContent()); - card.setCardContent(cardContent); - card.setBizParam(sendModel.getRequest().getBizParam()); - card.setRouterParam(sendModel.getRequest().getRouterParam()); - card.setSenderAppType(AppTypeEnum.SYSTEM); - card.setIsSenderRobot(YesOrNo.YES); + Card card = cardFactory.get(); card.setReceiverAppType(appType); - card.setSenderPersonId(sendModel.getRequest().getSender().getPersonIdOrDefault()); - card.setSenderOuId(sendModel.getRequest().getSender().getOuIdOrDefault()); - card.setSenderWorkspaceId(sendModel.getRequest().getSender().getWorkspaceIdOrDefault()); card.setReceiverPersonId(person.getPersonIdOrDefault()); card.setReceiverOuId(person.getOuIdOrDefault()); card.setReceiverWorkspaceId(person.getWorkspaceIdOrDefault()); - card.setSubtitle(sendModel.getRequest().getSubtitle()); - card.setButtonStates(Collections.emptyList()); - card.setUpdatable(sendModel.getCardTemplate().isUpdatable() ? YesOrNo.YES : YesOrNo.NO); + card.setImReceiveAccount(""); } } + for (String imAccount : sendModel.getRequest().imReceiveAccountsOrEmpty()) { + Card card = cardFactory.get(); + card.setReceiverAppType(AppTypeEnum.NONE); + card.setReceiverPersonId(-1L); + card.setReceiverOuId(-1L); + card.setReceiverWorkspaceId(-1L); + card.setImReceiveAccount(imAccount); + } } SendTemplateMessageParam buildImSendRequest(CardSendModel sendModel, @@ -168,6 +181,7 @@ public class CardSupport { .append(subBizCode) .build()); imRequest.setReceivePersons(group.buildReceiverAccounts()); + imRequest.setImReceiveAccounts(group.collectImReceiveAccounts()); imRequest.setExt(extBuilder.get()); imRequest.setUpdatable(sendModel.getCardTemplate().isUpdatable()); if (pushData.determinePushable(log, template.getCode())) { diff --git a/inside-notices/src/main/java/cn/axzo/msg/center/message/service/card/domain/CardGroup.java b/inside-notices/src/main/java/cn/axzo/msg/center/message/service/card/domain/CardGroup.java index 8a4b27ec..1819cbcd 100644 --- a/inside-notices/src/main/java/cn/axzo/msg/center/message/service/card/domain/CardGroup.java +++ b/inside-notices/src/main/java/cn/axzo/msg/center/message/service/card/domain/CardGroup.java @@ -10,12 +10,15 @@ import cn.axzo.msg.center.nimpush.device.PushDeviceSnapshots; import com.alibaba.fastjson.JSON; import lombok.Getter; import lombok.RequiredArgsConstructor; +import org.apache.commons.lang3.StringUtils; import java.util.ArrayList; import java.util.Collections; import java.util.List; +import java.util.Set; import static java.util.stream.Collectors.toList; +import static java.util.stream.Collectors.toSet; /** * @author yanglin @@ -31,15 +34,18 @@ public class CardGroup { cards.add(card); } - public List buildReceiverAccounts() { - return getCards().stream().map(card -> { - PersonAccountAttribute account = new PersonAccountAttribute(); - account.setPersonId(card.getReceiverPersonId() + ""); - account.setOuId(card.getReceiverOuId()); - account.setWorkspaceId(card.getReceiverWorkspaceId()); - account.setAppType(groupKey.getAppType()); - return account; - }).collect(toList()); + public Set buildReceiverAccounts() { + return getCards().stream() + .filter(card -> card.getReceiverAppType() != AppTypeEnum.NONE) + .map(card -> { + PersonAccountAttribute account = new PersonAccountAttribute(); + account.setPersonId(card.getReceiverPersonId() + ""); + account.setOuId(card.getReceiverOuId()); + account.setWorkspaceId(card.getReceiverWorkspaceId()); + account.setAppType(groupKey.getAppType()); + return account; + }) + .collect(toSet()); } public List buildNimPushExcludes(PushDeviceSnapshots deviceSnapshots) { @@ -58,6 +64,13 @@ public class CardGroup { .collect(toList()); } + public Set collectImReceiveAccounts() { + return getCards().stream() + .map(Card::getImReceiveAccount) + .filter(StringUtils::isNotBlank) + .collect(toSet()); + } + @Override public String toString() { return JSON.toJSONString(this); diff --git a/inside-notices/src/main/java/cn/axzo/msg/center/message/service/card/log/CardLoggers.java b/inside-notices/src/main/java/cn/axzo/msg/center/message/service/card/log/CardLoggers.java index 73b38b71..1ab3c7dc 100644 --- a/inside-notices/src/main/java/cn/axzo/msg/center/message/service/card/log/CardLoggers.java +++ b/inside-notices/src/main/java/cn/axzo/msg/center/message/service/card/log/CardLoggers.java @@ -60,6 +60,7 @@ public class CardLoggers { log.setReceiverOuId(card.getReceiverOuId()); log.setReceiverWorkspaceId(card.getReceiverWorkspaceId()); log.setReceiverAppType(card.getReceiverAppType()); + log.setImReceiveAccount(card.getImReceiveAccount()); log.setBizState(card.getBizState()); log.setCardState(card.getCardState()); log.setIdentityCode(card.getIdentityCode()); diff --git a/msg-center-api/src/main/java/cn/axzo/msg/center/service/pending/request/CardSendRequest.java b/msg-center-api/src/main/java/cn/axzo/msg/center/service/pending/request/CardSendRequest.java index a026bc59..7fea2660 100644 --- a/msg-center-api/src/main/java/cn/axzo/msg/center/service/pending/request/CardSendRequest.java +++ b/msg-center-api/src/main/java/cn/axzo/msg/center/service/pending/request/CardSendRequest.java @@ -73,6 +73,11 @@ public class CardSendRequest implements CardContent { @NotEmpty(message = "接收人不能为空") private Set receivers = new HashSet<>(); + /** + * 消息接收IM账号或群id + */ + private Set imReceiveAccounts; + /** * 业务参数 */ @@ -93,6 +98,14 @@ public class CardSendRequest implements CardContent { */ private boolean returnCards = false; + public Set receiversOrEmpty() { + return receivers == null ? Collections.emptySet() : receivers; + } + + public Set imReceiveAccountsOrEmpty() { + return imReceiveAccounts == null ? Collections.emptySet() : imReceiveAccounts; + } + @Override @JsonIgnore @JSONField(serialize = false, defaultValue = "false") public CardStateInfo getStateInfo() { return CardStateInfo.create(CardState.CREATED, CardBizState.PENDING); diff --git a/msg-center-domain/src/main/java/cn/axzo/msg/center/domain/entity/Card.java b/msg-center-domain/src/main/java/cn/axzo/msg/center/domain/entity/Card.java index 721ccb27..5ec10f74 100644 --- a/msg-center-domain/src/main/java/cn/axzo/msg/center/domain/entity/Card.java +++ b/msg-center-domain/src/main/java/cn/axzo/msg/center/domain/entity/Card.java @@ -152,6 +152,11 @@ public class Card extends BaseEntityExt implements CardContent { */ private Long receiverWorkspaceId; + /** + * 接收账号 + */ + private String imReceiveAccount; + /** * 按钮状态 */ diff --git a/msg-center-domain/src/main/java/cn/axzo/msg/center/domain/entity/CardLog.java b/msg-center-domain/src/main/java/cn/axzo/msg/center/domain/entity/CardLog.java index c883967c..92ab04e2 100644 --- a/msg-center-domain/src/main/java/cn/axzo/msg/center/domain/entity/CardLog.java +++ b/msg-center-domain/src/main/java/cn/axzo/msg/center/domain/entity/CardLog.java @@ -61,6 +61,11 @@ public class CardLog extends BaseEntityExt { */ private AppTypeEnum receiverAppType; + /** + * 接收账号 + */ + private String imReceiveAccount; + /** * 异常 */