fix message board display error bug

Author: martin-bian

dimple-modules/dimple-blog-front/dimple-blog-front-service/src/main/java/com/dimple/blog/front/service/entity/BlogComment.java

@@ -30,6 +30,10 @@ public class BlogComment extends BaseEntity {
      */
     private Long parentId;
 
+    private Long replyId;
+
+    private Long likeCount;
+
     /**
      * user head image
      */

dimple-modules/dimple-blog-front/dimple-blog-front-service/src/main/java/com/dimple/blog/front/service/mapper/BlogCommentMapper.java

@@ -36,4 +36,7 @@ public interface BlogCommentMapper {
      */
     List<BlogComment> selectBlogCommentList(BlogComment blogComment);
 
+    List<BlogComment> selectBlogCommentByParentIds(List<Long> ids);
+
+    int addCommentLikeCount(Long id);
 }

dimple-modules/dimple-blog-front/dimple-blog-front-service/src/main/java/com/dimple/blog/front/service/service/BlogCommentService.java

@@ -27,6 +27,10 @@ public interface BlogCommentService {
      */
     List<BlogCommentBO> selectBlogCommentList(BlogCommentBO blogComment);
 
+
+    List<BlogCommentBO> selectBlogCommentListWithSub(BlogCommentBO blogComment);
+
+
     /**
      * 新增
      *
@@ -35,4 +39,5 @@ public interface BlogCommentService {
      */
     int insertBlogComment(BlogCommentBO blogComment);
 
+    int addBlogCommentLikeCount(Long id);
 }

dimple-modules/dimple-blog-front/dimple-blog-front-service/src/main/java/com/dimple/blog/front/service/service/bo/BlogCommentBO.java

@@ -4,6 +4,8 @@
 import com.dimple.common.core.web.entity.BaseEntity;
 import lombok.Data;
 
+import java.util.List;
+
 
 /**
  * 对象 blog_comment
@@ -53,4 +55,12 @@ public class BlogCommentBO extends BaseEntity {
      */
     @Excel(name = "邮件")
     private String email;
+
+    private Long replyId;
+
+    private String replyUsername;
+
+    private Long likeCount;
+
+    private List<BlogCommentBO> subComments;
 }

dimple-modules/dimple-blog-front/dimple-blog-front-service/src/main/java/com/dimple/blog/front/service/service/impl/BlogCommentServiceImpl.java

@@ -1,5 +1,6 @@
 package com.dimple.blog.front.service.service.impl;
 
+import com.alibaba.nacos.shaded.com.google.common.collect.Lists;
 import com.dimple.blog.front.service.entity.BlogComment;
 import com.dimple.blog.front.service.mapper.BlogCommentMapper;
 import com.dimple.blog.front.service.service.BlogArticleService;
@@ -8,12 +9,14 @@
 import com.dimple.blog.front.service.service.bo.BlogCommentBO;
 import com.dimple.common.core.utils.DateUtils;
 import com.dimple.common.core.utils.bean.BeanMapper;
+import org.apache.commons.collections4.CollectionUtils;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 
 import java.util.Arrays;
 import java.util.List;
 import java.util.Map;
