From 89657feb18d92ada2ad50e5a2040ea170ff1b6f8 Mon Sep 17 00:00:00 2001 From: yanglin Date: Sat, 27 Jan 2024 09:46:52 +0800 Subject: [PATCH] =?UTF-8?q?REQ-2046:=20=E5=85=BC=E5=AE=B9=E8=80=81?= =?UTF-8?q?=E7=9A=84=E5=AD=97=E6=AE=B5?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../notices/service/impl/MessageCoreServiceImpl.java | 2 +- .../service/impl/GeneralMessageOldServiceImpl.java | 2 +- .../service/impl/GeneralMessageServiceImpl.java | 4 ++-- .../cn/axzo/msg/center/api/request/CmsMsgQueryReq.java | 10 +++++++++- .../request/GeneralMessageOldDataStatisticRequest.java | 8 ++++++++ 5 files changed, 21 insertions(+), 5 deletions(-) diff --git a/inside-notices/src/main/java/cn/axzo/msg/center/inside/notices/service/impl/MessageCoreServiceImpl.java b/inside-notices/src/main/java/cn/axzo/msg/center/inside/notices/service/impl/MessageCoreServiceImpl.java index 510c8ea8..cd872b9e 100644 --- a/inside-notices/src/main/java/cn/axzo/msg/center/inside/notices/service/impl/MessageCoreServiceImpl.java +++ b/inside-notices/src/main/java/cn/axzo/msg/center/inside/notices/service/impl/MessageCoreServiceImpl.java @@ -148,7 +148,7 @@ public class MessageCoreServiceImpl implements MessageCoreService { if (Objects.equals(NT_CM_APP_GENERAL, ContextInfoHolder.get().getSystemAndDeviceInfo().getLoginDevice())) { personId = ContextInfoHolder.get().getUserInfo().getPersonId(); }*/ - resPageResult = messageRecordService.pageMsgInfo(req, req.getPersonId(), req.getIdentities()); + resPageResult = messageRecordService.pageMsgInfo(req, req.getPersonId(), req.determineIdentities()); List resList = refineMessageRes(resPageResult, req); diff --git a/inside-notices/src/main/java/cn/axzo/msg/center/message/service/impl/GeneralMessageOldServiceImpl.java b/inside-notices/src/main/java/cn/axzo/msg/center/message/service/impl/GeneralMessageOldServiceImpl.java index c0b88399..dcdfea38 100644 --- a/inside-notices/src/main/java/cn/axzo/msg/center/message/service/impl/GeneralMessageOldServiceImpl.java +++ b/inside-notices/src/main/java/cn/axzo/msg/center/message/service/impl/GeneralMessageOldServiceImpl.java @@ -102,7 +102,7 @@ public class GeneralMessageOldServiceImpl implements GeneralMessageOldService { @Override public Page pageMsgInfo(CmsMsgQueryReq request) { log.info("GeneralMessageOldServiceImpl#pageMsgInfo. request:{}", request); - if (CollectionUtils.isEmpty(request.getIdentities())) { + if (CollectionUtils.isEmpty(request.determineIdentities())) { return Page.zero(); } if (CollectionUtils.isEmpty(request.getExcludeMsgIds())) { diff --git a/inside-notices/src/main/java/cn/axzo/msg/center/message/service/impl/GeneralMessageServiceImpl.java b/inside-notices/src/main/java/cn/axzo/msg/center/message/service/impl/GeneralMessageServiceImpl.java index ca9e9571..58ae9ba6 100644 --- a/inside-notices/src/main/java/cn/axzo/msg/center/message/service/impl/GeneralMessageServiceImpl.java +++ b/inside-notices/src/main/java/cn/axzo/msg/center/message/service/impl/GeneralMessageServiceImpl.java @@ -99,7 +99,7 @@ public class GeneralMessageServiceImpl implements GeneralMessageService { Page result = generalMessageOldService.pageMsgInfo(build(request, sendTwiceMsgIds)); // 统计旧的未读普通消息数量 int count = generalMessageOldService.countUnread( - request.getPersonId(), request.getIdentities(), sendTwiceMsgIds); + request.getPersonId(), request.determineIdentities(), sendTwiceMsgIds); // 编排组合成界面展示的数据结构 MessageNewRes msg = CollectionUtils.isNotEmpty(result.getList()) ? result.getList().get(0) : null; return GeneralMessageOldDataStatisticResponse.builder() @@ -215,7 +215,7 @@ public class GeneralMessageServiceImpl implements GeneralMessageService { req.setPage(1L); req.setPageSize(1L); req.setPersonId(request.getPersonId()); - req.setIdentities(request.getIdentities()); + req.setIdentities(request.determineIdentities()); req.setExcludeMsgIds(excludeMsgIds); return req; } diff --git a/msg-center-api/src/main/java/cn/axzo/msg/center/api/request/CmsMsgQueryReq.java b/msg-center-api/src/main/java/cn/axzo/msg/center/api/request/CmsMsgQueryReq.java index 86e59785..08d7c0f7 100644 --- a/msg-center-api/src/main/java/cn/axzo/msg/center/api/request/CmsMsgQueryReq.java +++ b/msg-center-api/src/main/java/cn/axzo/msg/center/api/request/CmsMsgQueryReq.java @@ -3,12 +3,12 @@ package cn.axzo.msg.center.api.request; import cn.axzo.basics.common.page.PageRequest; import cn.axzo.msg.center.api.enums.MsgStateEnum; import cn.axzo.msg.center.service.dto.IdentityDTO; +import cn.axzo.msg.center.service.enums.IdentityTypeEnum; import lombok.Data; import javax.validation.constraints.NotNull; import java.util.Collections; import java.util.List; -import java.util.stream.Collectors; import static java.util.stream.Collectors.toList; @@ -84,6 +84,14 @@ public class CmsMsgQueryReq extends PageRequest { .collect(toList()); } + public List determineIdentities() { + if (identityId != null && userType != null) { + IdentityTypeEnum identityType = IdentityTypeEnum.codeOf(userType).orElse(null); + return Collections.singletonList(new IdentityDTO(identityId, identityType)); + } + return identities; + } + // !! 未使用 /** diff --git a/msg-center-api/src/main/java/cn/axzo/msg/center/service/general/request/GeneralMessageOldDataStatisticRequest.java b/msg-center-api/src/main/java/cn/axzo/msg/center/service/general/request/GeneralMessageOldDataStatisticRequest.java index 82e0f638..b2bf0fc7 100644 --- a/msg-center-api/src/main/java/cn/axzo/msg/center/service/general/request/GeneralMessageOldDataStatisticRequest.java +++ b/msg-center-api/src/main/java/cn/axzo/msg/center/service/general/request/GeneralMessageOldDataStatisticRequest.java @@ -11,6 +11,7 @@ import lombok.Setter; import javax.validation.constraints.NotNull; import java.io.Serializable; +import java.util.Collections; import java.util.List; /** @@ -37,6 +38,13 @@ public class GeneralMessageOldDataStatisticRequest implements Serializable { */ private List identities; + public List determineIdentities() { + if (identityId != null && identityType != null) { + return Collections.singletonList(new IdentityDTO(identityId, identityType)); + } + return identities; + } + @Override public String toString() { return JSON.toJSONString(this);