gitee
/
roses
mirror of https://gitee.com/stylefeng/roses
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

【7.0.4】【notice】新增未读消息接口

pull/22/head
fengshuonan 2021-06-12 18:11:53 +08:00
parent 8583f69a43
commit 0fd5ccbada
2 changed files with 9 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
kernel-s-message/message-business/src/main/java/cn/stylefeng/roses/kernel/message/modular/SysMessageController.java
View File

@ -29,6 +29,7 @@ import cn.stylefeng.roses.kernel.message.api.MessageApi;
import cn.stylefeng.roses.kernel.message.api.enums.MessageReadFlagEnum; import cn.stylefeng.roses.kernel.message.api.enums.MessageReadFlagEnum;
import cn.stylefeng.roses.kernel.message.api.pojo.request.MessageRequest; import cn.stylefeng.roses.kernel.message.api.pojo.request.MessageRequest;
import cn.stylefeng.roses.kernel.message.api.pojo.request.MessageSendRequest; import cn.stylefeng.roses.kernel.message.api.pojo.request.MessageSendRequest;
import cn.stylefeng.roses.kernel.message.api.pojo.response.MessageResponse;
import cn.stylefeng.roses.kernel.rule.pojo.response.ResponseData; import cn.stylefeng.roses.kernel.rule.pojo.response.ResponseData;
import cn.stylefeng.roses.kernel.rule.pojo.response.SuccessResponseData; import cn.stylefeng.roses.kernel.rule.pojo.response.SuccessResponseData;
import cn.stylefeng.roses.kernel.scanner.api.annotation.ApiResource; import cn.stylefeng.roses.kernel.scanner.api.annotation.ApiResource;
@ -40,9 +41,7 @@ import org.springframework.web.bind.annotation.RestController;
import javax.annotation.Resource; import javax.annotation.Resource;
import java.util.Date; import java.util.Date;
import java.util.HashMap;
import java.util.List; import java.util.List;
import java.util.Map;
/** /**
* 系统消息控制器 * 系统消息控制器
@ -144,18 +143,16 @@ public class SysMessageController {
} }
/** /**
* 系统消息未读数量 * 查询所有未读系统消息列表
* *
* @author liuhanqing * @author fengshuonan
* @date 2021/1/11 19:50 * @date 2021/6/12 17:42
*/ */
@GetResource(name = "系统消息列表", path = "/sysMessage/unReadCount") @GetResource(name = "查询所有未读系统消息列表", path = "/sysMessage/unReadMessageList")
public ResponseData msgUnRead(MessageRequest messageRequest) { public ResponseData unReadMessageList(MessageRequest messageRequest) {
messageRequest.setReadFlag(MessageReadFlagEnum.UNREAD.getCode()); messageRequest.setReadFlag(MessageReadFlagEnum.UNREAD.getCode());
Integer messageCount = messageApi.queryCountCurrentUser(messageRequest); List<MessageResponse> messageResponses = messageApi.queryListCurrentUser(messageRequest);
Map<String, Object> msgMap = new HashMap<>(1); return new SuccessResponseData(messageResponses);
msgMap.put("msgUnReadCount", messageCount);
return new SuccessResponseData(messageApi.queryListCurrentUser(messageRequest));
} }
} }

5
kernel-s-message/message-sdk-db/src/main/java/cn/stylefeng/roses/kernel/message/db/MessageDbServiceImpl.java
View File

@ -25,7 +25,6 @@
package cn.stylefeng.roses.kernel.message.db; package cn.stylefeng.roses.kernel.message.db;
import cn.hutool.core.bean.BeanUtil; import cn.hutool.core.bean.BeanUtil;
import cn.hutool.core.collection.ListUtil;
import cn.hutool.core.convert.Convert; import cn.hutool.core.convert.Convert;
import cn.hutool.core.util.ObjectUtil; import cn.hutool.core.util.ObjectUtil;
import cn.stylefeng.roses.kernel.auth.api.context.LoginContext; import cn.stylefeng.roses.kernel.auth.api.context.LoginContext;
@ -46,7 +45,6 @@ import cn.stylefeng.roses.kernel.socket.api.SocketOperatorApi;
import cn.stylefeng.roses.kernel.socket.api.enums.ServerMessageTypeEnum; import cn.stylefeng.roses.kernel.socket.api.enums.ServerMessageTypeEnum;
import cn.stylefeng.roses.kernel.system.api.UserServiceApi; import cn.stylefeng.roses.kernel.system.api.UserServiceApi;
import cn.stylefeng.roses.kernel.system.api.pojo.user.request.SysUserRequest; import cn.stylefeng.roses.kernel.system.api.pojo.user.request.SysUserRequest;
import com.alibaba.fastjson.JSON;
import com.baomidou.mybatisplus.core.conditions.update.LambdaUpdateWrapper; import com.baomidou.mybatisplus.core.conditions.update.LambdaUpdateWrapper;
import lombok.extern.slf4j.Slf4j; import lombok.extern.slf4j.Slf4j;
import org.springframework.stereotype.Service; import org.springframework.stereotype.Service;
@ -203,12 +201,11 @@ public class MessageDbServiceImpl implements MessageApi {
@Override @Override
public List<MessageResponse> queryList(MessageRequest messageRequest) { public List<MessageResponse> queryList(MessageRequest messageRequest) {
List<SysMessage> messageList = sysMessageService.findList(messageRequest); List<SysMessage> messageList = sysMessageService.findList(messageRequest);
List<MessageResponse> resultList = messageList.stream().map(msg -> { return messageList.stream().map(msg -> {
MessageResponse response = new MessageResponse(); MessageResponse response = new MessageResponse();
BeanUtil.copyProperties(msg, response); BeanUtil.copyProperties(msg, response);
return response; return response;
}).collect(Collectors.toList()); }).collect(Collectors.toList());
return resultList;
} }
@Override @Override