Dynami(update)

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

 package com.mmc.csf.release.forum.vo;
 
+import com.mmc.csf.release.gambit.dto.ForumGambitDTO;
+import com.mmc.csf.release.gambit.vo.ForumGambitVO;
 import com.mmc.csf.release.model.group.Create;
 import com.mmc.csf.release.model.group.Update;
 import io.swagger.annotations.ApiModelProperty;
@@ -79,6 +81,9 @@ public class DynamicVO implements Serializable {
   @ApiModelProperty("评论")
   private ForumReviewVO forumReviewVO;
 
+  @ApiModelProperty(value = "话题列表")
+  private List<ForumGambitDTO> forumGambitDTOList;
+
 
 
 }

release-service/src/main/java/com/mmc/csf/release/controller/DynamicController.java

@@ -82,10 +82,11 @@ public class DynamicController extends BaseController {
     @GetMapping("/dynamicList")
     public ResultBody<DynamicVO> dynamicList(
             @RequestParam Integer pageNo, @RequestParam Integer pageSize, HttpServletRequest request,
-            @RequestParam(required = false) Integer gambitId,@RequestParam(required = false) Integer id) {
+            @RequestParam(required = false) Integer gambitId,@RequestParam(required = false) Integer id,
+            @RequestParam(required = false) Integer userAccountId) {
         return ResultBody.success(
                 dynamicService.dynamicList(
-                        pageNo, pageSize, this.getUserLoginInfoFromRedis(request).getUserAccountId(), request,gambitId,id));
+                        pageNo, pageSize, this.getUserLoginInfoFromRedis(request).getUserAccountId(), request,gambitId,id,userAccountId));
     }
 
 

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

@@ -79,7 +79,7 @@ public interface DynamicDao {
      *
      * @return int
      */
-    int countDynamicList(Integer id);
+    int countDynamicList(Integer id,Integer userAccountIds);
 
     /**
      * 动态列表
@@ -88,7 +88,7 @@ public interface DynamicDao {
      * @param pageSize  页面大小
      * @return {@link List}<{@link ForumDynamicDO}>
      */
-    List<ForumDynamicDO> dynamicList(int itemIndex, Integer pageSize,Integer id);
+    List<ForumDynamicDO> dynamicList(int itemIndex, Integer pageSize,Integer id,Integer userAccountIds);
 
     /**
      * 列表动态图片

release-service/src/main/java/com/mmc/csf/release/service/DynamicService.java

@@ -60,7 +60,7 @@ public interface DynamicService {
     ResultBody dynamicDetails(Integer dynamicId, Integer userId, HttpServletRequest request);
 
     PageResult dynamicList(
-            Integer pageNo, Integer pageSize, Integer userAccountId, HttpServletRequest request, Integer gambitId,Integer id);
+            Integer pageNo, Integer pageSize, Integer userAccountId, HttpServletRequest request, Integer gambitId,Integer id,Integer userId);
 
     ResultBody recentNewsList(Integer userAccountId);
 

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

@@ -225,7 +225,9 @@ public class DynamicServiceImpl implements DynamicService {
          }
             ArrayList<String> list = new ArrayList<>();
             List<ForumGambitDO> gambitDOS = dynamicDao.selectGambit(dynamicId);
-            for (ForumGambitDO gambitDO : gambitDOS) {
+        List<ForumGambitDTO> collect = gambitDOS.stream().map(ForumGambitDO::buildForumGambitDTO).collect(Collectors.toList());
+        dynamicVO.setForumGambitDTOList(collect);
+        for (ForumGambitDO gambitDO : gambitDOS) {
              list.add(gambitDO.getGambitName());
             }
         dynamicVO.setGambitName(list);
@@ -281,14 +283,13 @@ public class DynamicServiceImpl implements DynamicService {
 
     @Override
     public PageResult dynamicList(
-            Integer pageNo, Integer pageSize, Integer userId, HttpServletRequest request, Integer gambitId,Integer dynId) {
-        int count = dynamicDao.countDynamicList(dynId);
+            Integer pageNo, Integer pageSize, Integer userId, HttpServletRequest request, Integer gambitId,Integer dynId,Integer userAccountIds) {
+        int count = dynamicDao.countDynamicList(dynId,userAccountIds);
         if (count == 0) {
             return PageResult.buildPage(pageNo, pageSize, 0);
         }
         int itemIndex = (pageNo - 1) * pageSize;
-        List<ForumDynamicDO> forumDynamicList = dynamicDao.dynamicList(itemIndex, pageSize,dynId);
-
+        List<ForumDynamicDO> forumDynamicList = dynamicDao.dynamicList(itemIndex, pageSize,dynId,userAccountIds);
        for (ForumDynamicDO forumDynamicDO : forumDynamicList) {
             Integer dynamicId = forumDynamicDO.getDynamicId();
            ForumReviewVO forumReviewVO = gambitDao.selectForumReviewMessage(dynamicId);

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

@@ -217,7 +217,13 @@
     <select id="selectGambit" resultType="com.mmc.csf.release.entity.gambit.ForumGambitDO">
         SELECT DISTINCT
             gf.id,
-            gf.gambit_name
+            gf.gambit_name,
+            gf.gambit_icon,
+            gf.gambit_cover,
+            gf.post_count,
+            gf.gambit_property,
+            gf.user_account_id,
+            gf.discussion_count
         FROM
             forum_dynamic_gambit fdg
                 INNER JOIN forum_gambit gf
@@ -307,6 +313,10 @@
         <if test="id">
             and id=#{id}
         </if>
+        <if test="userAccountIds">
+            and user_account_id=#{userAccountIds}
+        </if>
+
 
     </select>
     <select id="dynamicList" resultType="com.mmc.csf.release.entity.forum.ForumDynamicDO">
@@ -328,6 +338,9 @@
         <if test="id!=null" >
         and id=#{id}
         </if>
+        <if test="userAccountIds!=null">
+            and user_account_id=#{userAccountIds}
+        </if>
         order by create_time desc
             LIMIT #{itemIndex}, #{pageSize}
     </select>