动态列表增加话题搜索和按照点赞数排序

csf-common/csf-common-model/src/main/java/com/mmc/csf/release/forum/dto/DynamicInfoDTO.java

@@ -47,5 +47,6 @@ public class DynamicInfoDTO {
     @ApiModelProperty(value = "话题名称",example = "#深圳暴雨,#深圳大雨")
     private List<String> gambitName;
 
-
+    @ApiModelProperty(value = "点赞数")
+    private Integer likesCount;
 }

csf-common/csf-common-model/src/main/java/com/mmc/csf/release/forum/qo/DynamicQO.java

 package com.mmc.csf.release.forum.qo;
 
 import com.mmc.csf.release.model.group.Page;
+import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
 
@@ -34,6 +35,9 @@ public class DynamicQO implements Serializable {
 
   @ApiModelProperty(value = "审核状态")
   private Integer status;
+
+  @ApiModelProperty(value = "话题Id")
+  private Integer gambitId;
   public void buildCurrentPage() {
     this.pageNo = (pageNo - 1) * pageSize;
   }

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

@@ -19,8 +19,8 @@ public interface BackstageForumDao {
       @Param("ids") List<Integer> ids,
       @Param("pageNo") int pageNo,
       @Param("pageSize") Integer pageSize,
-      @Param("status") Integer status
-
+      @Param("status") Integer status,
+      @Param("gambitId") Integer gambitId
   );
 
   /**

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

@@ -130,12 +130,14 @@ public class ForumDynamicDO extends BaseDO implements Serializable {
 
     public DynamicInfoDTO buildDynamicInfoDTO() {
         return DynamicInfoDTO.builder()
+
                 .id(this.getId())
                 .userAccountId(userAccountId)
                 .description(description)
                 .dynamicPublishTime(this.getCreateTime())
                 .show(this.getDeleted())
                 .checkStatus(checkStatus)
+                .likesCount(likesCount)
                 .gambitName(this.gambitName)
                 .build();
     }

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

@@ -77,7 +77,7 @@ public class BackstageForumServiceImpl implements BackstageForumService {
         int itemIndex = (dynamic.getPageNo() - 1) * dynamic.getPageSize();
         // 获取动态信息
         List<ForumDynamicDO> dynamicList =
-                backstageForumDao.listDynamicInfo(userIds, itemIndex, dynamic.getPageSize(),dynamic.getStatus());
+                backstageForumDao.listDynamicInfo(userIds, itemIndex, dynamic.getPageSize(),dynamic.getStatus(),dynamic.getGambitId());
         for (ForumDynamicDO forumDynamicDO : dynamicList) {
             Integer id = forumDynamicDO.getDynamicId();
             ArrayList<String> list = new ArrayList<>();

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

@@ -17,7 +17,8 @@
         </where>
     </select>
     <select id="listDynamicInfo" resultType="com.mmc.csf.release.entity.forum.ForumDynamicDO">
-        select id,user_account_id,description,is_deleted as deleted,create_time,check_status,id AS dynamicId from forum_dynamic
+        select fd.id,fd.user_account_id,description,is_deleted as deleted,fd.create_time,fd.likes_count,fd.check_status,fd.id AS dynamicId from forum_dynamic fd
+            left outer join forum_dynamic_gambit fdg on fd.id = fdg.dynamic_id
         <where>
             root_path is null
             <if test="ids != null">
@@ -27,11 +28,14 @@
                 </foreach>
             </if>
              <if test="status != null">
-                 and check_status = #{status}
-
+                 and fd.check_status = #{status}
              </if>
+            <if test="gambitId != null">
+                and fdg.gambit_id = #{gambitId}
+
+            </if>
         </where>
-        order by create_time desc
+        order by fd.likes_count desc
         limit #{pageNo},#{pageSize}
     </select>
     <select id="getDynamicAuditSum" resultType="java.lang.Integer">