From 0fd5ccbada834da38fb654e5c5a08d2aa79e479d Mon Sep 17 00:00:00 2001
From: fengshuonan <sn93@qq.com>
Date: Sat, 12 Jun 2021 18:11:53 +0800
Subject: [PATCH] =?UTF-8?q?=E3=80=907.0.4=E3=80=91=E3=80=90notice=E3=80=91?=
 =?UTF-8?q?=E6=96=B0=E5=A2=9E=E6=9C=AA=E8=AF=BB=E6=B6=88=E6=81=AF=E6=8E=A5?=
 =?UTF-8?q?=E5=8F=A3?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../message/modular/SysMessageController.java | 19 ++++++++-----------
 .../message/db/MessageDbServiceImpl.java      |  5 +----
 2 files changed, 9 insertions(+), 15 deletions(-)

diff --git a/kernel-s-message/message-business/src/main/java/cn/stylefeng/roses/kernel/message/modular/SysMessageController.java b/kernel-s-message/message-business/src/main/java/cn/stylefeng/roses/kernel/message/modular/SysMessageController.java
index 9161c7a48..41a492c8f 100644
--- a/kernel-s-message/message-business/src/main/java/cn/stylefeng/roses/kernel/message/modular/SysMessageController.java
+++ b/kernel-s-message/message-business/src/main/java/cn/stylefeng/roses/kernel/message/modular/SysMessageController.java
@@ -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.pojo.request.MessageRequest;
 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.SuccessResponseData;
 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 java.util.Date;
-import java.util.HashMap;
 import java.util.List;
-import java.util.Map;
 
 /**
  * 系统消息控制器
@@ -144,18 +143,16 @@ public class SysMessageController {
     }
 
     /**
-     * 系统消息未读数量
+     * 查询所有未读系统消息列表
      *
-     * @author liuhanqing
-     * @date 2021/1/11 19:50
+     * @author fengshuonan
+     * @date 2021/6/12 17:42
      */
-    @GetResource(name = "系统消息列表", path = "/sysMessage/unReadCount")
-    public ResponseData msgUnRead(MessageRequest messageRequest) {
+    @GetResource(name = "查询所有未读系统消息列表", path = "/sysMessage/unReadMessageList")
+    public ResponseData unReadMessageList(MessageRequest messageRequest) {
         messageRequest.setReadFlag(MessageReadFlagEnum.UNREAD.getCode());
-        Integer messageCount = messageApi.queryCountCurrentUser(messageRequest);
-        Map<String, Object> msgMap = new HashMap<>(1);
-        msgMap.put("msgUnReadCount", messageCount);
-        return new SuccessResponseData(messageApi.queryListCurrentUser(messageRequest));
+        List<MessageResponse> messageResponses = messageApi.queryListCurrentUser(messageRequest);
+        return new SuccessResponseData(messageResponses);
     }
 
 }
diff --git a/kernel-s-message/message-sdk-db/src/main/java/cn/stylefeng/roses/kernel/message/db/MessageDbServiceImpl.java b/kernel-s-message/message-sdk-db/src/main/java/cn/stylefeng/roses/kernel/message/db/MessageDbServiceImpl.java
index 0b86e7518..a48d14e84 100644
--- a/kernel-s-message/message-sdk-db/src/main/java/cn/stylefeng/roses/kernel/message/db/MessageDbServiceImpl.java
+++ b/kernel-s-message/message-sdk-db/src/main/java/cn/stylefeng/roses/kernel/message/db/MessageDbServiceImpl.java
@@ -25,7 +25,6 @@
 package cn.stylefeng.roses.kernel.message.db;
 
 import cn.hutool.core.bean.BeanUtil;
-import cn.hutool.core.collection.ListUtil;
 import cn.hutool.core.convert.Convert;
 import cn.hutool.core.util.ObjectUtil;
 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.system.api.UserServiceApi;
 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 lombok.extern.slf4j.Slf4j;
 import org.springframework.stereotype.Service;
@@ -203,12 +201,11 @@ public class MessageDbServiceImpl implements MessageApi {
     @Override
     public List<MessageResponse> queryList(MessageRequest messageRequest) {
         List<SysMessage> messageList = sysMessageService.findList(messageRequest);
-        List<MessageResponse> resultList = messageList.stream().map(msg -> {
+        return messageList.stream().map(msg -> {
             MessageResponse response = new MessageResponse();
             BeanUtil.copyProperties(msg, response);
             return response;
         }).collect(Collectors.toList());
-        return resultList;
     }
 
     @Override