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

Merge branch 'feature/REQ-2046' into pre

Browse Source
This commit is contained in:
yanglin 2024-01-27 09:47:03 +08:00
commit 9b1b64f443
5 changed files with 21 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
inside-notices/src/main/java/cn/axzo/msg/center/inside/notices/service/impl/MessageCoreServiceImpl.java
View File

@ -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<MessageNewRes> resList = refineMessageRes(resPageResult, req);

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

@ -102,7 +102,7 @@ public class GeneralMessageOldServiceImpl implements GeneralMessageOldService {
@Override
public Page<MessageNewRes> 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())) {

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

@ -99,7 +99,7 @@ public class GeneralMessageServiceImpl implements GeneralMessageService {
Page<MessageNewRes> 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;
}

10
msg-center-api/src/main/java/cn/axzo/msg/center/api/request/CmsMsgQueryReq.java
View File

@ -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<IdentityDTO> determineIdentities() {
if (identityId != null && userType != null) {
IdentityTypeEnum identityType = IdentityTypeEnum.codeOf(userType).orElse(null);
return Collections.singletonList(new IdentityDTO(identityId, identityType));
}
return identities;
}
// !! 未使用
/**

8
msg-center-api/src/main/java/cn/axzo/msg/center/service/general/request/GeneralMessageOldDataStatisticRequest.java
View File

@ -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<IdentityDTO> identities;
public List<IdentityDTO> determineIdentities() {
if (identityId != null && identityType != null) {
return Collections.singletonList(new IdentityDTO(identityId, identityType));
}
return identities;
}
@Override
public String toString() {
return JSON.toJSONString(this);