Merge remote-tracking branch 'origin/feature/community-center' into feature/community-center

# Conflicts:
#	mcwl-communityCenter/src/main/java/com/mcwl/communityCenter/domain/vo/PublishVo.java
#	mcwl-communityCenter/src/main/java/com/mcwl/communityCenter/service/impl/PublishServiceImpl.java

mcwl-communityCenter/src/main/java/com/mcwl/communityCenter/domain/dto/PublishLikeRes.java

@@ -2,7 +2,9 @@ package com.mcwl.communityCenter.domain.dto;
 
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
+import lombok.AllArgsConstructor;
 import lombok.Data;
+import lombok.NoArgsConstructor;
 
 import javax.validation.constraints.NotNull;
 
@@ -11,6 +13,8 @@ import javax.validation.constraints.NotNull;
  */
 @Data
 @ApiModel(value = "点赞/取消点赞请求参数")
+@NoArgsConstructor
+@AllArgsConstructor
 public class PublishLikeRes {
 
     /**

mcwl-communityCenter/src/main/java/com/mcwl/communityCenter/domain/vo/PublishVo.java

@@ -75,6 +75,12 @@ public class PublishVo {
     @ApiModelProperty(value = "文件名")
     private String fileName;
 
+    /**
+     * 是否点赞
+     */
+    @ApiModelProperty(value = "是否点赞")
+    private Integer isLike;
+
     /**
      * 点赞数
      */

mcwl-communityCenter/src/main/java/com/mcwl/communityCenter/service/impl/PublishServiceImpl.java

@@ -23,10 +23,7 @@ import com.mcwl.communityCenter.domain.vo.CommentVo;
 import com.mcwl.communityCenter.domain.vo.PersonHomeVo;
 import com.mcwl.communityCenter.domain.vo.PublishVo;
 import com.mcwl.communityCenter.mapper.*;
-import com.mcwl.communityCenter.service.PublishCollectService;
-import com.mcwl.communityCenter.service.PublishCommentService;
-import com.mcwl.communityCenter.service.PublishService;
-import com.mcwl.communityCenter.service.QuestionService;
+import com.mcwl.communityCenter.service.*;
 import com.mcwl.system.service.ISysUserService;
 import lombok.RequiredArgsConstructor;
 import nonapi.io.github.classgraph.concurrency.AutoCloseableExecutorService;
@@ -55,6 +52,8 @@ public class PublishServiceImpl extends ServiceImpl<PublishMapper, Publish> impl
 
     private final PublishMapper publishMapper;
 
+    private final PublishLikeMapper publishLikeMapper;
+
     private final CommunityAdviceMapper communityAdviceMapper;
 
     private final QuestionService questionService;
@@ -225,6 +224,14 @@ public class PublishServiceImpl extends ServiceImpl<PublishMapper, Publish> impl
             publishVo.setUserName(sysUser.getNickName());
             publishVo.setAvatar(sysUser.getAvatar());
 
+            PublishLikeRes publishLikeRes = new PublishLikeRes(publishVo.getTenantId(), publishVo.getCommunityId(), publishVo.getId());
+            PublishLike publishLike = publishLikeMapper.selectPublishLike(publishLikeRes, SecurityUtils.getUserId());
+            if (Objects.nonNull(publishLike)) {
+                publishVo.setIsLike(1);
+            } else {
+                publishVo.setIsLike(0);
+            }
+
             PublishCollectRes publishCollectRes = new PublishCollectRes(publishVo.getTenantId(), publishVo.getCommunityId(), publishVo.getId());
             PublishCollect publishCollect = publishCollectService.getPublishCollect(publishCollectRes, SecurityUtils.getUserId());
             if (Objects.nonNull(publishCollect)) {