佣金消息修改

src/main/java/com/ydtech/modules/message/controller/MessageSecretaryController.java

@@ -1,16 +1,17 @@
 package com.ydtech.modules.message.controller;
 
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.ydtech.core.page.HttpResult;
 import com.ydtech.modules.base.controller.BaseController;
 import com.ydtech.modules.message.entity.MessageSecretary;
+import com.ydtech.modules.message.entity.MessageSecretaryListQueryVo;
 import com.ydtech.modules.message.service.MessageSecretaryService;
 import io.swagger.annotations.Api;
 import lombok.RequiredArgsConstructor;
+import org.apache.poi.ss.formula.functions.T;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Controller;
-import org.springframework.web.bind.annotation.GetMapping;
-import org.springframework.web.bind.annotation.RequestMapping;
-import org.springframework.web.bind.annotation.RestController;
+import org.springframework.web.bind.annotation.*;
 
 import java.util.List;
 
@@ -35,9 +36,10 @@ public class MessageSecretaryController extends BaseController {
     /**
      * 获取用户消息列表
      */
-    @GetMapping("/getUserMessageList")
-    public HttpResult<List<MessageSecretary>> getUserMessageList(String msgType){
-        return HttpResult.ok(messageSecretaryService.getUserMessageList(getUserId(),msgType));
+    @PostMapping("/getUserMessageList")
+    public HttpResult<Page<MessageSecretary>> getUserMessageList(@RequestBody MessageSecretaryListQueryVo messageSecretaryListQueryVo){
+        Page page = buildPageRequest(messageSecretaryListQueryVo.getPageDto());
+        return HttpResult.ok(messageSecretaryService.getUserMessageList(page,getUserId(),messageSecretaryListQueryVo));
     }
 
 

src/main/java/com/ydtech/modules/message/entity/MessageSecretaryListQueryVo.java

@@ -0,0 +1,12 @@
+package com.ydtech.modules.message.entity;
+
+import com.ydtech.core.page.PageRequest;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+@Data
+public class MessageSecretaryListQueryVo extends PageRequest {
+
+    @ApiModelProperty("消息类型")
+    private String msgType;
+}

src/main/java/com/ydtech/modules/message/service/MessageSecretaryService.java

@@ -1,8 +1,10 @@
 package com.ydtech.modules.message.service;
 
 
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.ydtech.modules.message.constants.MessageTypeConstants;
 import com.ydtech.modules.message.entity.MessageSecretary;
+import com.ydtech.modules.message.entity.MessageSecretaryListQueryVo;
 
 import java.util.List;
 
@@ -18,10 +20,10 @@ public interface MessageSecretaryService {
     /**
      * 获取用户消息列表  根据消息类型返回消息列表
      * @param userId
-     * @param msgType
+     * @param messageSecretaryListQueryVo
      * @return
      */
-    List<MessageSecretary> getUserMessageList(String userId,String msgType);
+    Page<MessageSecretary> getUserMessageList(Page page, String userId, MessageSecretaryListQueryVo messageSecretaryListQueryVo);
 
     /**
      * 添加一条信息消息

src/main/java/com/ydtech/modules/message/service/impl/MessageSecretaryServiceImpl.java

@@ -1,10 +1,12 @@
 package com.ydtech.modules.message.service.impl;
 
 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import com.ydtech.modules.message.constants.MessageTypeConstants;
 import com.ydtech.modules.message.dao.MessageSecretaryMapper;
 import com.ydtech.modules.message.entity.MessageSecretary;
+import com.ydtech.modules.message.entity.MessageSecretaryListQueryVo;
 import com.ydtech.modules.message.service.MessageSecretaryService;
 import com.ydtech.utils.idgen.IdGenerate;
 import org.joda.time.DateTime;
@@ -29,14 +31,14 @@ public class MessageSecretaryServiceImpl extends ServiceImpl<MessageSecretaryMap
     /**
      * 获取用户消息列表  根据消息类型返回消息列表
      * @param userId
-     * @param msgType
+     * @param messageSecretaryListQueryVo
      * @return
      */
     @Override
-    public List<MessageSecretary> getUserMessageList(String userId, String msgType) {
-        return baseMapper.selectList(new LambdaQueryWrapper<MessageSecretary>()
-                .eq(MessageSecretary::getFromUser,userId)
-                .eq(MessageSecretary::getMsgType,msgType)
+    public Page<MessageSecretary> getUserMessageList(Page page, String userId, MessageSecretaryListQueryVo messageSecretaryListQueryVo) {
+        return baseMapper.selectPage(page,new LambdaQueryWrapper<MessageSecretary>()
+                .eq(MessageSecretary::getToUser,userId)
+                .eq(MessageSecretary::getMsgType,messageSecretaryListQueryVo.getMsgType())
                 .orderByDesc(MessageSecretary::getCreateTime));
     }