message分页查询

sckw-modules/sckw-message/src/main/java/com/sckw/message/controller/MessageController.java

@@ -1,6 +1,11 @@
 package com.sckw.message.controller;
 
+import com.github.pagehelper.PageHelper;
+import com.github.pagehelper.PageInfo;
+import com.sckw.core.model.page.PageHelperUtil;
+import com.sckw.core.model.page.PageResult;
 import com.sckw.core.web.response.HttpResult;
+import com.sckw.message.model.KwmMessage;
 import com.sckw.message.model.vo.req.DeleteMessagesReqVO;
 import com.sckw.message.model.vo.req.FindMessagesReqVO;
 import com.sckw.message.model.vo.req.ReadMessagesReqVO;
@@ -14,6 +19,8 @@ import org.springframework.web.bind.annotation.RequestBody;
 import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.RestController;
 
+import java.util.List;
+
 /**
  * @desc: 消息相关接口
  * @author: yzc
@@ -70,12 +77,15 @@ public class MessageController {
      * @desc: 查找消息集合
      * @author: yzc
      * @date: 2023-06-09 15:12
-     * @param selectMessagesReqVO
+     * @param params
      * @return com.sckw.core.web.response.HttpResult
      */
     @PostMapping(value = "/select", produces = MediaType.APPLICATION_JSON_VALUE)
-    public HttpResult select(@RequestBody @Valid SelectMessagesReqVO selectMessagesReqVO) {
-        return HttpResult.ok(messageService.select(selectMessagesReqVO));
+    public HttpResult select(@RequestBody @Valid SelectMessagesReqVO params) {
+        PageHelper.startPage(params.getPageNum(),params.getPageSize());
+        List<KwmMessage> list = messageService.select(params);
+        PageResult result = PageHelperUtil.getPageResult(new PageInfo<>(list));
+        return HttpResult.ok(result);
     }
 
 }

sckw-modules/sckw-message/src/main/java/com/sckw/message/dao/KwmMessageMapper.java

@@ -3,6 +3,9 @@ package com.sckw.message.dao;
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 import com.sckw.message.model.KwmMessage;
 import org.apache.ibatis.annotations.Mapper;
+import org.apache.ibatis.annotations.Param;
+
+import java.util.List;
 
 /**
  * @desc: 消息mapper
@@ -11,4 +14,12 @@ import org.apache.ibatis.annotations.Mapper;
  */
 @Mapper
 public interface KwmMessageMapper extends BaseMapper<KwmMessage> {
+    /**
+     * @desc: 分页查询
+     * @author: yzc
+     * @date: 2023-06-13 9:11
+     * @param userId, category, type
+     * @return java.util.List<com.sckw.message.model.KwmMessage>
+     */
+    List<KwmMessage> findPage(@Param("userId") long userId, @Param("category") String category, @Param("type") String type);
 }

sckw-modules/sckw-message/src/main/java/com/sckw/message/service/KwmMessageService.java

