From 3b23ad399dce0408b1d7afc6fb961263bd2925fb Mon Sep 17 00:00:00 2001
From: forely <1605769034@qq.com>
Date: Thu, 8 May 2025 21:43:51 +0800
Subject: [PATCH] =?UTF-8?q?=E9=87=8D=E6=9E=84=E9=83=A8=E5=88=86=E8=A1=A8?=
 =?UTF-8?q?=E4=B8=8E=E6=8E=A5=E5=8F=A3=EF=BC=8C=E6=96=B0=E5=A2=9E=E5=B8=96?=
 =?UTF-8?q?=E5=AD=90=EF=BC=8C=E8=AF=84=E8=AE=BA=E7=9A=84=E7=9B=B8=E5=85=B3?=
 =?UTF-8?q?=E6=8E=A5=E5=8F=A3?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../modules/post/service/CommentService.java  |  4 ++-
 .../post/service/impl/CommentServiceImpl.java | 29 +++++++++----------
 2 files changed, 16 insertions(+), 17 deletions(-)

diff --git a/珞珈岛-项目相关文件/luojia-island/service/src/main/java/com/luojia_channel/modules/post/service/CommentService.java b/珞珈岛-项目相关文件/luojia-island/service/src/main/java/com/luojia_channel/modules/post/service/CommentService.java
index 71fd175..9523485 100644
--- a/珞珈岛-项目相关文件/luojia-island/service/src/main/java/com/luojia_channel/modules/post/service/CommentService.java
+++ b/珞珈岛-项目相关文件/luojia-island/service/src/main/java/com/luojia_channel/modules/post/service/CommentService.java
@@ -1,5 +1,7 @@
 package com.luojia_channel.modules.post.service;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.luojia_channel.common.domain.page.PageResponse;
+import com.luojia_channel.modules.post.dto.req.CommentPageQueryDTO;
 import com.luojia_channel.modules.post.dto.resp.CommentInfoDTO;
 import com.luojia_channel.modules.post.entity.Comment;
 import org.springframework.stereotype.Service;
@@ -15,7 +17,7 @@ public interface CommentService {
 
     void deleteComment(Long id, Long userId);
 
-    Page<CommentInfoDTO> getCommentsByPostId(Long postId, int pageNum, int pageSize);
+    PageResponse<CommentInfoDTO> getCommentsByPostId(CommentPageQueryDTO commentPageQueryDTO);
 
     List<CommentInfoDTO> getNestedCommentsByPostId(Long postId);
 }
diff --git a/珞珈岛-项目相关文件/luojia-island/service/src/main/java/com/luojia_channel/modules/post/service/impl/CommentServiceImpl.java b/珞珈岛-项目相关文件/luojia-island/service/src/main/java/com/luojia_channel/modules/post/service/impl/CommentServiceImpl.java
index 0bc9e08..f78d52a 100644
--- a/珞珈岛-项目相关文件/luojia-island/service/src/main/java/com/luojia_channel/modules/post/service/impl/CommentServiceImpl.java
+++ b/珞珈岛-项目相关文件/luojia-island/service/src/main/java/com/luojia_channel/modules/post/service/impl/CommentServiceImpl.java
@@ -1,11 +1,18 @@
 package com.luojia_channel.modules.post.service.impl;
 
 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
+import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.baomidou.mybatisplus.core.toolkit.Wrappers;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import com.luojia_channel.common.domain.page.PageResponse;
 import com.luojia_channel.common.exception.PostException;
+import com.luojia_channel.common.utils.PageUtil;
+import com.luojia_channel.modules.post.dto.req.CommentPageQueryDTO;
 import com.luojia_channel.modules.post.dto.resp.CommentInfoDTO;
+import com.luojia_channel.modules.post.dto.resp.PostBasicInfoDTO;
 import com.luojia_channel.modules.post.entity.Comment;
+import com.luojia_channel.modules.post.entity.Post;
 import com.luojia_channel.modules.post.mapper.CommentMapper;
 import com.luojia_channel.modules.post.service.CommentService;
 import lombok.RequiredArgsConstructor;
@@ -48,22 +55,12 @@ public class CommentServiceImpl extends ServiceImpl<CommentMapper, Comment> impl
     }
 
     @Override
-    public Page<CommentInfoDTO> getCommentsByPostId(Long postId, int pageNum, int pageSize) {
-        LambdaQueryWrapper<Comment> queryWrapper = new LambdaQueryWrapper<>();
-        queryWrapper.eq(Comment::getPostId, postId)
-                .isNull(Comment::getParentCommentId)
-                .orderByAsc(Comment::getCreateTime);
-
-        Page<Comment> page = new Page<>(pageNum, pageSize);
-        commentMapper.selectPage(page, queryWrapper);
-
-        Page<CommentInfoDTO> commentInfoDTOS = new Page<>();
-        BeanUtils.copyProperties(page, commentInfoDTOS, "records");
-
-        List<CommentInfoDTO> records = convertToDTO(page.getRecords());
-        commentInfoDTOS.setRecords(records);
-
-        return commentInfoDTOS;
+    public PageResponse<CommentInfoDTO> getCommentsByPostId(CommentPageQueryDTO commentPageQueryDTO) {
+        LambdaQueryWrapper<Comment> queryWrapper = Wrappers.lambdaQuery(Comment.class)
+                .eq(Comment::getPostId, commentPageQueryDTO.getPostId())
+                .orderByDesc(Comment::getCreateTime);
+        IPage<Comment> commentPage = commentMapper.selectPage(PageUtil.convert(commentPageQueryDTO), queryWrapper);
+        return PageUtil.convert(commentPage, CommentInfoDTO.class);
     }
 
     @Override