Merge branch 'develop'

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: 47a13343dd8403dd43cdbdbc151f2ffbda27ad70
+  newTag: 3091f41e782f14c17c403ad8e5eb91d761ada7b4

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

@@ -12,6 +12,7 @@ import lombok.Data;
 import lombok.NoArgsConstructor;
 
 import java.io.Serializable;
+import java.util.Date;
 import java.util.List;
 
 /**
@@ -54,12 +55,19 @@ public class ForumDynamicGambitDO implements Serializable {
     @ApiModelProperty(value = "媒体资源")
     private List<MediaVO> mediaVO;
 
+    @ApiModelProperty(value = "是否点赞")
+    private Boolean likes;
+
+    @ApiModelProperty(value = "动态发布时间")
+    private Date dynamicPublishTime;
+
 
 
 
 
     public DynamicVO buildForumDynamicGambitDTO(){
         return DynamicVO.builder()
+                .id(this.id)
                 .description(this.description)
                 .userAccountId(this.userAccountId)
                 .likesCount(this.likesCount)
@@ -68,6 +76,8 @@ public class ForumDynamicGambitDO implements Serializable {
                 .mediaVO(this.mediaVO)
                 .forumReviewVO(this.ForumReviewDO)
                 .forumGambitDTOList(this.forumGambitDOList)
+                .likes(this.likes)
+                .dynamicPublishTime(this.getDynamicPublishTime())
                 .build();
     }
 

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

@@ -224,7 +224,6 @@ public class GambitServiceImpl implements GambitService {
         List<ForumDynamicGambitDO> forumDynamicGambitDOS = gambitDao.userDynamicList(userTopicDynamicsQO);
         return PageResult.buildPage(pageNo, userTopicDynamicsQO.getPageSize(),count,forumDynamicGambitDOS);
     }
-
     @Override
     public PageResult liked(UserTopicDynamicsQO userTopicDynamicsQO, HttpServletRequest request) {
         Integer pageNo = userTopicDynamicsQO.getPageNo();
@@ -232,8 +231,6 @@ public class GambitServiceImpl implements GambitService {
         int count = gambitDao.likedCount(userTopicDynamicsQO);
         List<ForumDynamicGambitDO> forumDynamicGambitDOS = gambitDao.likedList(userTopicDynamicsQO);
         List<DynamicVO> collect = forumDynamicGambitDOS.stream().map(ForumDynamicGambitDO::buildForumDynamicGambitDTO).collect(Collectors.toList());
-
-
         List<Integer> userAccountIds =
                 collect.stream().map(DynamicVO::getUserAccountId).collect(Collectors.toList());
         UserAccountQO bUserAccountQO = new UserAccountQO();

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

@@ -51,6 +51,8 @@
         <result property="commentsCount" column="comments_count" />
         <result property="transpond" column="transpond"/>
         <result property="createTime" column="create_time"/>
+        <result property="likes" column="status"/>
+        <result property="dynamicPublishTime" column="create_time"/>
         <collection property="forumResourceDOList" ofType="com.mmc.csf.release.entity.forum.ForumResourceDO"
                     select="selectResourceList" column="{dynamicId=id}">
         </collection>
@@ -633,7 +635,8 @@
             fd.description,
             fd.likes_count,
             fd.comments_count,
-            fd.transpond
+            fd.transpond,
+            fl.status
         FROM
             forum_like fl
                 INNER JOIN forum_dynamic fd ON fl.dynamic_id = fd.id