接口调整

community-api/src/main/java/com/tanpu/community/api/beans/ImagesDTO.java

@@ -16,4 +16,10 @@ public class ImagesDTO {
     private Integer relType;
 
     private String remark;
+
+    @ApiModelProperty("图片宽度")
+    private Integer imgHeight;
+
+    @ApiModelProperty("图片宽度")
+    private Integer imgWidth;
 }

community-api/src/main/java/com/tanpu/community/api/beans/qo/AttachmentDetailVo.java

+package com.tanpu.community.api.beans.qo;
+
+import com.tanpu.community.api.beans.vo.feign.CourseDetailExt;
+import com.tanpu.community.api.beans.vo.feign.ProductInfoVO;
+import com.tanpu.community.api.beans.vo.feign.ShortVideoBaseInfoResp;
+import com.tanpu.community.api.beans.vo.feign.ZhiboDetailVO;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+@Data
+@ApiModel(value = "附件对象")
+public class AttachmentDetailVo {
+
+    @ApiModelProperty(value = "产品")
+    private ProductInfoVO productInfoVO;
+
+    @ApiModelProperty(value = "直播")
+    private ZhiboDetailVO zhiboDetailVO;
+
+    @ApiModelProperty(value = "短视频")
+    private ShortVideoBaseInfoResp shortVideoBaseInfoResp;
+
+    @ApiModelProperty(value = "课程")
+    private CourseDetailExt courseDetailExt;
+
+}

community-api/src/main/java/com/tanpu/community/api/beans/qo/ThemeContentQo.java

@@ -18,6 +18,6 @@ public class ThemeContentQo {
     private String[] imgList;
 
     @ApiModelProperty(value = "对象详情")
-    private Object detail;
+    private AttachmentDetailVo detail;
 
 }

community-api/src/main/java/com/tanpu/community/api/beans/qo/ThemeFormerQo.java

@@ -24,5 +24,5 @@ public class ThemeFormerQo {
     private List<ThemeContentQo> forwardContent;
 
     @ApiModelProperty(value = "转发的图片九宫格")
-    private List<ImagesDTO> imgList;
+    private List<ImagesDTO> imageList;
 }

community-api/src/main/java/com/tanpu/community/api/beans/qo/ThemeQo.java

