Merge remote-tracking branch 'origin/base-modify' into base-modify

xx-im/xx-im-server/src/main/java/com/xxfc/platform/im/biz/MsgBiz.java

@@ -3,7 +3,6 @@ package com.xxfc.platform.im.biz;
 
 import cn.hutool.core.bean.BeanUtil;
 import cn.hutool.core.bean.copier.CopyOptions;
-import com.github.pagehelper.PageHelper;
 import com.github.pagehelper.PageInfo;
 import com.github.wxiaoqi.security.admin.feign.dto.AppUserDTO;
 import com.github.wxiaoqi.security.admin.vo.ImiVo;
@@ -18,6 +17,8 @@ import com.xxfc.platform.im.vo.MsgVo;
 import lombok.extern.slf4j.Slf4j;
 import org.bson.types.ObjectId;
 import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.data.domain.PageRequest;
+import org.springframework.data.domain.Pageable;
 import org.springframework.data.domain.Sort;
 import org.springframework.data.mongodb.core.MongoTemplate;
 import org.springframework.data.mongodb.core.query.Criteria;
@@ -52,11 +53,11 @@ public class MsgBiz {
         log.info("获取消息列表： page = {}, limit = {}, type = {}", page, limit, type);
          page = page == null ? 1 : page;
          limit = limit == null ? 10 : limit;
-        PageHelper.startPage(page, limit);
+        Pageable pageable = PageRequest.of(--page, limit);
         Query query = null;
         List<Msg> msgList = null;
         if (type != null) {
-            query = new Query(Criteria.where("body.type").is(type));
+            query = new Query(Criteria.where("body.type").is(type)).with(pageable);
             msgList = fetchAndAttach(mongoTemplate.find(query, Msg.class, "s_msg"), userId);
             PageInfo<MsgVo> goodPageInfo = new PageInfo<>(replaceMsgResult(msgList));
             return ObjectRestResponse.succ(goodPageInfo);
@@ -64,7 +65,7 @@ public class MsgBiz {
             List<Integer> ids = new ArrayList<>();
             ids.add(2);
             ids.add(4);
-            query = new Query(Criteria.where("body.type").in(ids));
+            query = new Query(Criteria.where("body.type").in(ids)).with(pageable);
             msgList = fetchAndAttach(mongoTemplate.find(query, Msg.class, "s_msg"), userId);
             PageInfo<MsgVo> goodPageInfo = new PageInfo<>(replaceMsgResult(msgList));
             return ObjectRestResponse.succ(goodPageInfo);
@@ -76,11 +77,11 @@ public class MsgBiz {
         log.info("获取消息列表： page = {}, limit = {}, type = {}", page, limit);
         page = page == null ? 1 : page;
         limit = limit == null ? 10 : limit;
-        PageHelper.startPage(page, limit);
+        Pageable pageable = PageRequest.of(--page, limit);
         List<Integer> ids = new ArrayList<>();
         ids.add(2);
         ids.add(4);
-        Query query = new Query(Criteria.where("body.type").in(ids));
+        Query query = new Query(Criteria.where("body.type").in(ids)).with(pageable);
         query.with(new Sort(Sort.Direction.DESC, "count.praise"));
         List<Msg> msgList = mongoTemplate.find(query, Msg.class, "s_msg");
         PageInfo<MsgVo> goodPageInfo = new PageInfo<>(replaceMsgResult(msgList));