更新留言分页

gis_cms/src/main/java/com/gis/cms/mapper/CommentMapper.java

@@ -2,6 +2,8 @@ package com.gis.cms.mapper;
 
 
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.gis.common.base.entity.dto.PageDateDto;
 import com.gis.cms.entity.po.CommentEntity;
 import com.gis.cms.entity.vo.CommentVo;
@@ -19,8 +21,11 @@ import java.util.List;
 public interface CommentMapper extends BaseMapper<CommentEntity> {
 
 
+//    @SelectProvider(type = CommentProvider.class, method = "search")
+//    List<CommentVo> search(PageDateDto param, Integer display);
+
     @SelectProvider(type = CommentProvider.class, method = "search")
-    List<CommentVo> search(PageDateDto param, Integer display);
+    Page<CommentVo> pageSearch(PageDateDto param, Integer display, IPage page);
 
 
     @Select("select COUNT(id) from tb_comment where is_delete = 0 AND  DATE_FORMAT( create_time, '%Y%m%d' ) = DATE_FORMAT(#{date} , '%Y%m%d' ) ")

gis_cms/src/main/java/com/gis/cms/service/impl/CommentServiceImpl.java

@@ -25,6 +25,7 @@ import org.springframework.stereotype.Service;
 
 import java.time.LocalDate;
 import java.time.LocalDateTime;
+import java.util.Collections;
 import java.util.List;
 import java.util.Set;
 
@@ -119,17 +120,32 @@ public class CommentServiceImpl extends ServiceImpl<CommentMapper, CommentEntity
     public Result<CommentVo> voListTree(PageDateDto param, Integer display) {
 //        startPage(param);
 
-        BaseUtil.startPage(param);
-        List<CommentVo> search = baseMapper.search(param, display);
+//        BaseUtil.startPage(param);
+//        List<CommentVo> search = baseMapper.search(param, display);
+//
+//        Set<Object> filterKey = sensitiveService.getFilterKey();
+//        CommentTreeUtil commentTreeUtil = new CommentTreeUtil(search, filterKey);
+//        List<CommentTree> commentTrees = commentTreeUtil.buildTree();
 
-        Set<Object> filterKey = sensitiveService.getFilterKey();
-        CommentTreeUtil commentTreeUtil = new CommentTreeUtil(search, filterKey);
-        List<CommentTree> commentTrees = commentTreeUtil.buildTree();
 
 //        PageInfo<CommentTree> page = new PageInfo<>(commentTrees);
 //        return Result.success(page);
+
+
+        Page<CommentVo> voPage = baseMapper.pageSearch(param, display, iBaseService.initPage(param));
+        List<CommentVo> records = voPage.getRecords();
+                Set<Object> filterKey = sensitiveService.getFilterKey();
+        CommentTreeUtil commentTreeUtil = new CommentTreeUtil(records, filterKey);
+        List<CommentTree> commentTrees = commentTreeUtil.buildTree();
+
+        // 转换分页
+        Page<Object> resPage = new Page<>();
+        BeanUtils.copyProperties(voPage, resPage);
+        resPage.setRecords(Collections.singletonList(commentTrees));
+
+
         // todo 2022-08-12
-        return Result.success();
+        return Result.success(resPage);
     }
 
     @Override