优化动态列表信息返回

csf-common/csf-common-model/src/main/java/com/mmc/csf/release/auth/qo/BUserAccountQO.java

+package com.mmc.csf.release.auth.qo;
+
+import com.mmc.csf.release.model.group.Page;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.AllArgsConstructor;
+import lombok.Data;
+import lombok.NoArgsConstructor;
+
+import javax.validation.constraints.Min;
+import javax.validation.constraints.NotNull;
+import java.io.Serializable;
+import java.util.List;
+
+/**
+ * @author: zj
+ * @Date: 2023/5/25 13:32
+ */
+@Data
+@AllArgsConstructor
+@NoArgsConstructor
+public class BUserAccountQO implements Serializable {
+    private static final long serialVersionUID = 1L;
+    @ApiModelProperty(value = "关键字", required = false)
+    private String keyword;
+
+    @ApiModelProperty(value = "地区", required = false)
+    private String area;
+
+    @ApiModelProperty(value = "省份编码", required = false)
+    private Integer provinceCode;
+
+    @ApiModelProperty(value = "城市编码", required = false)
+    private Integer cityCode;
+
+    @ApiModelProperty(value = "县区编码", required = false)
+    private Integer districtCode;
+
+    @ApiModelProperty(value = "角色id", required = false)
+    private Integer roleId;
+
+    @ApiModelProperty(value = "账号状态：0禁用 1可用")
+    private Integer accountStatus;
+
+    @ApiModelProperty(value = "账号状态：0合伙人 1员工")
+    private Integer userType;
+
+    @ApiModelProperty(value = "用户id集合")
+    private List<Integer> userIds;
+
+    @ApiModelProperty(value = "推荐单位id")
+    private Integer rcdCompanyId;
+
+    @ApiModelProperty(value="单位集合", hidden = true)
+    private List<Integer> companys;
+
+    @ApiModelProperty(value = "页码", required = true)
+    @NotNull(message = "页码不能为空", groups = Page.class)
+    @Min(value = 1, groups = Page.class)
+    private Integer pageNo;
+
+    @ApiModelProperty(value = "每页显示数", required = true)
+    @NotNull(message = "每页显示数不能为空", groups = Page.class)
+    @Min(value = 1, groups = Page.class)
+    private Integer pageSize;
+
+    public void buildCurrentPage() {
+        this.pageNo = (pageNo - 1) * pageSize;
+    }
+}

release-service/src/main/java/com/mmc/csf/release/feign/UserAppApi.java

 package com.mmc.csf.release.feign;
 
 import com.mmc.csf.infomation.dto.UserAccountSimpleDTO;
+import com.mmc.csf.release.auth.qo.BUserAccountQO;
 import com.mmc.csf.release.feign.hystrix.UserAppApiHystrix;
+import io.swagger.annotations.ApiParam;
 import org.springframework.cloud.openfeign.FeignClient;
-import org.springframework.web.bind.annotation.GetMapping;
-import org.springframework.web.bind.annotation.RequestMapping;
-import org.springframework.web.bind.annotation.RequestMethod;
-import org.springframework.web.bind.annotation.RequestParam;
+import org.springframework.web.bind.annotation.*;
 
 import java.util.List;
 
@@ -34,4 +33,14 @@ public interface UserAppApi {
      */
     @GetMapping("/userapp/user-account/feignListUserAccountIds")
     List<Integer> feignListUserAccountIds(@RequestParam Integer provinceCode, @RequestParam Integer cityCode, @RequestParam Integer districtCode);
+
+
+    /**
+     * 获取用户集合列表页面
+     *
+     * @param bUserAccountQO 问:b用户帐户
+     * @return {@link List}<{@link UserAccountSimpleDTO}>
+     */
+    @GetMapping("/userapp/back-user/feignListBAccountPage")
+    List<UserAccountSimpleDTO> feignListBAccountPage(@ApiParam(value = "账号查询QO", required = true)  @RequestBody BUserAccountQO bUserAccountQO);
 }

release-service/src/main/java/com/mmc/csf/release/feign/hystrix/UserAppApiHystrix.java

 package com.mmc.csf.release.feign.hystrix;
 
 import com.mmc.csf.infomation.dto.UserAccountSimpleDTO;
+import com.mmc.csf.release.auth.qo.BUserAccountQO;
 import com.mmc.csf.release.feign.UserAppApi;
 import lombok.extern.slf4j.Slf4j;
 