+import java.util.Objects;
 import java.util.stream.Collectors;
 
 /**
@@ -45,6 +48,33 @@ public List<BlogCommentBO> selectBlogCommentList(BlogCommentBO blogCommentBO) {
         return blogCommentBOS;
     }
 
+    @Override
+    public List<BlogCommentBO> selectBlogCommentListWithSub(BlogCommentBO blogCommentBO) {
+        List<BlogComment> blogCommentEntityList = blogCommentMapper.selectBlogCommentList(BeanMapper.convert(blogCommentBO, BlogComment.class));
+        if (CollectionUtils.isEmpty(blogCommentEntityList)) {
+            return Lists.newArrayList();
+        }
+        List<Long> ids = blogCommentEntityList.stream().map(e -> e.getId()).collect(Collectors.toList());
+        List<BlogComment> blogCommentByParentIds = blogCommentMapper.selectBlogCommentByParentIds(ids);
+        List<BlogCommentBO> resultList = BeanMapper.convertList(blogCommentEntityList, BlogCommentBO.class);
+        Map<Long, String> idUsernameMap = resultList.stream().collect(Collectors.toMap(BlogCommentBO::getId, BlogCommentBO::getUsername));
+        idUsernameMap.putAll(blogCommentByParentIds.stream().collect(Collectors.toMap(BlogComment::getId, BlogComment::getUsername)));
+        for (BlogCommentBO resultItem : resultList) {
+            List<BlogComment> subCommentList = blogCommentByParentIds.stream()
+                    .filter(e -> Objects.equals(e.getParentId(), resultItem.getId()))
+                    .collect(Collectors.toList());
+            if (CollectionUtils.isEmpty(subCommentList)) {
+                continue;
+            }
+            List<BlogCommentBO> subCommentBOList = BeanMapper.convertList(subCommentList, BlogCommentBO.class);
+            for (BlogCommentBO commentBO : subCommentBOList) {
+                commentBO.setReplyUsername(idUsernameMap.getOrDefault(commentBO.getReplyId(), "-"));
+            }
+            resultItem.setSubComments(subCommentBOList);
+        }
+        return resultList;
+    }
+
     private void fillCommentInfo(List<BlogCommentBO> blogCommentBOList) {
         List<Long> articleIds = blogCommentBOList.stream().map(BlogCommentBO::getArticleId).collect(Collectors.toList());
         Map<Long, String> articleIdAndTitleMap = blogArticleService.selectBlogArticleByIds(articleIds).stream().collect(Collectors.toMap(BlogArticleBO::getId, BlogArticleBO::getTitle));
@@ -60,4 +90,9 @@ public int insertBlogComment(BlogCommentBO blogCommentBO) {
         return blogCommentMapper.insertBlogComment(blogComment);
     }
 
+    @Override
+    public int addBlogCommentLikeCount(Long id) {
+        return blogCommentMapper.addCommentLikeCount(id);
+    }
+
 }

dimple-modules/dimple-blog-front/dimple-blog-front-web/src/main/java/com/dimple/blog/front/web/controller/BlogCommentController.java

@@ -34,7 +34,7 @@ public class BlogCommentController extends BaseController {
     public TableDataInfo list(BlogCommentVOParams blogComment) {
         startPage();
         BlogCommentBO blogCommentBO = BeanMapper.convert(blogComment, BlogCommentBO.class);
-        List<BlogCommentBO> list = blogCommentService.selectBlogCommentList(blogCommentBO);
+        List<BlogCommentBO> list = blogCommentService.selectBlogCommentListWithSub(blogCommentBO);
         return getDataTable(BeanMapper.convertList(list, BlogCommentVO.class));
     }
 
@@ -50,4 +50,9 @@ public AjaxResult add(@RequestBody BlogCommentVOParams blogComment) {
         return toAjax(blogCommentService.insertBlogComment(blogCommentBO));
     }
 
+    @PostMapping("likeCount/{id}")
+    public AjaxResult like(@PathVariable Long  id) {
+        return toAjax(blogCommentService.addBlogCommentLikeCount(id));
+    }
+
 }

dimple-modules/dimple-blog-front/dimple-blog-front-web/src/main/java/com/dimple/blog/front/web/controller/vo/BlogCommentVO.java

@@ -3,6 +3,8 @@
 import com.dimple.common.core.web.vo.params.BaseVOParams;
 import lombok.Data;
 
+import java.util.List;
+
 /**
  * BlogCommentVO
  *
@@ -42,4 +44,12 @@ public class BlogCommentVO extends BaseVOParams {
      * user email, if email is not null will reply when the comment has been replied
      */
     private String email;
+
+    private Long replyId;
+
+    private String replyUsername;
+
+    private Long likeCount;
+
+    private List<BlogCommentVO> subComments;
 }