@@ -29,11 +29,11 @@ public class KwmMessageService {
 
 
     /**
+     * @param msgIds, category, type, status
+     * @return java.util.List<com.sckw.message.model.KwmMessage>
      * @desc: 根据条件获取消息列表
      * @author: yzc
      * @date: 2023-06-09 14:27
-     * @param msgIds, category, type, status
-     * @return java.util.List<com.sckw.message.model.KwmMessage>
      */
     public List<KwmMessage> getList(List<Long> msgIds, String category, String type, Integer status) {
         LambdaQueryWrapper<KwmMessage> wrapper = new LambdaQueryWrapper<>();
@@ -48,11 +48,11 @@ public class KwmMessageService {
 
 
     /**
+     * @param msgIds
+     * @return void
      * @desc: 更新已读根据消息ids
      * @author: yzc
      * @date: 2023-06-09 14:36
-     * @param msgIds
-     * @return void
      */
     @Transactional(rollbackFor = Exception.class)
     public void readByMsgIds(List<Long> msgIds) {
@@ -62,11 +62,11 @@ public class KwmMessageService {
     }
 
     /**
+     * @param ids
+     * @return void
      * @desc: 根据ids删除
      * @author: yzc
      * @date: 2023-06-09 15:08
-     * @param ids
-     * @return void
      */
     @Transactional(rollbackFor = Exception.class)
     public void delByMsgIds(List<Long> ids) {
@@ -76,15 +76,26 @@ public class KwmMessageService {
     }
 
     /**
+     * @param kwmMessage
+     * @return java.lang.Long
      * @desc: 插入消息
      * @author: yzc
      * @date: 2023-06-09 15:49
-     * @param kwmMessage
-     * @return java.lang.Long
      */
     @Transactional(rollbackFor = Exception.class)
     public Long insert(KwmMessage kwmMessage) {
         kwmMessageMapper.insert(kwmMessage);
         return kwmMessage.getId();
     }
+
+    /**
+     * @desc: 分页查询
+     * @author: yzc
+     * @date: 2023-06-13 9:08
+     * @param userId, category, type
+     * @return java.util.List<com.sckw.message.model.KwmMessage>
+     */
+    public List<KwmMessage> findPage(Long userId,String category, String type) {
+        return kwmMessageMapper.findPage(userId,category, type);
+    }
 }

sckw-modules/sckw-message/src/main/java/com/sckw/message/service/MessageService.java

@@ -2,7 +2,6 @@ package com.sckw.message.service;
 
 import com.sckw.core.utils.CollectionUtils;
 import com.sckw.message.model.KwmMessage;
-import com.sckw.message.model.KwmMessageUser;
 import com.sckw.message.model.vo.req.DeleteMessagesReqVO;
 import com.sckw.message.model.vo.req.FindMessagesReqVO;
 import com.sckw.message.model.vo.req.ReadMessagesReqVO;
@@ -30,11 +29,11 @@ public class MessageService {
 
 
     /**
+     * @param params
+     * @return java.util.List<com.sckw.message.model.KwmMessage>
      * @desc: 查询消息列表
      * @author: yzc
      * @date: 2023-06-09 14:21
-     * @param params
-     * @return java.util.List<com.sckw.message.model.KwmMessage>
      */
     public List<KwmMessage> selectMessages(FindMessagesReqVO params) {
         //TODO 当前线程获取用户id
@@ -46,17 +45,17 @@ public class MessageService {
     }
 
     /**
+     * @param reqVO
+     * @return void
      * @desc: 更新消息已读
      * @author: yzc
      * @date: 2023-06-09 14:20
-     * @param reqVO
-     * @return void
      */
     @Transactional(rollbackFor = Exception.class)
     public void read(ReadMessagesReqVO reqVO) {
         //TODO 当前线程获取用户id
         List<Long> msgIds = kwmMessageUserService.getMsgIdsByUserId(1L);
-        if (CollectionUtils.isEmpty(msgIds)){
+        if (CollectionUtils.isEmpty(msgIds)) {
             return;
         }
         List<Long> ids = reqVO.getMsgIds();
@@ -66,7 +65,7 @@ public class MessageService {
             kwmMessageService.readByMsgIds(list);
         } else {
             List<KwmMessage> messageList = kwmMessageService.getList(msgIds, reqVO.getCategory(), reqVO.getType(), 0);
-            if (CollectionUtils.isEmpty(messageList)){
+            if (CollectionUtils.isEmpty(messageList)) {
                 return;
             }
             List<Long> updateMsgIds = messageList.stream().map(KwmMessage::getId).toList();
@@ -76,17 +75,17 @@ public class MessageService {
     }
 
     /**
+     * @param reqVO
+     * @return void
      * @desc: 删除消息
      * @author: yzc
      * @date: 2023-06-09 14:20
-     * @param reqVO
-     * @return void
      */
     @Transactional(rollbackFor = Exception.class)
     public void delete(DeleteMessagesReqVO reqVO) {
         //TODO 当前线程获取用户id
         List<Long> msgIds = kwmMessageUserService.getMsgIdsByUserId(1L);
-        if (CollectionUtils.isEmpty(msgIds)){
+        if (CollectionUtils.isEmpty(msgIds)) {
             return;
         }
         List<Long> ids = reqVO.getMsgIds();
@@ -94,9 +93,9 @@ public class MessageService {
             List<Long> list = ids.stream().filter(msgIds::contains).toList();
             kwmMessageUserService.delByUserAndMsgIds(1L, list);
             kwmMessageService.delByMsgIds(list);
-        }else {
+        } else {
             List<KwmMessage> messageList = kwmMessageService.getList(msgIds, reqVO.getCategory(), reqVO.getType(), null);
-            if (CollectionUtils.isEmpty(messageList)){
+            if (CollectionUtils.isEmpty(messageList)) {
                 return;
             }
             List<Long> delMsgIds = messageList.stream().map(KwmMessage::getId).toList();
@@ -105,9 +104,15 @@ public class MessageService {
         }
     }
 
-    public String select(SelectMessagesReqVO reqVO) {
-
-
-        return null;
+    /**
+     * @param reqVO
+     * @return java.util.List<com.sckw.message.model.KwmMessage>
+     * @desc: 分页查询消息列表
+     * @author: yzc
+     * @date: 2023-06-13 9:05
+     */
+    public List<KwmMessage> select(SelectMessagesReqVO reqVO) {
+        //TODO 当前线程获取用户id
+        return kwmMessageService.findPage(1L, reqVO.getCategory(), reqVO.getType());
     }
 }

sckw-modules/sckw-message/src/main/resources/mapper/KwmMessageMapper.xml

@@ -0,0 +1,16 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+<mapper namespace="com.sckw.message.dao.KwmMessageMapper">
+
+  <select id="findPage" resultType="com.sckw.message.model.KwmMessage" >
+    select
+      m.id, m.category, m.type, m.title, m.content, m.url, m.params, m.client_type clientType, m.remark,
+      m.status, m.create_by createBy, m.create_time createTime, m.update_by updateBy, m.update_time updateTime
+    from kwm_message m
+    left join kwm_message_user mu
+    on m.id = mu.msg_id
+    where m.del_flag = 0 and mu.del_flag = 0 and mu.user_id = #{userId}
+      and m.category = #{category} and m.type = #{type}
+    ORDER BY m.status, m.create_time desc
+  </select>
+</mapper>