Browse Source

优化@人代码

fangqing 3 months ago
parent
commit
15f603f87e

+ 3 - 0
ruoyi-generator/src/main/java/com/ruoyi/generator/vo/CommentVo.java

@@ -18,6 +18,7 @@ import java.util.Date;
 public class CommentVo {
 public class CommentVo {
     @JsonSerialize(using = ToStringSerializer.class)
     @JsonSerialize(using = ToStringSerializer.class)
     private Long id;
     private Long id;
+    private Long joinId;
     private Long userId;
     private Long userId;
     private int type;
     private int type;
     private Long articleId;
     private Long articleId;
@@ -28,4 +29,6 @@ public class CommentVo {
     private String content;
     private String content;
     private boolean isRead;
     private boolean isRead;
     private String imageUrl;
     private String imageUrl;
+    private boolean isLike;
+
 }
 }

+ 16 - 5
ruoyi-generator/src/main/resources/mapper/community/CommunityArticleCommentMapper.xml

@@ -219,6 +219,7 @@
     <select id="getCommentListByUserId" resultType="com.ruoyi.generator.vo.CommentVo">
     <select id="getCommentListByUserId" resultType="com.ruoyi.generator.vo.CommentVo">
         SELECT
         SELECT
             c.id,
             c.id,
+            c.joinId,
             c.article_id,
             c.article_id,
             c.user_id,
             c.user_id,
             c.image_url,
             c.image_url,
@@ -231,6 +232,7 @@
         FROM (
         FROM (
                  SELECT
                  SELECT
                      cac.id,
                      cac.id,
+                     cac.id as joinId,
                      cac.article_id,
                      cac.article_id,
                      (SELECT cai.image_url FROM community_article_images cai WHERE cac.article_id = cai.article_id AND (cai.is_delete IS NULL OR cai.is_delete != 1) ORDER BY cai.create_time DESC LIMIT 1) AS image_url,
                      (SELECT cai.image_url FROM community_article_images cai WHERE cac.article_id = cai.article_id AND (cai.is_delete IS NULL OR cai.is_delete != 1) ORDER BY cai.create_time DESC LIMIT 1) AS image_url,
             '8' AS type,
             '8' AS type,
@@ -239,7 +241,8 @@
             cac.user_id,
             cac.user_id,
             cac.create_time,
             cac.create_time,
             cac.content,
             cac.content,
-            cac.is_read
+            cac.is_read,
+            CASE WHEN EXISTS (SELECT 1 FROM community_comment_like cck WHERE cck.comment_id = cac.id AND cck.user_id = #{userId} ) THEN TRUE ELSE FALSE END AS isLike
         FROM community_article ca
         FROM community_article ca
             LEFT JOIN community_article_comment cac ON ca.id = cac.article_id
             LEFT JOIN community_article_comment cac ON ca.id = cac.article_id
             LEFT JOIN sys_user su ON cac.user_id = su.user_id
             LEFT JOIN sys_user su ON cac.user_id = su.user_id
@@ -254,6 +257,7 @@
 
 
         SELECT
         SELECT
             ccr.id,
             ccr.id,
+            ccr.id as joinId,
             cac.article_id,
             cac.article_id,
             (SELECT cai.image_url FROM community_article_images cai WHERE cac.article_id = cai.article_id AND (cai.is_delete IS NULL OR cai.is_delete != 1) ORDER BY cai.create_time DESC LIMIT 1) AS image_url,
             (SELECT cai.image_url FROM community_article_images cai WHERE cac.article_id = cai.article_id AND (cai.is_delete IS NULL OR cai.is_delete != 1) ORDER BY cai.create_time DESC LIMIT 1) AS image_url,
         '9' AS type,
         '9' AS type,
@@ -262,7 +266,8 @@
         ccr.user_id,
         ccr.user_id,
         ccr.create_time,
         ccr.create_time,
         ccr.content,
         ccr.content,
-        ccr.is_read
+        ccr.is_read,
+        CASE WHEN EXISTS (SELECT 1 FROM community_comment_like cck WHERE cck.reply_id = ccr.id AND cck.user_id = #{userId} ) THEN TRUE ELSE FALSE END AS isLike
         FROM community_article_comment cac
         FROM community_article_comment cac
             LEFT JOIN community_comment_reply ccr ON cac.id = ccr.comment_id
             LEFT JOIN community_comment_reply ccr ON cac.id = ccr.comment_id
             LEFT JOIN sys_user su ON ccr.user_id = su.user_id
             LEFT JOIN sys_user su ON ccr.user_id = su.user_id
@@ -277,6 +282,7 @@
 
 
         SELECT
         SELECT
             caa.id,
             caa.id,
+            caa.article_id as joinId,
             caa.article_id,
             caa.article_id,
             (SELECT cai.image_url FROM community_article_images cai WHERE caa.article_id = cai.article_id AND (cai.is_delete IS NULL OR cai.is_delete != 1) ORDER BY cai.create_time DESC LIMIT 1) AS image_url,
             (SELECT cai.image_url FROM community_article_images cai WHERE caa.article_id = cai.article_id AND (cai.is_delete IS NULL OR cai.is_delete != 1) ORDER BY cai.create_time DESC LIMIT 1) AS image_url,
         '5' AS type,
         '5' AS type,
@@ -285,7 +291,8 @@
         caa.peer_id as user_id,
         caa.peer_id as user_id,
         caa.create_time,
         caa.create_time,
         NULL AS content,
         NULL AS content,
-        caa.is_read
+        caa.is_read,
+        CASE WHEN EXISTS (SELECT 1 FROM community_like cl WHERE cl.article_id = caa.article_id AND cl.user_id = #{userId}) THEN TRUE ELSE FALSE END AS isLike
         FROM community_article_at caa
         FROM community_article_at caa
             LEFT JOIN sys_user su ON caa.user_id = su.user_id
             LEFT JOIN sys_user su ON caa.user_id = su.user_id
         WHERE caa.type = 0
         WHERE caa.type = 0
@@ -296,6 +303,7 @@
 
 
         SELECT
         SELECT
             caa.id,
             caa.id,
+            cac.id as joinId,
             caa.article_id,
             caa.article_id,
             (SELECT cai.image_url FROM community_article_images cai WHERE caa.article_id = cai.article_id AND (cai.is_delete IS NULL OR cai.is_delete != 1) ORDER BY cai.create_time DESC LIMIT 1) AS image_url,
             (SELECT cai.image_url FROM community_article_images cai WHERE caa.article_id = cai.article_id AND (cai.is_delete IS NULL OR cai.is_delete != 1) ORDER BY cai.create_time DESC LIMIT 1) AS image_url,
         '6' AS type,
         '6' AS type,
@@ -304,7 +312,8 @@
         caa.peer_id as user_id,
         caa.peer_id as user_id,
         caa.create_time,
         caa.create_time,
         cac.content,
         cac.content,
-        caa.is_read
+        caa.is_read,
+        CASE WHEN EXISTS (SELECT 1 FROM community_comment_like cck WHERE cck.comment_id = cac.id AND cck.user_id = #{userId}) THEN TRUE ELSE FALSE END AS isLike
         FROM community_article_at caa
         FROM community_article_at caa
             LEFT JOIN community_article_comment cac ON caa.comment_id = cac.id
             LEFT JOIN community_article_comment cac ON caa.comment_id = cac.id
             LEFT JOIN sys_user su ON caa.user_id = su.user_id
             LEFT JOIN sys_user su ON caa.user_id = su.user_id
@@ -317,6 +326,7 @@
 
 
         SELECT
         SELECT
             caa.id,
             caa.id,
+            ccr.id as joinId,
             caa.article_id,
             caa.article_id,
             (SELECT cai.image_url FROM community_article_images cai WHERE caa.article_id = cai.article_id AND (cai.is_delete IS NULL OR cai.is_delete != 1) ORDER BY cai.create_time DESC LIMIT 1) AS image_url,
             (SELECT cai.image_url FROM community_article_images cai WHERE caa.article_id = cai.article_id AND (cai.is_delete IS NULL OR cai.is_delete != 1) ORDER BY cai.create_time DESC LIMIT 1) AS image_url,
         '7' AS type,
         '7' AS type,
@@ -325,7 +335,8 @@
         caa.peer_id as user_id,
         caa.peer_id as user_id,
         caa.create_time,
         caa.create_time,
         ccr.content,
         ccr.content,
-        caa.is_read
+        caa.is_read,
+        CASE WHEN EXISTS (SELECT 1 FROM community_comment_like cck WHERE cck.reply_id = ccr.id AND cck.user_id = #{userId}) THEN TRUE ELSE FALSE END AS isLike
         FROM community_article_at caa
         FROM community_article_at caa
             LEFT JOIN community_comment_reply ccr ON caa.reply_id = ccr.id
             LEFT JOIN community_comment_reply ccr ON caa.reply_id = ccr.id
             LEFT JOIN sys_user su ON caa.user_id = su.user_id
             LEFT JOIN sys_user su ON caa.user_id = su.user_id