DynamicMapp(update)

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

 package com.mmc.csf.release.forum.vo;
 
+import com.mmc.csf.user.vo.UserAccountVO;
 import io.swagger.annotations.ApiModelProperty;
 import lombok.AllArgsConstructor;
 import lombok.Data;
@@ -47,6 +48,9 @@ public class ForumReviewVO implements Serializable {
     @ApiModelProperty(value = "pid")
     private Integer pid;
 
+    @ApiModelProperty(value = "用户信息")
+    private UserAccountVO userAccountVO;
+
 
 
 }

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

@@ -81,10 +81,11 @@ public class DynamicController extends BaseController {
     @ApiResponses({@ApiResponse(code = 200, message = "OK", response = DynamicVO.class)})
     @GetMapping("/dynamicList")
     public ResultBody<DynamicVO> dynamicList(
-            @RequestParam Integer pageNo, @RequestParam Integer pageSize, HttpServletRequest request) {
+            @RequestParam Integer pageNo, @RequestParam Integer pageSize, HttpServletRequest request,
+            @RequestParam(required = false) Integer gambitId) {
         return ResultBody.success(
                 dynamicService.dynamicList(
-                        pageNo, pageSize, this.getUserLoginInfoFromRedis(request).getUserAccountId(), request));
+                        pageNo, pageSize, this.getUserLoginInfoFromRedis(request).getUserAccountId(), request,gambitId));
     }
 
 

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

@@ -91,6 +91,8 @@ public class ForumDynamicDO extends BaseDO implements Serializable {
 
 
 
+
+
     public ForumDynamicDO(DynamicVO dynamicVO) {
         this.gambitIcon=dynamicVO.getGambitIcon();
         this.gambitCover=dynamicVO.getGambitCover();

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

@@ -8,6 +8,7 @@ import com.mmc.csf.release.forum.vo.ReplyToAReviewVO;
 import com.mmc.csf.release.gambit.qo.ForumGambitQO;
 import com.mmc.csf.release.gambit.qo.PostingLeaderboardQO;
 import com.mmc.csf.release.gambit.vo.ForumGambitVO;
+import io.swagger.models.auth.In;
 
 import javax.servlet.http.HttpServletRequest;
 
@@ -59,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 pageNo, Integer pageSize, Integer userAccountId, HttpServletRequest request, Integer gambitId);
 
     ResultBody recentNewsList(Integer userAccountId);
 

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

@@ -26,6 +26,7 @@ import com.mmc.csf.release.service.DynamicService;
 import com.mmc.csf.release.service.WxApiService;
 import com.mmc.csf.release.service.gambit.GambitService;
 import com.mmc.csf.user.vo.UserAccountVO;
+import io.swagger.models.auth.In;
 import org.apache.commons.collections4.CollectionUtils;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.beans.factory.annotation.Value;
@@ -264,7 +265,7 @@ public class DynamicServiceImpl implements DynamicService {
 
     @Override
     public PageResult dynamicList(
-            Integer pageNo, Integer pageSize, Integer userId, HttpServletRequest request) {
+            Integer pageNo, Integer pageSize, Integer userId, HttpServletRequest request, Integer gambitId) {
         int count = dynamicDao.countDynamicList();
         if (count == 0) {
             return PageResult.buildPage(pageNo, pageSize, 0);
@@ -276,13 +277,24 @@ public class DynamicServiceImpl implements DynamicService {
             Integer dynamicId = forumDynamicDO.getDynamicId();
            ForumReviewVO forumReviewVO = gambitDao.selectForumReviewMessage(dynamicId);
             forumDynamicDO.setForumReviewVO(forumReviewVO);
-        }
+            if (forumReviewVO!=null){
+                Integer userAccountId = forumReviewVO.getUserAccountId();
+                UserAccountVO info = info(userAccountId);
+                forumReviewVO.setUserAccountVO(info);
+            }
+       }
         for (ForumDynamicDO forumDynamicDO : forumDynamicList) {
             Integer id = forumDynamicDO.getDynamicId();
             ArrayList<String> list = new ArrayList<>();
             List<ForumGambitDO> gambitDOS = dynamicDao.selectGambit(id);
             for (ForumGambitDO gambitDO : gambitDOS) {
-                list.add(gambitDO.getGambitName());
+                if (gambitId!=null){
+                    if (gambitDO.getId().equals(gambitId)){
+                        list.add(gambitDO.getGambitName());
+                    }
+                }else{
+                    list.add(gambitDO.getGambitName());
+                }
             }
             forumDynamicDO.setGambitName(list);
         }
@@ -369,6 +381,13 @@ public class DynamicServiceImpl implements DynamicService {
                                     return dynamicVO;
                                 })
                         .collect(Collectors.toList());
+
+        if (gambitId!=null){
+            dynamicVOList = dynamicVOList.stream().filter(t -> t.getGambitName().size()!=0).collect(Collectors.toList());
+           count=dynamicVOList.size();
+        }
+
+
         return PageResult.buildPage(pageNo, pageSize, count, dynamicVOList);
     }