合并

whole-estate/src/main/java/com/example/wholeestate/controller/CommentController.java

@@ -127,4 +127,14 @@ public class CommentController extends BaseController {
         return responseBean;
     }
 
+
+    @RequestMapping(value = "/comment/{commentId}", method = RequestMethod.GET)
+    @ApiOperation(value = "获取评论详情", notes = "获取评论详情")
+    @ApiImplicitParams({
+            @ApiImplicitParam(paramType = "path", dataTypeClass = String.class, name = "commentId",value = "评论id")
+    })
+    public ResponseBean selectCommentInfoId(@PathVariable("commentId") String commentId) {
+        ResponseBean  responseBean = iCommentService.selectCommentInfoId(commentId);
+        return responseBean;
+    }
 }

whole-estate/src/main/java/com/example/wholeestate/controller/WxUserController.java

@@ -14,6 +14,7 @@ import org.springframework.web.bind.annotation.*;
 @RequestMapping("/")
 @Api(value = "微信小程序 用户 API", description = "微信小程序 用户 API")
 public class WxUserController extends BaseController {
+    
 
     @Autowired
     private ICustomerService iCustomerService;

whole-estate/src/main/java/com/example/wholeestate/dao/CommentMapper.java

@@ -1,7 +1,12 @@
 package com.example.wholeestate.dao;
 
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.example.wholeestate.model.Comment;
+import org.apache.ibatis.annotations.Param;
+
+import java.util.Map;
 
 /**
  * <p>
@@ -12,5 +17,18 @@ import com.example.wholeestate.model.Comment;
  * @since 2019-03-20
  */
 public interface CommentMapper extends BaseMapper<Comment> {
+    /**
+     * 根据 类型 查询 评论列表
+     * @param page
+     * @param comment_type
+     * @return
+     */
+    IPage<Map<String, Object>> selectCommentListByType(Page page, @Param("comment_type") String comment_type);
 
+    /**
+     * 根据 评论id查询 评论信息
+     * @param commentId
+     * @return
+     */
+    Map<String, Object> selectCommentInfoId(@Param("commentId") String commentId);
 }

whole-estate/src/main/java/com/example/wholeestate/service/ICommentService.java

@@ -49,4 +49,12 @@ public interface ICommentService extends IService<Comment> {
      * @return
      */
     ResponseBean addWxComment(String openid,String parameter);
+
+    /**
+     * 根据 评论评论id 查询
+     * @param commentId
+     * @return
+     */
+    ResponseBean selectCommentInfoId(String commentId);
+
 }

whole-estate/src/main/java/com/example/wholeestate/service/impl/CommentServiceImpl.java

@@ -18,6 +18,7 @@ import org.springframework.stereotype.Service;
 
 import java.time.LocalDateTime;
 import java.util.List;
+import java.util.Map;
 
 /**
  * <p>
@@ -97,24 +98,58 @@ public class CommentServiceImpl extends ServiceImpl<CommentMapper, Comment> impl
         page.setCurrent(pageNum);
         page.setSize(pageSize);
 
-        QueryWrapper<Comment> commentQueryWrapper = new QueryWrapper<>();
-        commentQueryWrapper.eq("comment_type", commentType);
-        commentQueryWrapper.eq(StringUtils.isNotBlank(mainId),"main_id", mainId);
-        IPage<Comment> commentIPage = commentMapper.selectPage(page, commentQueryWrapper);
+//        QueryWrapper<Comment> commentQueryWrapper = new QueryWrapper<>();
+//        commentQueryWrapper.eq("comment_type", commentType);
+//        commentQueryWrapper.eq(StringUtils.isNotBlank(mainId),"main_id", mainId);
+        IPage<Map<String, Object>> commentIPage = commentMapper.selectCommentListByType(page, commentType);
+//                .selectPage(page, commentQueryWrapper);
         commentIPage.getRecords().forEach(e -> {
             // 查询图片
             QueryWrapper<CommentImg> queryCommentImgWrapper = new QueryWrapper<>();
-            queryCommentImgWrapper.eq("comment_id", e.getCommentId());
+            queryCommentImgWrapper.eq("comment_id", e.get("comment_id"));
             queryCommentImgWrapper.eq("status", 1);
             queryCommentImgWrapper.orderByAsc("order_no");
             List<CommentImg> commentImgs = commentImgMapper.selectList(queryCommentImgWrapper);
-            e.setCommentImgList(commentImgs);
+            e.put("img", commentImgs);
         });
 
         responseBean.addSuccess(commentIPage);
         return responseBean;
     }
 
+    @Override
+    public ResponseBean selectCommentInfoId(String commentId) {
+        ResponseBean responseBean = new ResponseBean();
+
+        Map<String, Object> comment = commentMapper.selectCommentInfoId(commentId);
+
+            // 查询图片
+        QueryWrapper<CommentImg> queryCommentImgWrapper = new QueryWrapper<>();
+        queryCommentImgWrapper.eq("comment_id", comment.get("comment_id"));
+        queryCommentImgWrapper.eq("status", 1);
+        queryCommentImgWrapper.orderByAsc("order_no");
+        List<CommentImg> commentImgs = commentImgMapper.selectList(queryCommentImgWrapper);
+        comment.put("img", commentImgs);
+
+        QueryWrapper<Comment> childCommentQuery = new QueryWrapper<>();
+        childCommentQuery.eq("parent_id", comment.get("comment_id"));
+        childCommentQuery.eq("status", 1);
+        List<Comment> childComments = commentMapper.selectList(childCommentQuery);
+        childComments.forEach(e -> {
+            // 查询图片
+            QueryWrapper<CommentImg> queryChildCommentImgWrapper = new QueryWrapper<>();
+            queryChildCommentImgWrapper.eq("comment_id", e.getCommentId());
+            queryChildCommentImgWrapper.eq("status", 1);
+            queryChildCommentImgWrapper.orderByAsc("order_no");
+            List<CommentImg> childCommentImgs = commentImgMapper.selectList(queryChildCommentImgWrapper);
+            e.setCommentImgList(childCommentImgs);
+        });
+        comment.put("childComment", childComments);
+
+        responseBean.addSuccess(comment);
+        return responseBean;
+    }
+
     @Override
     public ResponseBean getWxCommentList(String commentType, String mainId, Integer pageNum, Integer pageSize) {
         ResponseBean responseBean = new ResponseBean();
@@ -131,6 +166,7 @@ public class CommentServiceImpl extends ServiceImpl<CommentMapper, Comment> impl
         records.forEach(e -> {
             QueryWrapper<Comment> childCommentQuery = new QueryWrapper<>();
             childCommentQuery.eq("parent_id", e.getCommentId());
+            childCommentQuery.eq("status", 1);
             List<Comment> comments = commentMapper.selectList(childCommentQuery);
             e.setChildComment(comments);
 

whole-estate/src/main/resources/mapper/CommentMapper.xml

@@ -0,0 +1,34 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+<mapper namespace="com.example.wholeestate.dao.CommentMapper">
+    <select id="selectCommentListByType" resultType="map">
+        select a.*
+        <if test="comment_type != null and comment_type == 'activity'">
+            ,b.title,b.`desc`,b.activity_date as show_date
+            from ta_comment a inner join ta_activity b
+            on a.comment_type='activity' and a.main_id=b.activity_id
+        </if>
+        <if test="comment_type != null and comment_type == 'dynamic'">
+            ,b.title,b.`desc`,b.publish_date as show_date
+            from ta_comment a inner join ta_building_dynamic b
+            on a.comment_type='dynamic' and a.main_id=b.dynamic_id
+        </if>
+        <if test="comment_type == null || comment_type == ''">
+            from ta_comment a
+        </if>
+        <where>
+            a.status > -1 and (a.parent_id = '' or a.parent_id is null)
+        </where>
+    </select>
+
+    <select id="selectCommentInfoId" resultType="map">
+        select a.*,(case when a.comment_type='activity' then b.title else c.title end) as title,
+        (case when a.comment_type='activity' then b.desc else c.desc end) as `desc`
+         from ta_comment a left join ta_activity b on a.comment_type='activity' and a.main_id = b.activity_id
+        left join ta_building_dynamic c on a.comment_type='dynamic' and a.main_id=c.dynamic_id
+        <where>
+            a.status > -1 and a.comment_id=#{commentId}
+        </where>
+    </select>
+
+</mapper>