Merge branch 'develop'

csf-common/csf-common-model/src/main/java/com/mmc/csf/release/forum/vo/DynamicVO.java

@@ -75,4 +75,9 @@ public class DynamicVO implements Serializable {
 
   @ApiModelProperty(value = "评论信息")
   private List<DynamicVO> commentAndReplyVO;
+
+  @ApiModelProperty("评论")
+  private ForumReviewVO forumReviewVO;
+
+
 }

csf-common/csf-common-model/src/main/java/com/mmc/csf/release/forum/vo/ForumReviewVO.java

+package com.mmc.csf.release.forum.vo;
+
+import io.swagger.annotations.ApiModelProperty;
+import lombok.AllArgsConstructor;
+import lombok.Data;
+import lombok.NoArgsConstructor;
+import lombok.experimental.Accessors;
+
+import java.io.Serializable;
+
+/**
+ * @Author small
+ * @Date 2023/9/23 16:21
+ * @Version 1.0
+ */
+@Data
+@AllArgsConstructor
+@NoArgsConstructor
+@Accessors(chain = true)
+public class ForumReviewVO implements Serializable {
+    private static final long serialVersionUID = 678578415154893126L;
+
+    @ApiModelProperty(value = "id")
+    private Integer id;
+
+    @ApiModelProperty(value = "用户id")
+    private Integer userAccountId;
+
+    @ApiModelProperty(value = "动态id")
+    private Integer dynamicId;
+
+    @ApiModelProperty(value = "评论内容")
+    private String content;
+
+    @ApiModelProperty(value = "回复id")
+    private Integer reviewId;
+
+    @ApiModelProperty(value = "评论点赞数")
+    private Integer likeCount;
+
+    @ApiModelProperty(value = "创建时间")
+    private String createTime;
+
+    @ApiModelProperty(value = "更新时间")
+    private String updateTime;
+
+    @ApiModelProperty(value = "pid")
+    private Integer pid;
+
+
+
+}

csf-common/csf-common-model/src/main/java/com/mmc/csf/release/gambit/qo/ForumGambitQO.java

