From 2a31d63a41d9000338207d3a1f64d7def718874c Mon Sep 17 00:00:00 2001
From: Cxx0822 <1556464090@qq.com>
Date: Mon, 30 Jun 2025 22:52:09 +0800
Subject: [PATCH] =?UTF-8?q?feat:=E5=A2=9E=E5=8A=A0=E6=9F=A5=E8=AF=A2?=
 =?UTF-8?q?=E4=B8=AA=E4=BA=BA=E6=9C=8B=E5=8F=8B=E5=9C=88=E6=8E=A5=E5=8F=A3?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../com/cxx/food/controller/MomentController.java | 12 +++++++++---
 src/main/java/com/cxx/food/dao/MomentDao.java     |  4 +++-
 .../java/com/cxx/food/service/MomentService.java  |  4 +++-
 .../cxx/food/service/impl/MomentServiceImpl.java  | 11 ++++++++---
 src/main/resources/mapper/MomentMapper.xml        | 15 ++++++++++++++-
 5 files changed, 37 insertions(+), 9 deletions(-)

diff --git a/src/main/java/com/cxx/food/controller/MomentController.java b/src/main/java/com/cxx/food/controller/MomentController.java
index ea92064..cddb48f 100644
--- a/src/main/java/com/cxx/food/controller/MomentController.java
+++ b/src/main/java/com/cxx/food/controller/MomentController.java
@@ -37,10 +37,16 @@ public class MomentController {
         return momentService.deleteMoment(id);
     }
 
-    @Operation(summary = "查询朋友圈")
+    @Operation(summary = "查询所有朋友圈")
     @GetMapping("")
-    public @JsonView(ReadView.class) List<MomentDto> queryMoment() {
-        return momentService.queryMoment();
+    public @JsonView(ReadView.class) List<MomentDto> queryMomentList() {
+        return momentService.queryMomentList();
+    }
+
+    @Operation(summary = "查询朋友圈")
+    @GetMapping("/{id}")
+    public @JsonView(ReadView.class) List<MomentDto> queryMomentById(@PathVariable("id") long id) {
+        return momentService.queryMomentById(id);
     }
 
     @Operation(summary = "新增评论")
diff --git a/src/main/java/com/cxx/food/dao/MomentDao.java b/src/main/java/com/cxx/food/dao/MomentDao.java
index 155e73a..87bc340 100644
--- a/src/main/java/com/cxx/food/dao/MomentDao.java
+++ b/src/main/java/com/cxx/food/dao/MomentDao.java
@@ -8,7 +8,9 @@ import java.util.List;
 
 @Mapper
 public interface MomentDao {
-    List<MomentDto> queryMoment();
+    List<MomentDto> queryMomentList();
+
+    List<MomentDto> queryMomentById(@Param("id") Long id);
 
     void insertMomentImage(@Param("momentId") Long momentId,
                            @Param("list") List<String> imageFiles);
diff --git a/src/main/java/com/cxx/food/service/MomentService.java b/src/main/java/com/cxx/food/service/MomentService.java
index 7f36dda..aae33c9 100644
--- a/src/main/java/com/cxx/food/service/MomentService.java
+++ b/src/main/java/com/cxx/food/service/MomentService.java
@@ -12,7 +12,9 @@ public interface MomentService {
 
     Boolean deleteMoment(Long id);
 
-    List<MomentDto> queryMoment();
+    List<MomentDto> queryMomentList();
+
+    List<MomentDto> queryMomentById(Long id);
 
     Boolean addComment(Long momentId, String content);
 
diff --git a/src/main/java/com/cxx/food/service/impl/MomentServiceImpl.java b/src/main/java/com/cxx/food/service/impl/MomentServiceImpl.java
index 18aa761..f4fbf32 100644
--- a/src/main/java/com/cxx/food/service/impl/MomentServiceImpl.java
+++ b/src/main/java/com/cxx/food/service/impl/MomentServiceImpl.java
@@ -70,9 +70,14 @@ public class MomentServiceImpl implements MomentService {
     }
 
     @Override
-    public List<MomentDto> queryMoment() {
+    public List<MomentDto> queryMomentList() {
         // TODO 只能查询好友的朋友圈
-        return momentDao.queryMoment();
+        return momentDao.queryMomentList();
+    }
+
+    @Override
+    public List<MomentDto> queryMomentById(Long id) {
+        return momentDao.queryMomentById(id);
     }
 
     @Override
@@ -114,7 +119,7 @@ public class MomentServiceImpl implements MomentService {
         queryWrapper.eq(MomentLike::getMomentId, momentId).eq(MomentLike::getCreateBy, StpUtil.getLoginIdAsString());
         MomentLike like = momentLikeMapper.selectOne(queryWrapper);
 
-        if (like == null ) {
+        if (like == null) {
             throw new CustomException("该朋友圈不存在");
         }
 
diff --git a/src/main/resources/mapper/MomentMapper.xml b/src/main/resources/mapper/MomentMapper.xml
index ebad015..2a80dde 100644
--- a/src/main/resources/mapper/MomentMapper.xml
+++ b/src/main/resources/mapper/MomentMapper.xml
@@ -44,7 +44,7 @@
         WHERE moment_id = #{id}
     </select>
 
-    <select id="queryMoment" resultMap="momentResultMap">
+    <select id="queryMomentList" resultMap="momentResultMap">
         SELECT a.id          AS id,
                b.id          AS userId,
                b.username    AS username,
@@ -56,6 +56,19 @@
         ORDER BY a.update_time DESC
     </select>
 
+    <select id="queryMomentById" resultMap="momentResultMap">
+        SELECT a.id          AS id,
+               b.id          AS userId,
+               b.username    AS username,
+               b.avatar      AS avatar,
+               a.content     AS content,
+               a.create_time AS date
+        FROM moment AS a
+                 LEFT JOIN user AS b ON a.create_by = b.id
+        WHERE a.create_by = #{id}
+        ORDER BY a.update_time DESC
+    </select>
+
     <select id="queryMomentImage" resultType="java.lang.String">
         SELECT image_url AS imageUrl
         FROM moment_image