Merge branch 'dev' of http://47.100.44.39:10001/tp-backend/tanpu-community into dev

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.FundInfoBaseResp;
-import com.tanpu.community.api.beans.vo.feign.ShortVideoBaseInfoResp;
-import com.tanpu.community.api.beans.vo.feign.ZhiboListResp;
+import com.tanpu.community.api.beans.vo.feign.product.FundInfoBaseResp;
+import com.tanpu.community.api.beans.vo.feign.course.ShortVideoBaseInfoResp;
+import com.tanpu.community.api.beans.vo.feign.zhibo.ZhiboListResp;
 import com.tanpu.community.api.beans.vo.feign.course.CourseSimpleResp;
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;

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

 package com.tanpu.community.api.beans.qo;
 
-import com.tanpu.community.api.beans.ImagesDTO;
+import com.tanpu.community.api.beans.vo.ImagesDTO;
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
 import lombok.AllArgsConstructor;

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

 package com.tanpu.community.api.beans.qo;
 
-import com.tanpu.community.api.beans.ImagesDTO;
+import com.tanpu.community.api.beans.vo.ImagesDTO;
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
 import lombok.AllArgsConstructor;

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

@@ -5,22 +5,16 @@ import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
 
-import javax.validation.constraints.NotEmpty;
-import javax.validation.constraints.NotNull;
-
 @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;
 
-    @NotNull(message = "page不能为空")
     @ApiModelProperty(value = "分页")
     private Pageable page;
 }

community-api/src/main/java/com/tanpu/community/api/beans/req/page/Page.java

 package com.tanpu.community.api.beans.req.page;
 
 import com.github.pagehelper.PageHelper;
+import lombok.Builder;
 import lombok.Data;
 
 import java.util.List;
 
 @Data
+@Builder
 public class Page<T> {
 
     private Integer pageNum;
@@ -90,6 +92,13 @@ public class Page<T> {
         }
     }
 
+    public Page(Integer pageNum, Integer pageSize, Long totalSize, Integer totalPages, List<T> content) {
+        this.pageNum = pageNum;
+        this.pageSize = pageSize;
+        this.totalSize = totalSize;
+        this.totalPages = totalPages;
+        this.content = content;
+    }
 
     public Page() {
     }

community-api/src/main/java/com/tanpu/community/api/beans/req/page/Pageable.java

 package com.tanpu.community.api.beans.req.page;
 
 import io.swagger.annotations.ApiModel;
+import lombok.Builder;
 import lombok.Data;
 
 @Data