@@ -38,6 +38,9 @@ public class ForumGambitQO {
     @ApiModelProperty(value = "话题属性 1普通 2热门 3推荐",example = "1")
     private Integer gambitProperty;
 
+    @ApiModelProperty(value = "话题gambitId",example = "1")
+    private Integer gambitId;
+
 
     /**
      * 初始化起始查询行并返回当前页

kustomization/overlays/dev/kustomization.yaml

@@ -18,4 +18,4 @@ patches:
 images:
 - name: REGISTRY/NAMESPACE/IMAGE:TAG
   newName: mmc-registry.cn-shenzhen.cr.aliyuncs.com/sharefly-dev/ims
-  newTag: 61c2ad045e5b55eb123e1c92662d5490ada54ff6
+  newTag: ea6c7437234915d2d68ef26d6d066727a096f273

release-service/src/main/java/com/mmc/csf/release/dao/gambit/GambitDao.java

@@ -3,6 +3,7 @@ package com.mmc.csf.release.dao.gambit;
 import com.mmc.csf.release.entity.forum.*;
 import com.mmc.csf.release.entity.gambit.ForumAttentionDO;
 import com.mmc.csf.release.entity.gambit.ForumGambitDO;
+import com.mmc.csf.release.forum.vo.ForumReviewVO;
 import com.mmc.csf.release.gambit.qo.*;
 import org.apache.ibatis.annotations.Mapper;
 
@@ -118,4 +119,6 @@ public interface GambitDao {
     ForumAttentionDO selectAttentionM(Integer userAccountId, Integer attentionUserAccountId);
 
     ForumCountDO userMessage(Integer userAccountId);
+
+    ForumReviewVO selectForumReviewMessage(Integer dynamicId);
 }

release-service/src/main/java/com/mmc/csf/release/entity/forum/ForumDynamicDO.java

@@ -6,6 +6,7 @@ import java.math.BigDecimal;
 import com.mmc.csf.release.entity.common.BaseDO;
 import com.mmc.csf.release.forum.dto.DynamicInfoDTO;
 import com.mmc.csf.release.forum.vo.DynamicVO;
+import com.mmc.csf.release.forum.vo.ForumReviewVO;
 import com.mmc.csf.release.model.group.Create;
 import com.mmc.csf.release.model.group.Update;
 import io.swagger.annotations.ApiModelProperty;
@@ -80,6 +81,9 @@ public class ForumDynamicDO extends BaseDO implements Serializable {
 
     private Integer dynamicId;
 
+    @ApiModelProperty("评论")
+    private ForumReviewVO forumReviewVO;
+
     public ForumDynamicDO(DynamicVO dynamicVO) {
         this.gambitIcon=dynamicVO.getGambitIcon();
         this.gambitCover=dynamicVO.getGambitCover();
@@ -102,6 +106,7 @@ public class ForumDynamicDO extends BaseDO implements Serializable {
                 .location(location)
                 .dynamicPublishTime(this.getCreateTime())
                 .gambitName(this.gambitName)
+                .forumReviewVO(this.forumReviewVO)
                 .build();
     }
 

release-service/src/main/java/com/mmc/csf/release/service/impl/DynamicServiceImpl.java

@@ -26,6 +26,7 @@ import com.mmc.csf.release.dao.DynamicDao;
 import com.mmc.csf.release.dao.LikeDAO;
 import com.mmc.csf.release.dao.gambit.GambitDao;
 import com.mmc.csf.release.entity.forum.*;
+import com.mmc.csf.release.entity.forum.ForumReviewDO;
 import com.mmc.csf.release.entity.gambit.ForumGambitDO;
 import com.mmc.csf.release.feign.UserAppApi;
 import com.mmc.csf.release.forum.vo.*;
@@ -268,6 +269,11 @@ public class DynamicServiceImpl implements DynamicService {
         int itemIndex = (pageNo - 1) * pageSize;
         List<ForumDynamicDO> forumDynamicList = dynamicDao.dynamicList(itemIndex, pageSize);
 
+       for (ForumDynamicDO forumDynamicDO : forumDynamicList) {
+            Integer dynamicId = forumDynamicDO.getDynamicId();
+           ForumReviewVO forumReviewVO = gambitDao.selectForumReviewMessage(dynamicId);
+            forumDynamicDO.setForumReviewVO(forumReviewVO);
+        }
         for (ForumDynamicDO forumDynamicDO : forumDynamicList) {
             Integer id = forumDynamicDO.getDynamicId();
             ArrayList<String> list = new ArrayList<>();

release-service/src/main/resources/mapper/forum/DynamicMapper.xml

@@ -193,6 +193,9 @@
         <if test="gambitProperty!=null">
             and  gambit_property=#{gambitProperty}
         </if>
+        <if test="gambitId!=null">
+            and id=#{gambitId}
+        </if>
         ORDER BY gambit_property desc,create_time DESC
         limit #{pageNo}, #{pageSize}
     </select>
@@ -205,7 +208,9 @@
         <if test="gambitProperty!=null">
             and  gambit_property=#{gambitProperty}
         </if>
-
+        <if test="gambitId!=null">
+            and id=#{gambitId}
+        </if>
         ORDER BY gambit_property,create_time DESC
     </select>
 

release-service/src/main/resources/mapper/gambit/GambitDao.xml

@@ -133,6 +133,27 @@
             LIMIT 0,1
     </select>
 
+
+    <select id="selectForumReviewMessage" resultType="com.mmc.csf.release.forum.vo.ForumReviewVO">
+        SELECT
+            id,
+            content,
+            user_account_id,
+            like_count,
+            dynamic_id,
+            create_time,
+            update_time,
+            pid,
+            review_id
+        FROM
+            forum_review
+        WHERE
+            dynamic_id = #{dynamicId}
+        GROUP BY
+            id
+            LIMIT 0,1
+    </select>
+
     <select id="selectResourceList" resultType="com.mmc.csf.release.entity.forum.ForumResourceDO">
         select dynamic_id,resource_url,create_time,update_time,`type` from  forum_resource where  dynamic_id=#{dynamicId}
     </select>