@@ -23,4 +24,10 @@ public class UserAppApiHystrix implements UserAppApi {
         log.error("熔断：feignListUserAccountIds：{}， {}， {}", provinceCode, cityCode, districtCode);
         return null;
     }
+
+    @Override
+    public List<UserAccountSimpleDTO> feignListBAccountPage(BUserAccountQO bUserAccountQO) {
+        log.error("熔断：feignListBAccountPage：{}", bUserAccountQO);
+        return null;
+    }
 }

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

@@ -3,14 +3,15 @@ package com.mmc.csf.release.service.impl;
 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.feign.UserAppApi;
-import com.mmc.csf.release.forum.vo.*;
+import com.mmc.csf.release.auth.qo.BUserAccountQO;
 import com.mmc.csf.release.dao.CommentDAO;
 import com.mmc.csf.release.dao.DynamicDAO;
 import com.mmc.csf.release.dao.LikeDAO;
 import com.mmc.csf.release.entity.ForumDynamicDO;
 import com.mmc.csf.release.entity.ForumImageDO;
 import com.mmc.csf.release.entity.ForumVideoDO;
+import com.mmc.csf.release.feign.UserAppApi;
+import com.mmc.csf.release.forum.vo.*;
 import com.mmc.csf.release.service.DynamicService;
 import org.apache.commons.collections4.CollectionUtils;
 import org.springframework.beans.factory.annotation.Autowired;
@@ -22,6 +23,7 @@ import java.util.ArrayList;
 import java.util.HashMap;
 import java.util.List;
 import java.util.Map;
+import java.util.function.Function;
 import java.util.stream.Collectors;
 
 /**
@@ -145,6 +147,11 @@ public class DynamicServiceImpl implements DynamicService {
         Map<Integer, List<ForumImageDO>> ImageMap = forumImageList.stream().collect(Collectors.groupingBy(ForumImageDO::getDynamicId));
         // 获取视频信息
         List<ForumVideoDO> forumVideoList = dynamicDAO.listDynamicVideo(ids);
+        List<Integer> userIds = forumDynamicList.stream().map(d -> d.getUserId()).collect(Collectors.toList());
+        BUserAccountQO bUserAccountQO = new BUserAccountQO();
+        bUserAccountQO.setUserIds(userIds);
+        List<UserAccountSimpleDTO> userAccountSimpleDTOS = userAppApi.feignListBAccountPage(bUserAccountQO);
+        Map<Integer, UserAccountSimpleDTO> userAccountInfoMap = userAccountSimpleDTOS.stream().collect(Collectors.toMap(UserAccountSimpleDTO::getId, Function.identity()));
         List<DynamicVO> dynamicVOList = forumDynamicList.stream()
                 .map(d -> {
                     MediaVO mediaVO = new MediaVO();
@@ -158,12 +165,14 @@ public class DynamicServiceImpl implements DynamicService {
                         }
                     }
                     DynamicVO dynamicVO = d.buildDynamicVO();
-                    UserAccountSimpleDTO userAccountSimpleDTO = userAppApi.feignGetUserSimpleInfo(d.getUserId());
-                    UserBaseInfoVO userBaseInfoVO = new UserBaseInfoVO();
-                    userBaseInfoVO.setId(d.getUserId());
-                    userBaseInfoVO.setNickName(userAccountSimpleDTO.getNickName());
-                    userBaseInfoVO.setUserImg(userAccountSimpleDTO.getUserImg());
-                    dynamicVO.setUserBaseInfo(userBaseInfoVO);
+                    UserAccountSimpleDTO userAccountSimpleDTO = userAccountInfoMap.get(d.getUserId());
+                    if (userAccountSimpleDTO != null){
+                        UserBaseInfoVO userBaseInfoVO = new UserBaseInfoVO();
+                        userBaseInfoVO.setId(d.getUserId());
+                        userBaseInfoVO.setNickName(userAccountSimpleDTO.getNickName());
+                        userBaseInfoVO.setUserImg(userAccountSimpleDTO.getUserImg());
+                        dynamicVO.setUserBaseInfo(userBaseInfoVO);
+                    }
                     dynamicVO.setMediaVO(mediaVO);
                     // 设置是否点赞
                     boolean liked = likeDAO.isLiked(userId, d.getId());