dimple-modules/dimple-blog-front/dimple-blog-front-web/src/main/java/com/dimple/blog/front/web/controller/vo/params/BlogCommentVOParams.java

@@ -27,6 +27,8 @@ public class BlogCommentVOParams extends BaseVOParams {
      */
     private Long parentId;
 
+    private Long replyId;
+
     /**
      * user head image
      */

dimple-modules/dimple-blog-front/dimple-blog-front-web/src/main/resources/mapper/blog/front/BlogCommentMapper.xml

@@ -12,6 +12,8 @@
         <result property="headImage" column="head_image"/>
         <result property="content" column="content"/>
         <result property="email" column="email"/>
+        <result property="replyId" column="reply_id"/>
+        <result property="likeCount" column="like_count"/>
         <result property="createBy" column="create_by"/>
         <result property="createTime" column="create_time"/>
         <result property="updateBy" column="update_by"/>
@@ -26,6 +28,8 @@
                head_image,
                content,
                email,
+               reply_id,
+               like_count,
                create_by,
                create_time,
                update_by,
@@ -37,11 +41,13 @@
         <include refid="selectBlogCommentVo"/>
         <where>
             <if test="articleId != null ">and article_id = #{articleId}</if>
+            <if test="articleId == null ">and article_id &gt; 0</if>
             <if test="username != null  and username != ''">and username like concat('%', #{username}, '%')</if>
             <if test="parentId != null ">and parent_id = #{parentId}</if>
             <if test="headImage != null  and headImage != ''">and head_image = #{headImage}</if>
             <if test="content != null  and content != ''">and content = #{content}</if>
             <if test="email != null  and email != ''">and email = #{email}</if>
+            and reply_id &lt; 0
         </where>
     </select>
 
@@ -51,6 +57,16 @@
     </select>
 
 
+    <select id="selectBlogCommentByParentIds" resultMap="BlogCommentResult">
+        <include refid="selectBlogCommentVo"/>
+        where parent_id in
+        <foreach item="id" collection="collection" open="(" separator="," close=")">
+            #{id}
+        </foreach>
+        order by create_time desc
+    </select>
+
+
     <insert id="insertBlogComment" parameterType="BlogComment" useGeneratedKeys="true" keyProperty="id">
         insert into blog_comment
         <trim prefix="(" suffix=")" suffixOverrides=",">
@@ -60,6 +76,7 @@
             <if test="headImage != null">head_image,</if>
             <if test="content != null">content,</if>
             <if test="email != null">email,</if>
+            <if test="replyId != null">reply_id,</if>
             <if test="createBy != null">create_by,</if>
             <if test="createTime != null">create_time,</if>
             <if test="updateBy != null">update_by,</if>
@@ -72,11 +89,15 @@
             <if test="headImage != null">#{headImage},</if>
             <if test="content != null">#{content},</if>
             <if test="email != null">#{email},</if>
+            <if test="replyId != null">#{replyId},</if>
             <if test="createBy != null">#{createBy},</if>
             <if test="createTime != null">#{createTime},</if>
             <if test="updateBy != null">#{updateBy},</if>
             <if test="updateTime != null">#{updateTime},</if>
         </trim>
     </insert>
+    <insert id="addCommentLikeCount">
+        update blog_comment set like_count=like_count+1 where id =#{id}
+    </insert>
 
 </mapper>

dimple-ui-blog/src/api/messageBoard.js

@@ -4,17 +4,24 @@ import request from "@/utils/request";
 export default {
   getMessageBoard(query) {
     return request({
-      url: "/blog-front/category/list",
+      url: "/blog-front/comment/list",
       method: "get",
       params: query
     });
   },
 
-  likeMessageBoard(query) {
+  saveMessageBoard(data) {
     return request({
-      url: "/blog-front/category/list",
-      method: "get",
-      params: query
+      url: "/blog-front/comment",
+      method: "post",
+      data: data
+    });
+  },
+
+  likeMessageBoard(id) {
+    return request({
+      url: "/blog-front/comment/likeCount/"+id,
+      method: "post",
     });
   }
 };