Gambit(update)

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

@@ -129,7 +129,7 @@ public class GambitController extends BaseController{
     @ApiOperation(value = "赞过")
     @PostMapping("/liked")
     public ResultBody<DynamicVO> liked(HttpServletRequest request, @RequestBody UserTopicDynamicsQO userTopicDynamicsQO){
-        return ResultBody.success(gambitService.liked(userTopicDynamicsQO));
+        return ResultBody.success(gambitService.liked(userTopicDynamicsQO,request));
     }
 
     @ApiOperation(value = "我的关注")

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

@@ -5,6 +5,8 @@ import com.mmc.csf.common.util.web.ResultBody;
 import com.mmc.csf.release.gambit.qo.*;
 import com.mmc.csf.release.gambit.vo.ForumGambitVO;
 
+import javax.servlet.http.HttpServletRequest;
+
 /**
  * @Author small
  * @Date 2023/9/13 15:30
@@ -35,7 +37,7 @@ public interface GambitService {
 
     PageResult userDynamicList(UserTopicDynamicsQO userTopicDynamicsQO);
 
-    PageResult liked(UserTopicDynamicsQO userTopicDynamicsQO);
+    PageResult liked(UserTopicDynamicsQO userTopicDynamicsQO, HttpServletRequest request);
 
     PageResult myInterestList(UserTopicDynamicsQO userTopicDynamicsQO);
 

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

@@ -4,12 +4,17 @@ import com.alibaba.fastjson.JSON;
 import com.alibaba.fastjson.JSONObject;
 import com.mmc.csf.common.util.page.PageResult;
 import com.mmc.csf.common.util.web.ResultBody;
+import com.mmc.csf.infomation.dto.UserAccountSimpleDTO;
+import com.mmc.csf.release.auth.qo.UserAccountQO;
+import com.mmc.csf.release.constant.TokenConstant;
 import com.mmc.csf.release.dao.DynamicDao;
 import com.mmc.csf.release.dao.gambit.GambitDao;
 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.feign.UserAppApi;
 import com.mmc.csf.release.forum.vo.DynamicVO;
+import com.mmc.csf.release.forum.vo.UserBaseInfoVO;
 import com.mmc.csf.release.gambit.dto.ForumDynamicGambitDTO;
 import com.mmc.csf.release.gambit.dto.ForumGambitDTO;
 import com.mmc.csf.release.gambit.qo.*;
@@ -22,7 +27,10 @@ import org.springframework.http.*;
 import org.springframework.stereotype.Service;
 import org.springframework.web.client.RestTemplate;
 
+import javax.servlet.http.HttpServletRequest;
+import java.util.ArrayList;
 import java.util.List;
+import java.util.Set;
 import java.util.stream.Collectors;
 
 /**
@@ -46,6 +54,9 @@ public class GambitServiceImpl implements GambitService {
     @Value("${iuav.userapp.url}")
     private String userApp;
 
+    @Autowired
+    private UserAppApi userAppApi;
+
     /**
      * 添加话题
      * @param forumGambitVO
@@ -200,12 +211,38 @@ public class GambitServiceImpl implements GambitService {
     }
 
     @Override
-    public PageResult liked(UserTopicDynamicsQO userTopicDynamicsQO) {
+    public PageResult liked(UserTopicDynamicsQO userTopicDynamicsQO, HttpServletRequest request) {
         Integer pageNo = userTopicDynamicsQO.getPageNo();
         userTopicDynamicsQO.buildCurrentPage();
         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();
+        bUserAccountQO.setUserIds(userAccountIds);
+        bUserAccountQO.setPageNo(1);
+        bUserAccountQO.setPageSize(999);
+        // 获取用户的信息
+        List<UserAccountSimpleDTO> userAccountSimpleDTOS =
+                userAppApi.feignListAppUserAccount(bUserAccountQO, request.getHeader(TokenConstant.TOKEN));
+
+        for (DynamicVO dynamicVO : collect) {
+            for (UserAccountSimpleDTO userAccountSimpleDTO : userAccountSimpleDTOS) {
+                if (dynamicVO.getUserAccountId().equals(userAccountSimpleDTO.getId())) {
+                    UserBaseInfoVO userBaseInfoVO = new UserBaseInfoVO();
+                    userBaseInfoVO.setNickName(userAccountSimpleDTO.getNickName());
+                    userBaseInfoVO.setUserImg(userAccountSimpleDTO.getUserImg());
+                    userBaseInfoVO.setUserName(userAccountSimpleDTO.getUserName());
+                    userBaseInfoVO.setPhone(userAccountSimpleDTO.getPhoneNum());
+                    userBaseInfoVO.setUid(userAccountSimpleDTO.getUid());
+                    dynamicVO.setUserBaseInfo(userBaseInfoVO);
+                    break;
+                }
+            }
+        }
         return PageResult.buildPage(pageNo, userTopicDynamicsQO.getPageSize(),count,collect);
     }
     @Override