@@ -25,7 +25,7 @@ public class ThemeQo {
     private Integer themeType;
 
     @ApiModelProperty(value = "内容")
-    private ThemeContentQo content;
+    private List<ThemeContentQo> content;
 
 
 

community-api/src/main/java/com/tanpu/community/api/beans/req/homepage/QueryFollowReq.java

+package com.tanpu.community.api.beans.req.homepage;
+
+import com.tanpu.community.api.beans.req.page.Pageable;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+import javax.validation.constraints.NotEmpty;
+
+@Data
+@ApiModel(value = "查询关注/粉丝列表")
+public class QueryFollowReq {
+
+    @NotEmpty(message = "userId不能为空")
+    @ApiModelProperty(value = "用户Id")
+    private String userId;
+
+    @NotEmpty(message = "queryType不能为空")
+    @ApiModelProperty(value = "查询类型，1：粉丝 2：关注")
+    private Integer queryType;
+
+    @NotEmpty(message = "page不能为空")
+    @ApiModelProperty(value = "分页")
+    private Pageable page;
+}

community-api/src/main/java/com/tanpu/community/api/beans/req/homepage/QueryRecordThemeReq.java

+package com.tanpu.community.api.beans.req.homepage;
+
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+@Data
+@ApiModel(value = "查询历史操作主题列表")
+public class QueryRecordThemeReq {
+
+    @ApiModelProperty("用户Id")
+    private String userId;
+
+    @ApiModelProperty(value = "操作类型 1：发布 2：回复 3：点赞 4：收藏")
+    private Integer recordType;
+}

community-api/src/main/java/com/tanpu/community/api/beans/req/theme/ThemeContentReq.java

@@ -14,7 +14,7 @@ public class ThemeContentReq {
     @ApiModelProperty(value = "文本的值是内容，附件的值为id")
     private String value;
 
-    @ApiModelProperty(value = "产品类型")
+    @ApiModelProperty(value = "产品类型,0 公募，1 私募，2 白名单，3 私有")
     private Integer productType;
 
     @ApiModelProperty(value = "产品推荐语")

community-service/src/main/java/com/tanpu/community/feign/course/vo/ColumnVO.java → community-api/src/main/java/com/tanpu/community/api/beans/vo/feign/ColumnVO.java

-package com.tanpu.community.feign.course.vo;
+package com.tanpu.community.api.beans.vo.feign;
 
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;

community-service/src/main/java/com/tanpu/community/feign/course/vo/Course.java → community-api/src/main/java/com/tanpu/community/api/beans/vo/feign/Course.java

-package com.tanpu.community.feign.course.vo;
+package com.tanpu.community.api.beans.vo.feign;
 
 import lombok.Data;
 import lombok.EqualsAndHashCode;

community-service/src/main/java/com/tanpu/community/feign/course/vo/CourseDetailExt.java → community-api/src/main/java/com/tanpu/community/api/beans/vo/feign/CourseDetailExt.java

-package com.tanpu.community.feign.course.vo;
+package com.tanpu.community.api.beans.vo.feign;
 
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;

community-api/src/main/java/com/tanpu/community/api/beans/vo/feign/CourseExt.java

+package com.tanpu.community.api.beans.vo.feign;

import io.swagger.annotations.ApiModelProperty;import lombok.Data;import lombok.EqualsAndHashCode;
/**
 * @author: zyh
 * @date: 2021-04-13 3:20 下午
 * @description:
 */@EqualsAndHashCode(callSuper = true)@Datapublic class CourseExt extends Course {
    @ApiModelProperty("章节-小节ID")
    private String coursePackageId;

    @Deprecated
    @ApiModelProperty("相关性知识课程小节类型 - 1:音频 2:视频")
    private Integer relType;

    @ApiModelProperty("相关性知识课程小节类型 扩展")
    private Integer relTypeExt;

    @Deprecated
    @ApiModelProperty("章节-小节 音/视频类型 1:音频 2:视频")
    private Integer type;

    @ApiModelProperty("章节-小节 音/视频类型 扩展")
    private Integer typeExt;

    @ApiModelProperty("章节-小节 音/视频地址")
    private String url;

    @ApiModelProperty("相关性知识地址")
    private String relUrl;

    @ApiModelProperty("相关性知识 - 课程包ID")
    private String relPackageId;

    @ApiModelProperty("相关性知识音/视频时长")
    private Integer relLengthTime;

    @ApiModelProperty("多少人已学习")
    private Integer readNum;

    @ApiModelProperty("课程时长 单位s")
    private Integer lengthTime;

    @ApiModelProperty("讲师信息")
    private LecturerResp lecturer;}
\ No newline at end of file

community-service/src/main/java/com/tanpu/community/feign/course/vo/CourseResExt.java → community-api/src/main/java/com/tanpu/community/api/beans/vo/feign/CourseResExt.java

-package com.tanpu.community.feign.course.vo;
+package com.tanpu.community.api.beans.vo.feign;
 
 import lombok.AllArgsConstructor;
 import lombok.Builder;

community-service/src/main/java/com/tanpu/community/feign/tanpuroom/vo/CurriCulumInfoDetailDto.java → community-api/src/main/java/com/tanpu/community/api/beans/vo/feign/CurriCulumInfoDetailDto.java

-package com.tanpu.community.feign.tanpuroom.vo;
+package com.tanpu.community.api.beans.vo.feign;
 
 
 import io.swagger.annotations.ApiModel;

community-service/src/main/java/com/tanpu/community/feign/tanpuroom/vo/CurriculumChapterVo.java → community-api/src/main/java/com/tanpu/community/api/beans/vo/feign/CurriculumChapterVo.java

-package com.tanpu.community.feign.tanpuroom.vo;
+package com.tanpu.community.api.beans.vo.feign;
 
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;

community-service/src/main/java/com/tanpu/community/feign/tanpuroom/vo/CurriculumDetailVo.java → community-api/src/main/java/com/tanpu/community/api/beans/vo/feign/CurriculumDetailVo.java

-package com.tanpu.community.feign.tanpuroom.vo;
+package com.tanpu.community.api.beans.vo.feign;
 
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;

community-service/src/main/java/com/tanpu/community/feign/course/vo/FileMetadata.java → community-api/src/main/java/com/tanpu/community/api/beans/vo/feign/FileMetadata.java

-package com.tanpu.community.feign.course.vo;
+package com.tanpu.community.api.beans.vo.feign;
 
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;

community-service/src/main/java/com/tanpu/community/feign/course/vo/LecturerResp.java → community-api/src/main/java/com/tanpu/community/api/beans/vo/feign/LecturerResp.java

-package com.tanpu.community.feign.course.vo;
+package com.tanpu.community.api.beans.vo.feign;
 
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;

community-service/src/main/java/com/tanpu/community/feign/vo/Net.java → community-api/src/main/java/com/tanpu/community/api/beans/vo/feign/Net.java

-package com.tanpu.community.feign.vo;
+package com.tanpu.community.api.beans.vo.feign;
 
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;

community-service/src/main/java/com/tanpu/community/feign/vo/ProductInfoVO.java → community-api/src/main/java/com/tanpu/community/api/beans/vo/feign/ProductInfoVO.java

-package com.tanpu.community.feign.vo;
+package com.tanpu.community.api.beans.vo.feign;
 
-import com.tanpu.community.feign.course.vo.ColumnVO;
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;

community-service/src/main/java/com/tanpu/community/feign/vo/ProductLabel.java → community-api/src/main/java/com/tanpu/community/api/beans/vo/feign/ProductLabel.java

-package com.tanpu.community.feign.vo;
+package com.tanpu.community.api.beans.vo.feign;
 
 import lombok.AllArgsConstructor;
 import lombok.Builder;

community-service/src/main/java/com/tanpu/community/feign/course/vo/Progression.java → community-api/src/main/java/com/tanpu/community/api/beans/vo/feign/Progression.java

-package com.tanpu.community.feign.course.vo;
+package com.tanpu.community.api.beans.vo.feign;
 
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;

community-service/src/main/java/com/tanpu/community/feign/vo/ShortVideoBaseInfoResp.java → community-api/src/main/java/com/tanpu/community/api/beans/vo/feign/ShortVideoBaseInfoResp.java

-package com.tanpu.community.feign.vo;
+package com.tanpu.community.api.beans.vo.feign;
 
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;

community-service/src/main/java/com/tanpu/community/feign/vo/Type.java → community-api/src/main/java/com/tanpu/community/api/beans/vo/feign/Type.java

-package com.tanpu.community.feign.vo;
+package com.tanpu.community.api.beans.vo.feign;
 
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;

community-service/src/main/java/com/tanpu/community/feign/zhibo/vo/ZhiboDetailVO.java → community-api/src/main/java/com/tanpu/community/api/beans/vo/feign/ZhiboDetailVO.java

-package com.tanpu.community.feign.zhibo.vo;
+package com.tanpu.community.api.beans.vo.feign;
 
 
 import io.swagger.annotations.ApiModel;

community-api/src/main/java/com/tanpu/community/api/enums/QueryFollowTypeEnum.java

+package com.tanpu.community.api.enums;
+
+public enum QueryFollowTypeEnum {
+
+    QUERY_FANS(1,"查询粉丝"),QUERY_IDOLS(2,"查询关注");
+
+    private Integer code;
+    private String type;
+
+
+    QueryFollowTypeEnum(Integer code, String type) {
+        this.code = code;
+        this.type = type;
+    }
+
+    public Integer getCode() {
+        return code;
+    }
+
+    public void setCode(Integer code) {
+        this.code = code;
+    }
+
+    public String getType() {
+        return type;
+    }
+
+    public void setType(String type) {
+        this.type = type;
+    }
+}

community-api/src/main/java/com/tanpu/community/api/enums/QueryRecordTypeEnum.java

+package com.tanpu.community.api.enums;
+
+public enum QueryRecordTypeEnum {
+
+    QUERY_PUBLISH(1,"发布"),
+    QUERY_COMMENT(2,"评论"),
+    QUERY_LIKE(3,"点赞"),
+    QUERY_COLLECT(4,"收藏");
+
+    private Integer code;
+    private String type;
+
+
+    QueryRecordTypeEnum(Integer code, String type) {
+        this.code = code;
+        this.type = type;
+    }
+
+    public Integer getCode() {
+        return code;
+    }
+
+    public void setCode(Integer code) {
+        this.code = code;
+    }
+
+    public String getType() {
+        return type;
+    }
+
+    public void setType(String type) {
+        this.type = type;
+    }
+}

community-service/src/main/java/com/tanpu/community/controller/HomePageController.java

@@ -5,6 +5,9 @@ import com.tanpu.community.api.beans.qo.FollowQo;
 import com.tanpu.community.api.beans.qo.ThemeQo;
 import com.tanpu.community.api.beans.req.HomePageReq;
 import com.tanpu.community.api.beans.req.homepage.AddIdolReq;
+import com.tanpu.community.api.beans.req.homepage.QueryFollowReq;
+import com.tanpu.community.api.beans.req.homepage.QueryRecordThemeReq;
+import com.tanpu.community.api.beans.req.page.Page;
 import com.tanpu.community.manager.HomePageManager;
 import io.swagger.annotations.ApiOperation;
 import lombok.extern.slf4j.Slf4j;
@@ -17,11 +20,8 @@ import java.util.List;
 @RestController
 @Slf4j
 @RequestMapping(value = "/api/homepage")
-
 public class HomePageController {
 
-
-
     @Autowired
     private HomePageManager homePageManager;
 
@@ -35,44 +35,11 @@ public class HomePageController {
     }
 
     @GetMapping(value = "/queryMyFans")
-    @ApiOperation("查询自己的粉丝列表")
-    @ResponseBody
-    public CommonResp<List<FollowQo>> queryMyFans() {
-        String userId = "123";
-        List<FollowQo> data = homePageManager.queryFansByIdolId(userId);
-        homePageManager.judgeFollowed(data,userId);
-        return CommonResp.success(data);
-    }
-
-    @GetMapping(value = "/queryFansByUserId")
-    @ApiOperation("查询他人的粉丝列表")
-    @ResponseBody
-    public CommonResp<List<FollowQo>> queryFans(@RequestParam String targetUser) {
-        String userId="123";
-        List<FollowQo> data = homePageManager.queryFansByIdolId(targetUser);
-        homePageManager.judgeFollowed(data,userId);
-        return CommonResp.success(data);
-    }
-
-    @GetMapping(value = "/queryMyIdols")
-    @ApiOperation("获取自己的关注列表")
+    @ApiOperation("查询关注/粉丝列表")
     @ResponseBody
-    public CommonResp<List<FollowQo>> queryMyIdols() {
+    public CommonResp<Page<FollowQo>> queryMyFans(@RequestBody QueryFollowReq req) {
         String userId = "123";
-        List<FollowQo> data = homePageManager.queryIdolsByFollowerId(userId);
-        homePageManager.judgeFollowed(data,userId);
-        return CommonResp.success(data);
-    }
-
-
-    @GetMapping(value = "/queryIdolsByUserId")
-    @ApiOperation("获取他人的关注列表")
-    @ResponseBody
-    public CommonResp<List<FollowQo>> queryIdols(@RequestParam String targetUser) {
-        String userId="123";
-        List<FollowQo> data = homePageManager.queryIdolsByFollowerId(targetUser);
-        homePageManager.judgeFollowed(data,userId);
-        return CommonResp.success(data);
+        return CommonResp.success(homePageManager.queryFollow(req));
     }
 
     @PostMapping(value = "/addIdol")
@@ -84,10 +51,10 @@ public class HomePageController {
         return CommonResp.success();
     }
 
-    @PostMapping(value = "/queryMyLike")
+    @PostMapping(value = "/queryList")
     @ApiOperation("我的点赞帖子列表")
     @ResponseBody
-    public CommonResp<List<ThemeQo>> likeList(){
+    public CommonResp<List<ThemeQo>> likeList(@RequestBody QueryRecordThemeReq req){
         String userId="123";
         return CommonResp.success();
     }

community-service/src/main/java/com/tanpu/community/feign/course/FeignBackClientForCourse.java

 package com.tanpu.community.feign.course;
 
 import com.tanpu.common.api.CommonResp;
-import com.tanpu.community.feign.course.vo.CourseDetailExt;
+import com.tanpu.community.api.beans.vo.feign.CourseDetailExt;
 import feign.hystrix.FallbackFactory;
 import lombok.extern.slf4j.Slf4j;
 import org.springframework.stereotype.Component;

community-service/src/main/java/com/tanpu/community/feign/course/FeignClientForCourse.java

 package com.tanpu.community.feign.course;
 
 import com.tanpu.common.api.CommonResp;
-import com.tanpu.community.feign.course.vo.CourseDetailExt;
+import com.tanpu.community.api.beans.vo.feign.CourseDetailExt;
 import com.tanpu.community.feign.product.FeignBackClientForProducts;
 import io.swagger.annotations.ApiOperation;
 import io.swagger.annotations.ApiParam;

community-service/src/main/java/com/tanpu/community/feign/course/vo/CourseExt.java

-package com.tanpu.community.feign.course.vo;

import io.swagger.annotations.ApiModelProperty;import lombok.Data;import lombok.EqualsAndHashCode;
/**
 * @author: zyh
 * @date: 2021-04-13 3:20 下午
 * @description:
 */@EqualsAndHashCode(callSuper = true)@Datapublic class CourseExt extends Course {
    @ApiModelProperty("章节-小节ID")
    private String coursePackageId;

    @Deprecated
    @ApiModelProperty("相关性知识课程小节类型 - 1:音频 2:视频")
    private Integer relType;

    @ApiModelProperty("相关性知识课程小节类型 扩展")
    private Integer relTypeExt;

    @Deprecated
    @ApiModelProperty("章节-小节 音/视频类型 1:音频 2:视频")
    private Integer type;

    @ApiModelProperty("章节-小节 音/视频类型 扩展")
    private Integer typeExt;

    @ApiModelProperty("章节-小节 音/视频地址")
    private String url;

    @ApiModelProperty("相关性知识地址")
    private String relUrl;

    @ApiModelProperty("相关性知识 - 课程包ID")
    private String relPackageId;

    @ApiModelProperty("相关性知识音/视频时长")
    private Integer relLengthTime;

    @ApiModelProperty("多少人已学习")
    private Integer readNum;

    @ApiModelProperty("课程时长 单位s")
    private Integer lengthTime;

    @ApiModelProperty("讲师信息")
    private LecturerResp lecturer;}
\ No newline at end of file

community-service/src/main/java/com/tanpu/community/feign/product/FeignBackClientForProducts.java

 package com.tanpu.community.feign.product;
 
 import com.tanpu.common.api.CommonResp;
-import com.tanpu.community.feign.vo.ProductInfoVO;
+import com.tanpu.community.api.beans.vo.feign.ProductInfoVO;
 import feign.hystrix.FallbackFactory;
 import lombok.extern.slf4j.Slf4j;
 import org.springframework.stereotype.Component;

community-service/src/main/java/com/tanpu/community/feign/product/FeignClientForProducts.java

 package com.tanpu.community.feign.product;
 
 import com.tanpu.common.api.CommonResp;
-import com.tanpu.community.feign.vo.ProductInfoVO;
+import com.tanpu.community.api.beans.vo.feign.ProductInfoVO;
 import io.swagger.annotations.ApiOperation;
 import io.swagger.annotations.ApiParam;
 import org.springframework.cloud.openfeign.FeignClient;

community-service/src/main/java/com/tanpu/community/feign/tanpuroom/FeignBackClientForTanpuroom.java

 package com.tanpu.community.feign.tanpuroom;
 
 import com.tanpu.common.api.CommonResp;
-import com.tanpu.community.feign.tanpuroom.vo.CurriCulumInfoDetailDto;
-import com.tanpu.community.feign.tanpuroom.vo.CurriculumDetailVo;
-import com.tanpu.community.feign.vo.ShortVideoBaseInfoResp;
+import com.tanpu.community.api.beans.vo.feign.CurriCulumInfoDetailDto;
+import com.tanpu.community.api.beans.vo.feign.CurriculumDetailVo;
+import com.tanpu.community.api.beans.vo.feign.ShortVideoBaseInfoResp;
 import feign.hystrix.FallbackFactory;
 import lombok.extern.slf4j.Slf4j;
 import org.springframework.stereotype.Component;

community-service/src/main/java/com/tanpu/community/feign/tanpuroom/FeignClientForTanpuroom.java

 package com.tanpu.community.feign.tanpuroom;
 
 import com.tanpu.common.api.CommonResp;
-import com.tanpu.community.feign.tanpuroom.vo.CurriCulumInfoDetailDto;
-import com.tanpu.community.feign.tanpuroom.vo.CurriculumDetailVo;
-import com.tanpu.community.feign.vo.ShortVideoBaseInfoResp;
+import com.tanpu.community.api.beans.vo.feign.CurriCulumInfoDetailDto;
+import com.tanpu.community.api.beans.vo.feign.CurriculumDetailVo;
+import com.tanpu.community.api.beans.vo.feign.ShortVideoBaseInfoResp;
 import io.swagger.annotations.ApiOperation;
 import org.springframework.cloud.openfeign.FeignClient;
 import org.springframework.web.bind.annotation.GetMapping;

community-service/src/main/java/com/tanpu/community/feign/zhibo/FeignClientForZhibo.java

 package com.tanpu.community.feign.zhibo;
 
 import com.tanpu.common.api.CommonResp;
-import com.tanpu.community.feign.zhibo.vo.ZhiboDetailVO;
+import com.tanpu.community.api.beans.vo.feign.ZhiboDetailVO;
 import io.swagger.annotations.ApiOperation;
 import io.swagger.annotations.ApiParam;
 import org.springframework.cloud.openfeign.FeignClient;

community-service/src/main/java/com/tanpu/community/feign/zhibo/FeignbackForZhibo.java

 package com.tanpu.community.feign.zhibo;
 
 import com.tanpu.common.api.CommonResp;
-import com.tanpu.community.feign.zhibo.vo.ZhiboDetailVO;
+import com.tanpu.community.api.beans.vo.feign.ZhiboDetailVO;
 import feign.hystrix.FallbackFactory;
 import lombok.extern.slf4j.Slf4j;
 import org.springframework.stereotype.Component;

community-service/src/main/java/com/tanpu/community/manager/HomePageManager.java

@@ -2,14 +2,19 @@ package com.tanpu.community.manager;
 
 import com.tanpu.community.api.beans.qo.FollowQo;
 import com.tanpu.community.api.beans.req.HomePageReq;
+import com.tanpu.community.api.beans.req.homepage.QueryFollowReq;
+import com.tanpu.community.api.beans.req.page.Page;
+import com.tanpu.community.api.enums.QueryFollowTypeEnum;
 import com.tanpu.community.dao.entity.community.HomePageEntity;
 import com.tanpu.community.service.FollowRelService;
 import com.tanpu.community.service.HomePageService;
 import com.tanpu.community.util.ConvertUtil;
+import com.tanpu.community.util.PageUtils;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 
 import javax.annotation.Resource;
+import java.util.HashSet;
 import java.util.List;
 import java.util.Set;
 import java.util.stream.Collectors;
@@ -37,27 +42,23 @@ public class HomePageManager {
         }else {
             homePageService.update(entity);
         }
-
         return;
     }
 
-    //获取用户的关注列表
-    public List<FollowQo> queryIdolsByFollowerId(String followerId) {
-        List<String> idolIds = followRelService.queryFansByFollowerId(followerId);
-        List<HomePageEntity> list = homePageService.selectListByUserIds(idolIds);
-        return list.stream().map(ConvertUtil::homePageEntity2FollowQo).collect(Collectors.toList());
-    }
 
-    //获取用户的粉丝列表
-    public List<FollowQo> queryFansByIdolId(String idolId) {
-        List<String> fanIds = followRelService.queryFansByIdolId(idolId);
-        List<HomePageEntity> list = homePageService.selectListByUserIds(fanIds);
-        return list.stream().map(ConvertUtil::homePageEntity2FollowQo).collect(Collectors.toList());
+    //获取用户关注、粉丝列表
+    public Page<FollowQo> queryFollow(QueryFollowReq req) {
+        List<String> userIds = QueryFollowTypeEnum.QUERY_FANS.getCode().equals(req.getQueryType())?
+                followRelService.queryFansByIdolId(req.getUserId()):followRelService.queryFansByFollowerId(req.getUserId());
+        List<HomePageEntity> list = homePageService.selectListByUserIds(userIds);
+        List<FollowQo> collect = list.stream().map(ConvertUtil::homePageEntity2FollowQo).collect(Collectors.toList());
+        List<FollowQo> followQos = judgeFollowed(collect, req.getUserId());
+        return PageUtils.page(req.getPage(),followQos);
     }
 
     //判断返回列表中的用户是否被当前用户关注
     public List<FollowQo> judgeFollowed(List<FollowQo> followQos,String followerId){
-        Set<String> idolSet = followRelService.queryFansByFollowerId(followerId).stream().collect(Collectors.toSet());
+        Set<String> idolSet = new HashSet<>(followRelService.queryFansByFollowerId(followerId));
         return followQos.stream().map(o->{
             if (idolSet.contains(o.getUserId())){
                 o.setFollowed(true);

community-service/src/main/java/com/tanpu/community/manager/ThemeManager.java

@@ -17,13 +17,13 @@ import com.tanpu.community.dao.entity.community.HomePageEntity;
 import com.tanpu.community.dao.entity.community.ThemeAttachmentEntity;
 import com.tanpu.community.dao.entity.community.ThemeEntity;
 import com.tanpu.community.feign.course.FeignClientForCourse;
-import com.tanpu.community.feign.course.vo.CourseDetailExt;
+import com.tanpu.community.api.beans.vo.feign.CourseDetailExt;
 import com.tanpu.community.feign.product.FeignClientForProducts;
 import com.tanpu.community.feign.tanpuroom.FeignClientForTanpuroom;
-import com.tanpu.community.feign.vo.ProductInfoVO;
-import com.tanpu.community.feign.vo.ShortVideoBaseInfoResp;
+import com.tanpu.community.api.beans.vo.feign.ProductInfoVO;
+import com.tanpu.community.api.beans.vo.feign.ShortVideoBaseInfoResp;
 import com.tanpu.community.feign.zhibo.FeignClientForZhibo;
-import com.tanpu.community.feign.zhibo.vo.ZhiboDetailVO;
+import com.tanpu.community.api.beans.vo.feign.ZhiboDetailVO;
 import com.tanpu.community.service.*;
 import com.tanpu.community.service.other.*;
 import com.tanpu.community.util.ConvertUtil;