点赞改查代码提交

snowy-plugin/snowy-plugin-disk/snowy-plugin-disk-func/src/main/java/vip/xiaonuo/disk/mapper/UserCommentMapper.java

@@ -29,8 +29,10 @@ import java.util.List;
  **/
 public interface UserCommentMapper extends BaseMapper<UserComment> {
     //查询父级的评论
-    Page<UserCommentVo> selectCommentPid(@Param("page") Page<Object> objectPage,@Param("resourceId") String resourceId);
+    Page<UserCommentVo> selectCommentPid(@Param("page") Page<Object> objectPage,@Param("resourceId") String resourceId,@Param("userId") String userId);
 
 
-    List<UserCommentVo> selectCommentNoPid(@Param("resourceId") String resourceId);
+    List<UserCommentVo> selectCommentNoPid(@Param("resourceId") String resourceId,@Param("userId") String userId);
+
+    List<UserCommentVo> queryListCount(String resourceId);
 }

snowy-plugin/snowy-plugin-disk/snowy-plugin-disk-func/src/main/java/vip/xiaonuo/disk/mapper/mapping/UserCommentMapper.xml

@@ -9,6 +9,7 @@
             a.user_id userId,
             a.comment_time,
             ifnull(a.give_num,0) giveNum,
+            (SELECT count(1) FROM  user_comment_give WHERE comment_id=4 AND user_id=#{userId}) giveNumSelf,
             b.name  userName
         FROM
             user_comment a LEFT JOIN  sys_user b ON a. user_id=b.id
@@ -26,6 +27,7 @@
             a.user_id userId,
             a.comment_time,
             a.give_num giveNum,
+            (SELECT count(1) FROM  user_comment_give WHERE comment_id=4 AND user_id=#{userId}) giveNumSelf,
             b.name  userName
         FROM
             user_comment a LEFT JOIN  sys_user b ON a. user_id=b.id
@@ -33,4 +35,11 @@
             resource_id=#{resourceId}
           and	pid IS NOT NULL
     </select>
+
+
+    <select id="queryListCount" resultType="vip.xiaonuo.disk.vo.comment.UserCommentVo">
+        SELECT * FROM user_comment WHERE resource_id=#{resourceId}  AND pid IS null
+    </select>
+
+
 </mapper>

snowy-plugin/snowy-plugin-disk/snowy-plugin-disk-func/src/main/java/vip/xiaonuo/disk/param/UserCommentPageParam.java

@@ -45,5 +45,8 @@ public class UserCommentPageParam {
     /** 资源id */
     @ApiModelProperty(value = "资源id")
     private String resourceId;
+    /** 用户id */
+    @ApiModelProperty(value = "用户id")
+    private String userId;
 
 }

snowy-plugin/snowy-plugin-disk/snowy-plugin-disk-func/src/main/java/vip/xiaonuo/disk/service/impl/UserCommentServiceImpl.java

@@ -57,8 +57,9 @@ public class UserCommentServiceImpl extends ServiceImpl<UserCommentMapper, UserC
 
     @Override
     public Page<UserCommentVo> page(UserCommentPageParam userCommentPageParam) {
-        Page<UserCommentVo> page=userCommentMapper.selectCommentPid(CommonPageRequest.defaultPage(),userCommentPageParam.getResourceId());
-        List<UserCommentVo> list=userCommentMapper.selectCommentNoPid(userCommentPageParam.getResourceId());
+
+        Page<UserCommentVo> page=userCommentMapper.selectCommentPid(CommonPageRequest.defaultPage(),userCommentPageParam.getResourceId(),StpLoginUserUtil.getLoginUser().getId());
+        List<UserCommentVo> list=userCommentMapper.selectCommentNoPid(userCommentPageParam.getResourceId(),StpLoginUserUtil.getLoginUser().getId());
         page.getRecords().stream().forEach(item -> {
             List<UserCommentVo> child= list.stream().filter(itemchild-> itemchild.getPid().equals(item.getId())).collect(Collectors.toList());
             item.setChild(child);
@@ -70,7 +71,7 @@ public class UserCommentServiceImpl extends ServiceImpl<UserCommentMapper, UserC
     @Override
     public List<UserCommentVo> queryList(String resourceId)
     {
-        List<UserCommentVo> list=userCommentMapper.selectCommentNoPid(resourceId);
+        List<UserCommentVo> list=userCommentMapper.queryListCount(resourceId);
         return list;
     }
 

snowy-plugin/snowy-plugin-disk/snowy-plugin-disk-func/src/main/java/vip/xiaonuo/disk/vo/comment/UserCommentVo.java

@@ -69,6 +69,8 @@ public class UserCommentVo {
     @TableField(fill = FieldFill.UPDATE)
     private String updateUser;
 
+    /** 查询对这个评论点没点过赞 */
+    private Integer giveNumSelf;
 
     private Integer childSize;