+@Builder
 @ApiModel(value = "分页")
 public class Pageable {
 

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

 package com.tanpu.community.api.beans.req.theme;
 
-import com.tanpu.community.api.beans.ImagesDTO;
+import com.tanpu.community.api.beans.vo.ImagesDTO;
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;

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

-package com.tanpu.community.api.beans.vo;
-
-public class CourseVo {
-}

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

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

community-api/src/main/java/com/tanpu/community/api/beans/KafkaDurationUptMsg.java → community-api/src/main/java/com/tanpu/community/api/beans/vo/KafkaDurationUptMsg.java

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

community-api/src/main/java/com/tanpu/community/api/beans/KafkaVisitorMsg.java → community-api/src/main/java/com/tanpu/community/api/beans/vo/KafkaVisitorMsg.java

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

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

-package com.tanpu.community.api.beans.vo;
-
-public class ProductVo {
-}

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

-package com.tanpu.community.api.beans.vo;
-
-public class ShortVideoVo {
-}

community-api/src/main/java/com/tanpu/community/api/beans/TopicDO.java → community-api/src/main/java/com/tanpu/community/api/beans/vo/TopicDO.java

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

community-api/src/main/java/com/tanpu/community/api/beans/TopicDataAnalysDTO.java → community-api/src/main/java/com/tanpu/community/api/beans/vo/TopicDataAnalysDTO.java

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

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

-package com.tanpu.community.api.beans.vo;
-
-public class ZhiboVo {
-}

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

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

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

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

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

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

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

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

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

 package com.tanpu.community.api.beans.vo.feign.course;
 
-import com.tanpu.community.api.beans.vo.feign.BaseCoursePackage;
-import com.tanpu.community.api.beans.vo.feign.LikeCourse;
 import com.tanpu.community.api.beans.vo.feign.pay.GroupBuyConfig;
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;

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

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

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

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

community-api/src/main/java/com/tanpu/community/api/beans/vo/feign/FundInfoBaseResp.java → community-api/src/main/java/com/tanpu/community/api/beans/vo/feign/product/FundInfoBaseResp.java

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

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

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

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

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

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

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

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

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

community-api/src/main/java/com/tanpu/community/api/beans/vo/feign/FileQueryResp.java → community-api/src/main/java/com/tanpu/community/api/beans/vo/feign/user/FileQueryResp.java

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

community-api/src/main/java/com/tanpu/community/api/beans/vo/feign/UserInfoVo.java → community-api/src/main/java/com/tanpu/community/api/beans/vo/feign/user/UserInfoVo.java

-package com.tanpu.community.api.beans.vo.feign;
+package com.tanpu.community.api.beans.vo.feign.user;
 
 import com.fasterxml.jackson.annotation.JsonFormat;
 import io.swagger.annotations.ApiModel;

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

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

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

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

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

@@ -2,7 +2,8 @@ package com.tanpu.community.api.enums;
 
 public enum QueryFollowTypeEnum {
 
-    QUERY_FANS(1,"查询粉丝"),QUERY_IDOLS(2,"查询关注");
+    QUERY_FANS(1,"查询粉丝"),
+    QUERY_IDOLS(2,"查询关注");
 
     private Integer code;
     private String type;

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

@@ -48,7 +48,7 @@ public class HomePageController {
     @ApiOperation("查询关注/粉丝列表")
     @ResponseBody
     @AuthLogin
-    public CommonResp<Page<FollowQo>> queryMyFans(@RequestBody QueryFollowReq req) {
+    public CommonResp<Page<FollowQo>> queryFollowList(@RequestBody QueryFollowReq req) {
         String userId = userHolder.getUserId();
         return CommonResp.success(homePageManager.queryFollow(req,userId));
     }

community-service/src/main/java/com/tanpu/community/feign/fatools/FeignClientForFatools.java

 package com.tanpu.community.feign.fatools;
 
 import com.tanpu.common.api.CommonResp;
-import com.tanpu.community.api.beans.vo.feign.FileQueryResp;
-import com.tanpu.community.api.beans.vo.feign.ShortVideoBaseInfoResp;
-import com.tanpu.community.api.beans.vo.feign.UserInfoVo;
+import com.tanpu.community.api.beans.vo.feign.user.FileQueryResp;
+import com.tanpu.community.api.beans.vo.feign.course.ShortVideoBaseInfoResp;
+import com.tanpu.community.api.beans.vo.feign.user.UserInfoVo;
 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/fatools/FeignbackForFatools.java

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

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.api.beans.vo.feign.ProductInfoVO;
+import com.tanpu.community.api.beans.vo.feign.product.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.api.beans.vo.feign.ProductInfoVO;
+import com.tanpu.community.api.beans.vo.feign.product.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/product/FeignForFund.java

 package com.tanpu.community.feign.product;
 
 import com.tanpu.common.api.CommonResp;
-import com.tanpu.community.api.beans.vo.feign.ProductInfoVO;
+import com.tanpu.community.api.beans.vo.feign.product.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/product/FeignForPublicFund.java

 package com.tanpu.community.feign.product;
 
 import com.tanpu.common.api.CommonResp;
-import com.tanpu.community.api.beans.vo.feign.ProductInfoVO;
+import com.tanpu.community.api.beans.vo.feign.product.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/product/FeignbackForFund.java

 package com.tanpu.community.feign.product;
 
 import com.tanpu.common.api.CommonResp;
-import com.tanpu.community.api.beans.vo.feign.ProductInfoVO;
+import com.tanpu.community.api.beans.vo.feign.product.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/FeignbackForPublicFund.java

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

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

@@ -3,7 +3,7 @@ package com.tanpu.community.feign.tanpuroom;
 import com.tanpu.common.api.CommonResp;
 import com.tanpu.community.api.beans.vo.feign.course.CurriCulumInfoDetailDto;
 import com.tanpu.community.api.beans.vo.feign.course.CurriculumDetailVo;
-import com.tanpu.community.api.beans.vo.feign.ShortVideoBaseInfoResp;
+import com.tanpu.community.api.beans.vo.feign.course.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

@@ -3,7 +3,7 @@ package com.tanpu.community.feign.tanpuroom;
 import com.tanpu.common.api.CommonResp;
 import com.tanpu.community.api.beans.vo.feign.course.CurriCulumInfoDetailDto;
 import com.tanpu.community.api.beans.vo.feign.course.CurriculumDetailVo;
-import com.tanpu.community.api.beans.vo.feign.ShortVideoBaseInfoResp;
+import com.tanpu.community.api.beans.vo.feign.course.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.api.beans.vo.feign.ZhiboDetailVO;
-import com.tanpu.community.api.beans.vo.feign.ZhiboListResp;
+import com.tanpu.community.api.beans.vo.feign.zhibo.ZhiboDetailVO;
+import com.tanpu.community.api.beans.vo.feign.zhibo.ZhiboListResp;
 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.api.beans.vo.feign.ZhiboDetailVO;
-import com.tanpu.community.api.beans.vo.feign.ZhiboListResp;
+import com.tanpu.community.api.beans.vo.feign.zhibo.ZhiboDetailVO;
+import com.tanpu.community.api.beans.vo.feign.zhibo.ZhiboListResp;
 import feign.hystrix.FallbackFactory;
 import lombok.extern.slf4j.Slf4j;
 import org.springframework.stereotype.Component;

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

@@ -63,8 +63,8 @@ public class CommentManager {
             String authorId = commentQo.getAuthorId();
             UserInfoEntity userInfo = userInfoService.queryUserById(authorId);
             if (userInfo != null) {
-                commentQo.setUserImg(userInfo.getUiHeadimg());
-                commentQo.setNickName(userInfo.getUiNickname());
+                commentQo.setUserImg(userInfo.getUiHeadimgMp());
+                commentQo.setNickName(userInfo.getUiUsernameMp());
             }
             //是否点赞及点赞数
             String commentId = commentQo.getCommentId();

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

@@ -11,12 +11,11 @@ import com.tanpu.community.service.FollowRelService;
 import com.tanpu.community.service.UserInfoService;
 import com.tanpu.community.util.ConvertUtil;
 import com.tanpu.community.util.PageUtils;
+import org.apache.commons.collections4.CollectionUtils;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 
-import java.util.HashSet;
-import java.util.List;
-import java.util.Set;
+import java.util.*;
 import java.util.stream.Collectors;
 
 @Service
@@ -34,12 +33,18 @@ public class HomePageManager {
     public Page<FollowQo> queryFollow(QueryFollowReq req, String userId) {
         List<String> userIds = QueryFollowTypeEnum.QUERY_FANS.getCode().equals(req.getQueryType()) ?
                 followRelService.queryFansByIdolId(req.getUserId()) : followRelService.queryFansByFollowerId(req.getUserId());
-        List<UserInfoEntity> userInfos = userInfoService.queryUserByIds(userIds);
-        List<FollowQo> collect = userInfos.stream().map(ConvertUtil::homePageEntity2FollowQo).collect(Collectors.toList());
-        List<FollowQo> followQos = judgeFollowed(collect, userId);
+        List<FollowQo> followQos = new ArrayList<>();
+        if (!CollectionUtils.isEmpty(userIds)) {
+            List<UserInfoEntity> userInfos = userInfoService.queryUserByIds(userIds);
+            List<FollowQo> collect = userInfos.stream().map(ConvertUtil::homePageEntity2FollowQo).collect(Collectors.toList());
+            followQos = judgeFollowed(collect, userId);
+
+        }
+        //分页
         return PageUtils.page(req.getPage(), followQos);
     }
 
+
     //判断返回列表中的用户是否被当前用户关注
     public List<FollowQo> judgeFollowed(List<FollowQo> followQos, String followerId) {
         Set<String> idolSet = new HashSet<>(followRelService.queryFansByFollowerId(followerId));

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

 package com.tanpu.community.manager;
 
 import com.alibaba.fastjson.JSON;
-import com.tanpu.community.api.beans.KafkaDurationUptMsg;
+import com.tanpu.community.api.beans.vo.KafkaDurationUptMsg;
 import com.tanpu.community.service.VisitSummaryService;
 import lombok.extern.slf4j.Slf4j;
 import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.beans.factory.annotation.Value;
 import org.springframework.kafka.annotation.KafkaListener;
 import org.springframework.kafka.core.KafkaTemplate;
 import org.springframework.stereotype.Service;

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

@@ -132,7 +132,8 @@ public class ThemeManager {
                 }
                 themeEntities = themeService.queryByThemeIds(new ArrayList<>(replyThemeIds));
                 List<ThemeQo> themeQos = convertEntityToQo(themeEntities, userId);
-                productService.transferAttachments(themeQos);
+                //组装附件
+                productService.getAttachDetailByBatch(themeQos);
                 //主题列表
                 Map<String, ThemeQo> themeMap = themeQos.stream()
                         .collect(Collectors.toMap(ThemeQo::getThemeId, o -> o));
@@ -149,8 +150,8 @@ public class ThemeManager {
                     FormerThemeQo f = ConvertUtil.themeQo2FormerThemeQo(themeQo);
                     //ThemeContentQo和原主题包装到FormerThemeQo中包装到ThemeQo中
                     ThemeQo commentThemeQo = ThemeQo.builder()
-                            .nickName(userInfoEntity.getUiNickname())
-                            .userImg(userInfoEntity.getUiHeadimg())
+                            .nickName(userInfoEntity.getUiUsernameMp())
+                            .userImg(userInfoEntity.getUiHeadimgMp())
                             .content(Arrays.asList(commentContent))
                             .formerTheme(f)
                             .commentId(commentEntity.getCommentId())
@@ -181,7 +182,8 @@ public class ThemeManager {
             throw new BizException("找不到帖子id：" + themeId);
         }
         ThemeQo themeQo = ConvertUtil.themeEntityToQo(themeEntity);
-        buildMainTestExtraInfo(themeQo, userId);
+        productService.getAttachDetail(themeQo);
+        buildThemeQoExtraInfo(userId, themeQo);
         return themeQo;
     }
 
@@ -258,7 +260,7 @@ public class ThemeManager {
         //Entity转Qo
         List<ThemeQo> themeQos = ConvertUtil.themeEntitiesToDTOs(themeEntities);
         //批量查询附件detail
-        productService.transferAttachments(themeQos);
+        productService.getAttachDetailByBatch(themeQos);
         //其他信息
         for (ThemeQo themeQO : themeQos) {
             buildThemeQoExtraInfo(userId, themeQO);
@@ -268,9 +270,12 @@ public class ThemeManager {
     }
 
 
-    //组装主题列表
+    //组装主题详情
     private void buildThemeQoExtraInfo(String userId, ThemeQo themeQo) {
 
+        //封装转发对象
+        buildFormerTheme(themeQo);
+
         String themeId = themeQo.getThemeId();
 
         //是否关注作者
@@ -283,9 +288,8 @@ public class ThemeManager {
         //是否转发
         Integer forwardCountByUser = themeService.getForwardCountByUser(themeId, userId);
         themeQo.setHasForward(forwardCountByUser > 0);
-        //转发原文
-        buildFormerTheme(themeQo);
-        //热点数据:点赞，收藏，转发
+
+        //点赞，收藏，转发
         Integer likeCount = collectionService.getCountByTypeAndId(themeId, CollectionTypeEnum.LIKE_THEME);
         Integer bookCount = collectionService.getCountByTypeAndId(themeId, CollectionTypeEnum.COLLECT_THEME);
         Integer forwardCount = themeService.getForwardCountById(themeId);
@@ -294,14 +298,6 @@ public class ThemeManager {
         themeQo.setForwardCount(forwardCount);
     }
 
-    //组装正文详情
-    private void buildMainTestExtraInfo(ThemeQo themeQo, String userId) {
-        //附件列表
-        productService.transferAttachement(themeQo);
-        //转发原文
-        buildFormerTheme(themeQo);
-        return;
-    }
 
     //组装被转发主题
     private void buildFormerTheme(ThemeQo themeQo) {
@@ -311,7 +307,9 @@ public class ThemeManager {
             if (formerTheme == null) {
                 throw new BizException("转发主题Id错误，id：" + formerThemeId);
             }
-            productService.transferAttachement(formerTheme);
+            //单个查询详情
+//            productService.getAttachDetail(formerTheme);
+
             FormerThemeQo f = ConvertUtil.themeQo2FormerThemeQo(formerTheme);
             themeQo.setFormerTheme(f);
         }

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

 package com.tanpu.community.manager;
 
 import com.tanpu.common.exception.BizException;
-import com.tanpu.community.api.beans.TopicDO;
-import com.tanpu.community.api.beans.TopicDataAnalysDTO;
+import com.tanpu.community.api.beans.vo.TopicDO;
+import com.tanpu.community.api.beans.vo.TopicDataAnalysDTO;
 import com.tanpu.community.api.beans.qo.TopicDetailQo;
 import com.tanpu.community.api.beans.qo.TopicHotQo;
 import com.tanpu.community.api.beans.qo.TopicTitileQo;

community-service/src/main/java/com/tanpu/community/service/ProductService.java

@@ -5,14 +5,14 @@ import com.google.common.collect.Sets;
 import com.tanpu.common.api.CommonResp;
 import com.tanpu.common.enums.fund.ProductTypeEnum;
 import com.tanpu.common.util.JsonUtil;
-import com.tanpu.community.api.beans.ImagesDTO;
+import com.tanpu.community.api.beans.vo.ImagesDTO;
 import com.tanpu.community.api.beans.qo.AttachmentDetailVo;
 import com.tanpu.community.api.beans.qo.ThemeContentQo;
 import com.tanpu.community.api.beans.qo.ThemeQo;
-import com.tanpu.community.api.beans.vo.feign.FundInfoBaseResp;
-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.ZhiboListResp;
+import com.tanpu.community.api.beans.vo.feign.product.FundInfoBaseResp;
+import com.tanpu.community.api.beans.vo.feign.product.ProductInfoVO;
+import com.tanpu.community.api.beans.vo.feign.course.ShortVideoBaseInfoResp;
+import com.tanpu.community.api.beans.vo.feign.zhibo.ZhiboListResp;
 import com.tanpu.community.api.beans.vo.feign.course.CourseSimpleResp;
 import com.tanpu.community.api.enums.RelTypeEnum;
 import com.tanpu.community.dao.entity.community.FileRecordEntity;
@@ -70,14 +70,14 @@ public class ProductService {
     private UserInfoService userInfoService;
 
 
-    public void transferAttachement(ThemeQo themeQo) {
+    public void getAttachDetail(ThemeQo themeQo) {
         ArrayList<ThemeQo> themeQos = new ArrayList<>();
         themeQos.add(themeQo);
-        transferAttachments(themeQos);
+        getAttachDetailByBatch(themeQos);
     }
 
 
-    public void transferAttachments(List<ThemeQo> themeQos) {
+    public void getAttachDetailByBatch(List<ThemeQo> themeQos) {
         // 短视频信息
         Map<String, ShortVideoBaseInfoResp> shortVideoMap = Maps.newHashMap();
         // 课程信息
@@ -180,7 +180,6 @@ public class ProductService {
                             courseIds.add(c.getValue());
                         }
                     })
-
             );
 
         }
@@ -376,8 +375,8 @@ public class ProductService {
                 themeQo.setTopicTitle(topicMap.get(themeQo.getTopicId()));
             }
             if (!StringUtils.isEmpty(themeQo.getAuthorId()) && userMap.containsKey(themeQo.getAuthorId())) {
-                themeQo.setNickName(userMap.get(themeQo.getAuthorId()).getUiNickname());
-                themeQo.setUserImg(userMap.get(themeQo.getAuthorId()).getUiHeadimg());
+                themeQo.setNickName(userMap.get(themeQo.getAuthorId()).getUiUsernameMp());
+                themeQo.setUserImg(userMap.get(themeQo.getAuthorId()).getUiHeadimgMp());
             }
             if (themeQo.getContent() == null) {
                 continue;
@@ -416,6 +415,7 @@ public class ProductService {
                                 .product(product).build());
                     }
                 } else if (themeContent.getType().equals(RelTypeEnum.SINGLE_IMG.type)) {
+                    //
                     if (imgUrlMap.containsKey(themeContent.getValue())) {
                         FileRecordEntity imgEntity = imgUrlMap.get(themeContent.getValue());
                         String extInfo = imgEntity.getExtInfo();
@@ -428,12 +428,36 @@ public class ProductService {
                                     .build();
                             themeContent.setImgList(Collections.singletonList(imagesDTO));
                         }
-
-
                     }
+                }else if (themeContent.getType().equals(RelTypeEnum.MULTIPLE_IMAGE.type)) {
+                    //多图写入图片宽高
+                    List<ImagesDTO> imgList = themeContent.getImgList();
+                    for (ImagesDTO imagesDTO : imgList) {
+                        if (imgUrlMap.containsKey(imagesDTO.getRelId())) {
+                            FileRecordEntity imgEntity = imgUrlMap.get(themeContent.getValue());
+                            String extInfo = imgEntity.getExtInfo();
+                            if (!StringUtils.isEmpty(extInfo)) {
+                                Map<String, Object> extMap = JsonUtil.toMap(extInfo);
+                                imagesDTO.setImgHeight((Integer) extMap.get("height"));
+                                imagesDTO.setImgWidth((Integer) extMap.get("width"));
+                            }
+                        }
+                    }
+
                 }
             }
+//            String formerThemeId = themeQo.getFormerThemeId();
+//            if (!StringUtils.isEmpty(formerThemeId)) {
+//                FormerThemeQo formerTheme = themeQo.getFormerTheme();
+//
+//                //单个查询详情
+////            productService.getAttachDetail(formerTheme);
+//
+//                FormerThemeQo f = ConvertUtil.themeQo2FormerThemeQo(formerTheme);
+//                themeQo.setFormerTheme(f);
+//            }
         }
+
     }
 
     private List<String> setToList(Set<String> set) {
@@ -442,4 +466,9 @@ public class ProductService {
         return l;
     }
 
+    //组装被转发主题
+    private void buildFormerTheme(ThemeQo themeQo) {
+
+    }
+
 }

community-service/src/main/java/com/tanpu/community/service/ThemeService.java

@@ -67,7 +67,7 @@ public class ThemeService {
         return themeMapper.selectList(queryWrapper);
     }
 
-    //根据ids返回主题详情
+    //根据ids返回主题详情,带分页
     public List<ThemeEntity> queryByThemeIds(List<String> themeIds, String lastId,Integer pageSize) {
         LambdaQueryWrapper<ThemeEntity> queryWrapper = new LambdaQueryWrapper<ThemeEntity>()
                 .in(ThemeEntity::getThemeId, themeIds)
@@ -112,7 +112,7 @@ public class ThemeService {
 
 
     /**
-     * 根据条件查询主题
+     * 根据条件查询最新主题
      * @param topidId 话题Id
      * @param lastId 查询此主题Id之前的主题
      * @param pageSize 查询数量

community-service/src/main/java/com/tanpu/community/util/ConvertUtil.java

@@ -2,8 +2,8 @@ package com.tanpu.community.util;
 
 import com.fasterxml.jackson.core.type.TypeReference;
 import com.tanpu.common.util.JsonUtil;
-import com.tanpu.community.api.beans.ImagesDTO;
-import com.tanpu.community.api.beans.TopicDO;
+import com.tanpu.community.api.beans.vo.ImagesDTO;
+import com.tanpu.community.api.beans.vo.TopicDO;
 import com.tanpu.community.api.beans.qo.*;
 import com.tanpu.community.api.beans.req.theme.CreateThemeReq;
 import com.tanpu.community.api.beans.req.theme.ThemeContentReq;
@@ -180,8 +180,8 @@ public class ConvertUtil {
             return null;
         }
         return FollowQo.builder().userId(entity.getId())
-                .nickName(entity.getUiNickname())
-                .headImg(entity.getUiHeadimg())
+                .nickName(entity.getUiUsernameMp())
+                .headImg(entity.getUiHeadimgMp())
                 .introduction(entity.getUiIntroduction())
                 .build();
     }

community-service/src/main/java/com/tanpu/community/util/PageUtils.java

@@ -14,8 +14,14 @@ import java.util.List;
 public class PageUtils {
     public static <T> Page<T> page(Pageable pageable, List<T> list) {
         if (CollectionUtils.isEmpty(list)) {
+            if(pageable==null){
+                return new Page<T>(1,0, (long)list.size(),1, list);
+            }
             return new Page<>(pageable, 0L, new ArrayList<>());
         } else {
+            if(pageable==null){
+                return new Page<T>(1,list.size(), (long)list.size(),1, list);
+            }
 
             // 记录总数
             Integer count = list.size();