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

移除上下文业务逻辑

Browse Source
This commit is contained in:
刘才福 2023-06-28 13:54:57 +08:00
parent c9b64ed968
commit c31ba635e8
5 changed files with 28 additions and 21 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -1,12 +1,10 @@
package cn.axzo.msg.center.inside.notices.service.impl;
import cn.axzo.core.domain.PageResult;
import cn.axzo.framework.auth.domain.ContextInfoHolder;
import cn.axzo.msg.center.api.request.CmsMsgQueryReq;
import cn.axzo.msg.center.api.request.MessageNewRes;
import cn.axzo.msg.center.api.response.MessageTotalRes;
import cn.axzo.msg.center.common.enums.SystemTypeEnum;
import cn.axzo.msg.center.common.exception.ServiceException;
import cn.axzo.msg.center.common.utils.PlaceholderResolver;
import cn.axzo.msg.center.domain.dto.MsgModuleDTO;
import cn.axzo.msg.center.domain.entity.MessageModule;
@ -51,24 +49,13 @@ public class MessageCoreServiceImpl implements MessageCoreService {
@Resource
private MessageRelationService relationService;
/**
* 获取用户类型
*
* @return
*/
public UserTypeEnum getUserType() {
UserTypeEnum userTypeEnum = UserTypeEnum.valueOf(ContextInfoHolder.get().getUserInfo().getIdentityType());
if (userTypeEnum == null) {
throw new ServiceException("未获取到用户类型");
public MsgRouteTypeEnum getSystemType(String systemType) {
/*String systemType = ContextInfoHolder.get().getSystemAndDeviceInfo().getSystemType();*/
if(org.apache.commons.lang3.StringUtils.isEmpty(systemType)){
return MsgRouteTypeEnum.WEB;
}
return userTypeEnum;
}
public MsgRouteTypeEnum getSystemType() {
String systemType = ContextInfoHolder.get().getSystemAndDeviceInfo().getSystemType();
//判断是否为手机端调用
if (SystemTypeEnum.IOS.get().equals(systemType)) {
return MsgRouteTypeEnum.IOS;
@ -111,7 +98,8 @@ 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.getIdentityId(), getUserType());
UserTypeEnum userTypeEnum=UserTypeEnum.valueOf(req.getUserType());
resPageResult = messageRecordService.pageMsgInfo(req, req.getPersonId(), req.getIdentityId(), userTypeEnum);
List<MessageNewRes> resList = refineMessageRes(resPageResult, req);
@ -154,7 +142,7 @@ public class MessageCoreServiceImpl implements MessageCoreService {
.collect(Collectors.groupingBy(MsgModuleDTO::getTypeId));
//批量获取路由信息
MsgRouteTypeEnum msgRouteTypeEnum = getSystemType();
MsgRouteTypeEnum msgRouteTypeEnum = getSystemType(req.getSystemType());
List<MessageRouter> routers = new ArrayList<>();
Map<Long, List<MessageRouter>> mapRout = new HashMap<>();
if (CollectionUtils.isNotEmpty(relationIds)) {

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

@ -392,7 +392,8 @@ public class MessageRecordServiceImpl implements MessageRecordService {
}
List<MessageNewRes> records=new ArrayList<>(iPage.getRecords().size());
for (MessageNewResDTO record : iPage.getRecords()) {
BeanConvertUtils.copyBean(record, MessageNewRes.class);
MessageNewRes messageNewRes = BeanConvertUtils.copyBean(record, MessageNewRes.class);
records.add(messageNewRes);
}
return new PageResult<>(records, iPage.getTotal());
}

5
msg-center-api/src/main/java/cn/axzo/msg/center/api/InsideMessageModuleApi.java
View File

@ -20,12 +20,15 @@ public interface InsideMessageModuleApi {
@GetMapping("modules/get/{identityType}")
CommonResponse<Map<Long, String>> getModules(@PathVariable Integer identityType);
/*List<void> listModuleByUserType(@PathVariable Long identityId);*/
/**
* 查询模块列表
* @param identityType
* @return
*/
@GetMapping("/module/list")
@GetMapping("/module/page/list")
CommonResponse<CommonPlatManagerRes> listModules(Integer identityType);
/**

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

@ -25,6 +25,15 @@ public class CmsMsgQueryReq extends PageRequest {
@NotNull(message = "消息类型必传")
private Integer msgType;
/**
* 用户类型
*/
private Integer userType;
/**
* 系统类型
*/
private String systemType;
/**
* 消息状态
@ -50,4 +59,6 @@ public class CmsMsgQueryReq extends PageRequest {
@NotNull(message = "identityId不能为空")
private Long identityId;
}

4
msg-center-api/src/main/java/cn/axzo/msg/center/api/response/MessageModuleRes.java Normal file
View File

@ -0,0 +1,4 @@
package cn.axzo.msg.center.api.response;
public class MessageModuleRes {
}