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

# Conflicts:
#	community-api/src/main/java/com/tanpu/community/api/beans/qo/ThemeContentQo.java
#	community-service/src/main/java/com/tanpu/community/manager/ThemeManager.java

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

@@ -2,17 +2,19 @@ package com.tanpu.community.api.beans.qo;
 
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
+import lombok.AllArgsConstructor;
+import lombok.Builder;
 import lombok.Data;
+import lombok.NoArgsConstructor;
 
 
 @Data
+@Builder
+@AllArgsConstructor
+@NoArgsConstructor
 @ApiModel("关注列表")
 public class FollowQo {
 
-
-    @ApiModelProperty(value = "id")
-    private String id;
-
     @ApiModelProperty(value = "用户id")
     private String userId;
 

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

@@ -26,9 +26,24 @@ public class FormerThemeQo implements Serializable {
     private String userImg;
 
     @ApiModelProperty(value = "被转发的主题Id")
-    private String formerThemeId;
+    private String themeId;
+
+    @ApiModelProperty(value = "类型 1：讨论无标题 2：长文有标题 3：转发 ")
+    private Integer themeType;
+
+    @ApiModelProperty(value = "被转发的主题标题")
+    private String title;
+
+    @ApiModelProperty(value = "被转发的主题的话题名称")
+    private String topicTitle;
+
+    @ApiModelProperty(value = "被转发的主题所属的话题")
+    private String topicId;
+
+    @ApiModelProperty(value = "被转发的主题的作者id")
+    private String authorId;
 
     @ApiModelProperty(value = "转发内容")
-    private List<ThemeContentQo> forwardContent;
+    private List<ThemeContentQo> content;
 
 }

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

@@ -3,16 +3,19 @@ package com.tanpu.community.api.beans.qo;
 import com.tanpu.community.api.beans.ImagesDTO;
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
+import lombok.AllArgsConstructor;
+import lombok.Builder;
 import lombok.Data;
+import lombok.NoArgsConstructor;
 
-import java.io.Serializable;
 import java.util.List;
 
 @Data
 @ApiModel(value = "主题内容")
-public class ThemeContentQo implements Serializable {
-
-    private static final long serialVersionUID = 100042751824238477L;
+@Builder
+@AllArgsConstructor
+@NoArgsConstructor
+public class ThemeContentQo {
 
     @ApiModelProperty(value = "RelTypeEnum类型，8：文本，88:产品 3：直播 6：短视频 2：课程，9：图片 10：多图（讨论）")
     private String type;

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

@@ -3,12 +3,18 @@ package com.tanpu.community.api.beans.qo;
 import com.tanpu.community.api.beans.ImagesDTO;
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
+import lombok.AllArgsConstructor;
+import lombok.Builder;
 import lombok.Data;
+import lombok.NoArgsConstructor;
 
 import java.io.Serializable;
 import java.util.List;
 
 @Data
+@Builder
+@AllArgsConstructor
+@NoArgsConstructor
 @ApiModel("主题信息流对象")
 public class ThemeQo implements Serializable {
 
@@ -24,7 +30,7 @@ public class ThemeQo implements Serializable {
     @ApiModelProperty(value = "标题")
     private String title;
 
-    @ApiModelProperty(value = "类型 1：讨论无标题 2：长文有标题 3：转发")
+    @ApiModelProperty(value = "类型 1：讨论无标题 2：长文有标题 3：转发 4:评论")
     private Integer themeType;
 
     @ApiModelProperty(value = "内容")
@@ -75,6 +81,9 @@ public class ThemeQo implements Serializable {
     @ApiModelProperty(value = "转发的主题")
     private FormerThemeQo formerTheme;
 
+    @ApiModelProperty(value = "评论Id(我的评论列表使用)")
+    private String commentId;
+
     private Long createTime;
 
     private Long updateTime;

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

@@ -18,5 +18,8 @@ public class TopicTitileQo {
     private String topicTitle;
 
     @ApiModelProperty("讨论数")
-    private Integer discussionCount;
+    private String discussionCount;
+
+    @ApiModelProperty("浏览量")
+    private String viewCount;
 }

community-api/src/main/java/com/tanpu/community/api/beans/req/comment/CreateCommentReq.java

@@ -5,13 +5,12 @@ import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
 
 import javax.validation.constraints.NotBlank;
-import javax.validation.constraints.NotEmpty;
 
 @ApiModel
 @Data
 public class CreateCommentReq {
 
-    @NotEmpty(message = "主题id不能为空")
+    @NotBlank(message = "主题id不能为空")
     @ApiModelProperty(value = "主题Id")
     private String themeId;
 

community-api/src/main/java/com/tanpu/community/api/beans/req/comment/LikeCommentReq.java

@@ -4,10 +4,13 @@ import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
 
-@ApiModel(value = "点赞/取消点赞评论")
+import javax.validation.constraints.NotBlank;
+
 @Data
+@ApiModel(value = "点赞/取消点赞评论")
 public class LikeCommentReq {
 
+    @NotBlank
     @ApiModelProperty(value = "评论Id")
     private String commentId;
 

community-api/src/main/java/com/tanpu/community/api/beans/req/homepage/AddIdolReq.java → community-api/src/main/java/com/tanpu/community/api/beans/req/homepage/FollowRelReq.java

@@ -4,11 +4,11 @@ import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
 
 @Data
-public class AddIdolReq {
+public class FollowRelReq {
 
     @ApiModelProperty(value = "关注对象Id")
     private String followUserId;
 
-    @ApiModelProperty(value = "粉丝Id")
-    private String followerId;
+    @ApiModelProperty(value = "关注类型，1：关注 2：取消关注")
+    private Integer type;
 }

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

@@ -4,6 +4,7 @@ import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
 
+import javax.validation.constraints.NotBlank;
 import javax.validation.constraints.NotNull;
 
 @Data
@@ -11,12 +12,14 @@ import javax.validation.constraints.NotNull;
 public class QueryRecordThemeReq {
 
     @ApiModelProperty("用户Id")
+    @NotBlank
     private String userId;
 
-    @ApiModelProperty(value = "操作类型 1：发布 2：点赞 3：收藏")
+    @NotNull
+    @ApiModelProperty(value = "操作类型 1：发布 2：回复 3：点赞 4：收藏")
     private Integer recordType;
 
-    @ApiModelProperty(value = "当前浏览的最后一个themeId,可以为空")
+    @ApiModelProperty(value = "当前浏览的最后一个themeId/commentId,可以为空")
     private String lastId;
 
     @NotNull(message = "PageSize不能为空")

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

@@ -26,11 +26,11 @@ public class CreateThemeReq {
     private List<ThemeContentReq> content;
 
     @ApiModelProperty(value = "所属的话题id")
-    private String topicId;
+    private String topicId="";
 
 
     @ApiModelProperty(value = "修改，则传入正在编辑的ThemeId")
-    private String editThemeId;
+    private String editThemeId="";
 
 
 }

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

@@ -4,25 +4,25 @@ import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
 
+import javax.validation.constraints.NotBlank;
 import javax.validation.constraints.NotEmpty;
-import javax.validation.constraints.NotNull;
 import java.util.List;
 
 @Data
 @ApiModel(value = "转发主题")
 public class ForwardThemeReq {
 
-    @NotEmpty(message = "转发对象id不能为空")
+    @NotBlank(message = "转发对象id不能为空")
     @ApiModelProperty(value = "转发的主题Id")
     private String formerThemeId;
 
-    @NotNull(message = "内容不能为空")
+    @NotEmpty(message = "内容不能为空")
     @ApiModelProperty(value = "转发的讨论内容")
     private List<ThemeContentReq> content;
 
     @ApiModelProperty(value = "话题Id")
-    private String topicId;
+    private String topicId="";
 
     @ApiModelProperty(value = "修改，则传入正在编辑的ThemeId")
-    private String editThemeId;
+    private String editThemeId="";
 }

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

@@ -4,14 +4,22 @@ package com.tanpu.community.api.beans.req.theme;
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
 
+import javax.validation.constraints.NotNull;
+
 @Data
 public class ThemeListByTopicReq {
     @ApiModelProperty(value = "当前浏览的最后一个themeId")
-    private String lastId;
+    private String lastId="";
+
+    @NotNull
     @ApiModelProperty(value = "页面大小")
     private Integer PageSize;
+
+    @NotNull
     @ApiModelProperty(value = "类型，1：最热 2：最新")
     private Integer type;
+
+    @NotNull
     @ApiModelProperty(value = "话题Id")
     private String topicId;
 

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

@@ -18,7 +18,7 @@ public class ThemeListReq {
     private String topicId;
 
     @ApiModelProperty(value = "当前浏览的最后一个themeId,可以为空")
-    private String lastId;
+    private String lastId="";
 
     @NotNull(message = "PageSize不能为空")
     @ApiModelProperty(value = "页面大小")

community-api/src/main/java/com/tanpu/community/api/beans/req/topic/TopicSearchReq.java

@@ -8,7 +8,7 @@ import lombok.Data;
 @Data
 public class TopicSearchReq {
     @ApiModelProperty(value = "搜索关键字,可以为空")
-    private String searchKeyword;
+    private String searchKeyword="";
 
     @ApiModelProperty(value = "分页")
     private Pageable page;

community-api/src/main/java/com/tanpu/community/api/beans/resp/CreateThemeResp.java

+package com.tanpu.community.api.beans.resp;
+
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.AllArgsConstructor;
+import lombok.Builder;
+import lombok.Data;
+import lombok.NoArgsConstructor;
+
+@ApiModel(value = "创建主题")
+@Data
+@Builder
+@NoArgsConstructor
+@AllArgsConstructor
+public class CreateThemeResp {
+
+    @ApiModelProperty(value = "主题id")
+    private String themeId;
+}

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

+package com.tanpu.community.api.enums;
+
+/**
+ * 通用操作类型枚举，包括点赞/取消点赞，收藏/取消收藏,关注/取消关注
+ */
+public enum OperationTypeEnum {
+    CONFIRM(1,"确认操作"),
+    CANCEL(2,"取消操作");
+
+    private Integer code;
+    private String 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;
+    }
+
+    OperationTypeEnum(Integer code, String type) {
+        this.code = code;
+        this.type = type;
+    }
+}

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

@@ -14,6 +14,7 @@ import com.tanpu.community.util.PageUtils;
 import io.swagger.annotations.ApiOperation;
 import lombok.extern.slf4j.Slf4j;
 import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.validation.annotation.Validated;
 import org.springframework.web.bind.annotation.*;
 
 import javax.annotation.Resource;
@@ -34,7 +35,7 @@ public class CommentController {
     @AuthLogin
     @PostMapping(value = "/publishComment")
     @ResponseBody
-    public CommonResp<Void> publishCommet(@RequestBody CreateCommentReq req) {
+    public CommonResp<Void> publishCommet(@Validated @RequestBody CreateCommentReq req) {
         String userId = userHolder.getUserId();
         commentManager.comment(req, userId);
         return CommonResp.success();
@@ -44,7 +45,7 @@ public class CommentController {
     @AuthLogin
     @PostMapping(value = "/queryComment")
     @ResponseBody
-    public CommonResp<Page<CommentQo>> queryComment(@RequestBody QueryCommentReq req) {
+    public CommonResp<Page<CommentQo>> queryComment(@Validated  @RequestBody QueryCommentReq req) {
         String userId = userHolder.getUserId();
         List<CommentQo> result = commentManager.queryComments(req.getThemeId(), userId);
         return CommonResp.success(PageUtils.page(req.getPage(), result));
@@ -54,7 +55,7 @@ public class CommentController {
     @PostMapping(value = "/likeComment")
     @AuthLogin
     @ResponseBody
-    public CommonResp<Void> likeComment(@RequestBody LikeCommentReq req) {
+    public CommonResp<Void> likeComment(@Validated @RequestBody LikeCommentReq req) {
         String userId = userHolder.getUserId();
         commentManager.likeComment(req, userId);
         return CommonResp.success();

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

 package com.tanpu.community.controller;
 
 import com.tanpu.common.api.CommonResp;
+import com.tanpu.common.auth.AuthLogin;
+import com.tanpu.common.auth.UserHolder;
 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.FollowRelReq;
 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;
@@ -16,6 +18,7 @@ import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.validation.annotation.Validated;
 import org.springframework.web.bind.annotation.*;
 
+import javax.annotation.Resource;
 import java.util.List;
 
 @RestController
@@ -29,6 +32,9 @@ public class HomePageController {
     @Autowired
     private ThemeManager themeManager;
 
+    @Resource
+    private UserHolder userHolder;
+
     @PostMapping(value = "/editInfo")
     @ApiOperation("编辑圈子个人资料")
     @ResponseBody
@@ -41,27 +47,37 @@ public class HomePageController {
     @PostMapping(value = "/followList")
     @ApiOperation("查询关注/粉丝列表")
     @ResponseBody
+    @AuthLogin
     public CommonResp<Page<FollowQo>> queryMyFans(@RequestBody QueryFollowReq req) {
-        String userId = "123";
-        return CommonResp.success(homePageManager.queryFollow(req));
+        String userId = userHolder.getUserId();
+        return CommonResp.success(homePageManager.queryFollow(req,userId));
     }
 
     @PostMapping(value = "/addIdol")
-    @ApiOperation("关注他人")
+    @ApiOperation("关注/取消关注他人")
     @ResponseBody
-    public CommonResp addIdol(@RequestBody AddIdolReq req) {
-        String userId = "123";
-        homePageManager.addIdol(req.getFollowUserId(), req.getFollowUserId());
+    public CommonResp addIdol(@RequestBody FollowRelReq req) {
+        String userId = userHolder.getUserId();
+        homePageManager.addFollowRel(req,userId);
         return CommonResp.success();
     }
 
     @PostMapping(value = "/themeList")
     @ApiOperation("用户的帖子列表")
     @ResponseBody
-    public CommonResp<List<ThemeQo>> likeList(@RequestBody QueryRecordThemeReq req){
-        String userId="123";
-
+    @AuthLogin
+    public CommonResp<List<ThemeQo>> likeList(@Validated @RequestBody QueryRecordThemeReq req){
+        String userId = userHolder.getUserId();
         return CommonResp.success(themeManager.queryThemesByUser(req,userId));
     }
 
+//    @PostMapping(value = "/commentThemeList")
+//    @ApiOperation("用户评论过的帖子列表")
+//    @ResponseBody
+//    public CommonResp<List<ThemeQo>> commentThemeList(@RequestBody QueryRecordThemeReq req){
+//        String userId="123";
+//
+//        return CommonResp.success(themeManager.queryThemesByUser(req,userId));
+//    }
+
 }

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

@@ -25,6 +25,6 @@ public class TestController {
     @GetMapping(value = "/1")
     @ResponseBody
     public Object sendKafka() {
-        return userInfoService.selectById("USER_INFO15912897523789");
+        return userInfoService.queryUserById("USER_INFO15912897523789");
     }
 }

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

@@ -7,6 +7,7 @@ import com.tanpu.common.auth.UserHolder;
 import com.tanpu.common.exception.BizException;
 import com.tanpu.community.api.beans.qo.ThemeQo;
 import com.tanpu.community.api.beans.req.theme.*;
+import com.tanpu.community.api.beans.resp.CreateThemeResp;
 import com.tanpu.community.manager.ThemeManager;
 import io.swagger.annotations.ApiOperation;
 import lombok.extern.slf4j.Slf4j;
@@ -32,13 +33,12 @@ public class ThemeController {
     @ApiOperation("发表主题")
     @PostMapping(value = "/publish")
     @ResponseBody
-    public CommonResp<Void> publishTheme(@Validated @RequestBody CreateThemeReq req) {
+    public CommonResp<CreateThemeResp> publishTheme(@Validated @RequestBody CreateThemeReq req) {
         String userId = userHolder.getUserId();
         if(StringUtils.isEmpty(userId)){
             throw new BizException("用户为空");
         }
-        themeManager.publishTheme(req, userId);
-        return CommonResp.success();
+        return CommonResp.success(themeManager.publishTheme(req, userId));
     }
 
     @AuthLogin

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

@@ -5,6 +5,7 @@ import com.tanpu.community.api.beans.req.comment.CreateCommentReq;
 import com.tanpu.community.api.beans.req.comment.LikeCommentReq;
 import com.tanpu.community.api.enums.CollectionTypeEnum;
 import com.tanpu.community.api.enums.CommentTypeEnum;
+import com.tanpu.community.api.enums.OperationTypeEnum;
 import com.tanpu.community.dao.entity.community.CommentEntity;
 import com.tanpu.community.dao.entity.user.UserInfoEntity;
 import com.tanpu.community.service.CollectionService;
@@ -50,7 +51,7 @@ public class CommentManager {
     }
 
     //查询
-    public List<CommentQo> queryComments(String themeId,String userId) {
+    public List<CommentQo> queryComments(String themeId, String userId) {
         List<CommentEntity> commentEntities = commentService.selectByThemeIdAndParentId(themeId, null);
         List<CommentQo> commentQos = ConvertUtil.commentEntity2Qos(commentEntities);
 
@@ -60,19 +61,19 @@ public class CommentManager {
         for (CommentQo commentQo : commentQos) {
             //用户信息
             String authorId = commentQo.getAuthorId();
-            UserInfoEntity userInfo = userInfoService.selectById(authorId);
-            if (userInfo!=null){
+            UserInfoEntity userInfo = userInfoService.queryUserById(authorId);
+            if (userInfo != null) {
                 commentQo.setUserImg(userInfo.getUiHeadimg());
                 commentQo.setNickName(userInfo.getUiNickname());
             }
             //是否点赞及点赞数
             String commentId = commentQo.getCommentId();
-            if (likeCommentList.contains(commentId)){
+            if (likeCommentList.contains(commentId)) {
                 commentQo.setHasLiked(true);
-            }else {
+            } else {
                 commentQo.setHasLiked(false);
             }
-            Integer countByTypeAndId = collectionService.getCountByTypeAndId(commentId,CollectionTypeEnum.LIKE_COMMENT);
+            Integer countByTypeAndId = collectionService.getCountByTypeAndId(commentId, CollectionTypeEnum.LIKE_COMMENT);
             commentQo.setLikeCount(countByTypeAndId);
 
             //二级评论,本期不上线
@@ -86,10 +87,9 @@ public class CommentManager {
 
     //点赞评论/取消点赞
     public void likeComment(LikeCommentReq req, String userId) {
-        //todo 枚举值
-        if (1==req.getType()){
+        if (OperationTypeEnum.CONFIRM.getCode().equals(req.getType())) {
             collectionService.addIfNotExist(req.getCommentId(), userId, CollectionTypeEnum.LIKE_COMMENT);
-        }else if (2==req.getType()) {
+        } else if (OperationTypeEnum.CANCEL.getCode().equals(req.getType())) {
             collectionService.delete(req.getCommentId(), userId, CollectionTypeEnum.LIKE_COMMENT);
         }
 

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

 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.FollowRelReq;
 import com.tanpu.community.api.beans.req.homepage.QueryFollowReq;
 import com.tanpu.community.api.beans.req.page.Page;
+import com.tanpu.community.api.enums.OperationTypeEnum;
 import com.tanpu.community.api.enums.QueryFollowTypeEnum;
-import com.tanpu.community.dao.entity.community.HomePageEntity;
+import com.tanpu.community.dao.entity.user.UserInfoEntity;
 import com.tanpu.community.service.FollowRelService;
-import com.tanpu.community.service.HomePageService;
+import com.tanpu.community.service.UserInfoService;
 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;
@@ -25,42 +25,26 @@ public class HomePageManager {
     @Autowired
     private FollowRelService followRelService;
 
-    @Resource
-    private HomePageService homePageService;
 
-//    public  void editUserInfo(HomePageReq req,String userId) {
-//        HomePageEntity entity = HomePageEntity.builder()
-//                .userId(userId)
-//                .nickName(req.getNickName())
-//                .headImg(req.getHeadImg())
-//                .introduction(req.getIntroduction())
-//                .sex(req.getSex())
-//                .location(req.getLocation())
-//                .build();
-//        if(homePageService.selectByUserId(userId) == null){
-//            homePageService.insert(entity);
-//        }else {
-//            homePageService.update(entity);
-//        }
-//        return;
-//    }
+    @Autowired
+    private UserInfoService userInfoService;
 
 
     //获取用户关注、粉丝列表
-    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 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);
+        return PageUtils.page(req.getPage(), followQos);
     }
 
     //判断返回列表中的用户是否被当前用户关注
-    public List<FollowQo> judgeFollowed(List<FollowQo> followQos,String followerId){
+    public List<FollowQo> judgeFollowed(List<FollowQo> followQos, String followerId) {
         Set<String> idolSet = new HashSet<>(followRelService.queryFansByFollowerId(followerId));
-        return followQos.stream().map(o->{
-            if (idolSet.contains(o.getUserId())){
+        return followQos.stream().map(o -> {
+            if (idolSet.contains(o.getUserId())) {
                 o.setFollowed(true);
             }
             return o;
@@ -68,7 +52,11 @@ public class HomePageManager {
 
     }
 
-    public void addIdol(String idolId, String followerId) {
-        followRelService.addFans(idolId, followerId);
+    public void addFollowRel(FollowRelReq req, String followerId) {
+        if (OperationTypeEnum.CONFIRM.getCode().equals(req.getType())) {
+            followRelService.addFollowRel(req.getFollowUserId(), followerId);
+        } else if (OperationTypeEnum.CANCEL.getCode().equals(req.getType())) {
+            followRelService.deleteFollowRel(req.getFollowUserId(), followerId);
+        }
     }
 }

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

@@ -68,7 +68,11 @@ public class TopicManager {
             //讨论数=发布主题贴数+回复总数
             List<String> themeIds = themeService.queryThemeIdsByTopic(topicQo.getTopicId());
             Integer commentCount = commentService.getCommentCountByThemeIds(themeIds);
-            topicQo.setDiscussionCount(themeIds.size() + commentCount);
+            topicQo.setDiscussionCount(String.valueOf(themeIds.size() + commentCount));
+            //浏览量
+            Integer topicPV = visitSummaryService.queryTopicDetailVisit(topicQo.getTopicId());
+            Integer themePV = visitSummaryService.queryThemeVisit(themeIds);
+            topicQo.setViewCount(String.valueOf(topicPV + themePV));
         }
         //TODO 判断顶置
         return PageUtils.page(req.getPage(), topicTitileQos);

community-service/src/main/java/com/tanpu/community/service/other/BlackListService.java → community-service/src/main/java/com/tanpu/community/service/BlackListService.java

-package com.tanpu.community.service.other;
+package com.tanpu.community.service;
 
 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import com.tanpu.common.exception.BizException;

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

 package com.tanpu.community.service;
 
 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
+import com.tanpu.common.exception.BizException;
 import com.tanpu.common.uuid.UuidGenHelper;
 import com.tanpu.community.api.enums.CommentTypeEnum;
 import com.tanpu.community.api.enums.DeleteTagEnum;
@@ -8,6 +9,7 @@ import com.tanpu.community.api.enums.TopicStatusEnum;
 import com.tanpu.community.dao.entity.community.CommentEntity;
 import com.tanpu.community.dao.mapper.community.CommentMapper;
 import org.apache.commons.collections4.CollectionUtils;
+import org.apache.commons.lang3.StringUtils;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
@@ -74,4 +76,22 @@ public class CommentService {
                 .eq(CommentEntity::getCommentType, CommentTypeEnum.THEME.getCode())
                 .eq(CommentEntity::getDeleteTag,DeleteTagEnum.NOT_DELETED.getCode()));
     }
+
+
+    public List<CommentEntity> queryThemesByUserId(String userId, String lastId,Integer pageSize) {
+        LambdaQueryWrapper<CommentEntity> queryWrapper = new LambdaQueryWrapper<CommentEntity>()
+                .eq(CommentEntity::getAuthorId, userId)
+                .eq(CommentEntity::getCommentType, CommentTypeEnum.THEME.getCode())
+                .eq(CommentEntity::getDeleteTag, DeleteTagEnum.NOT_DELETED.getCode());
+        if (StringUtils.isNotEmpty(lastId)) {
+            CommentEntity commentEntity = commentMapper.selectOne(new LambdaQueryWrapper<CommentEntity>()
+                    .eq(CommentEntity::getCommentId,lastId));
+            if (commentEntity==null) throw new BizException("主题未找到，id："+lastId);
+            queryWrapper.lt(CommentEntity::getUpdateTime, commentEntity.getCreateTime());
+        }
+        if (pageSize!=null){
+            queryWrapper.last("limit "+pageSize);
+        }
+        return commentMapper.selectList(queryWrapper);
+    }
 }

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

 package com.tanpu.community.service;
 
 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
+import com.tanpu.common.exception.BizException;
+import com.tanpu.community.api.enums.DeleteTagEnum;
 import com.tanpu.community.dao.entity.community.FollowRelEntity;
 import com.tanpu.community.dao.mapper.community.FollowRelMapper;
 import org.springframework.cache.annotation.EnableCaching;
@@ -8,6 +10,7 @@ import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
 
 import javax.annotation.Resource;
+import java.time.LocalDateTime;
 import java.util.List;
 import java.util.stream.Collectors;
 
@@ -20,24 +23,61 @@ public class FollowRelService {
 
     public List<String> queryFansByFollowerId(String followerId) {
         return followRelMapper.selectList(new LambdaQueryWrapper<FollowRelEntity>()
-                .eq(FollowRelEntity::getFollowerId, followerId))
-                .stream().map(FollowRelEntity::getFollowUserId).collect(Collectors.toList());
+                .eq(FollowRelEntity::getFollowerId, followerId)
+                .eq(FollowRelEntity::getDeleteTag, DeleteTagEnum.NOT_DELETED.getCode()))
+                .stream().map(FollowRelEntity::getFollowUserId)
+                .collect(Collectors.toList());
     }
 
 //    @Cacheable(value = "tempCache", keyGenerator = "communityKeyGenerator")
     public List<String> queryFansByIdolId(String idolId) {
         LambdaQueryWrapper<FollowRelEntity> queryWrapper = new LambdaQueryWrapper<FollowRelEntity>()
-                .eq(FollowRelEntity::getFollowUserId, idolId);
+                .eq(FollowRelEntity::getFollowUserId, idolId)
+                .eq(FollowRelEntity::getDeleteTag, DeleteTagEnum.NOT_DELETED.getCode());
         return followRelMapper.selectList(queryWrapper)
                 .stream().map(FollowRelEntity::getFollowerId).collect(Collectors.toList());
     }
 
     @Transactional
-    public void addFans(String idolId, String followerId) {
-        FollowRelEntity rel = new FollowRelEntity();
-        rel.setFollowUserId(idolId);
-        rel.setFollowerId(followerId);
+    public void addFollowRel(String idolId, String followerId) {
+        FollowRelEntity searchResult = queryRecord(idolId, followerId);
+        if (searchResult==null){
+            FollowRelEntity entity = FollowRelEntity.builder()
+                    .followUserId(idolId)
+                    .followerId(followerId)
+                    .followTime(LocalDateTime.now())
+                    .build();
 
-        followRelMapper.insert(rel);
+            followRelMapper.insert(entity);
+        }else {
+            searchResult.setFollowTime(LocalDateTime.now());
+            searchResult.setDeleteTag(DeleteTagEnum.NOT_DELETED.getCode());
+            followRelMapper.updateById(searchResult);
+        }
+
+    }
+
+    /**
+     * 逻辑删除关注关系
+     * @param idolId
+     * @param followerId
+     */
+    @Transactional
+    public void deleteFollowRel(String idolId, String followerId) {
+        FollowRelEntity searchResult = queryRecord(idolId, followerId);
+        if (searchResult==null){
+            throw new BizException("未找到关注关系");
+        }
+        searchResult.setUnfollowTime(LocalDateTime.now());
+        searchResult.setDeleteTag(DeleteTagEnum.DELETED.getCode());
+        followRelMapper.updateById(searchResult);
     }
+
+    public FollowRelEntity queryRecord(String idolId, String followerId){
+        return followRelMapper.selectOne(new LambdaQueryWrapper<FollowRelEntity>()
+                .eq(FollowRelEntity::getFollowUserId,idolId)
+                .eq(FollowRelEntity::getFollowerId,followerId));
+    }
+
+
 }

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

@@ -116,7 +116,8 @@ public class OSSFileService {
     }
 
     public FileRecordEntity queryById(String fileId) {
-        return fileRecordMapper.selectById(fileId);
+        return fileRecordMapper.selectOne(new LambdaQueryWrapper<FileRecordEntity>()
+                .eq(FileRecordEntity::getFileId,fileId));
     }
 
     public List<FileRecordEntity> queryByIds(List<String> fileIds) {

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

@@ -44,30 +44,69 @@ public class ThemeService {
                 .eq(ThemeEntity::getThemeId,themeId));
     }
 
-    public List<ThemeEntity> queryThemeIdsByUserId(String userId) {
+    public List<ThemeEntity> queryThemesByUserId(String userId) {
         return themeMapper.selectList(new LambdaQueryWrapper<ThemeEntity>()
                 .eq(ThemeEntity::getAuthorId,userId)
-                .eq(ThemeEntity::getDeleteTag,DeleteTagEnum.NOT_DELETED.getCode()));
+                .eq(ThemeEntity::getDeleteTag,DeleteTagEnum.NOT_DELETED.getCode())
+                .orderByDesc(ThemeEntity::getId));
+    }
+
+    public List<ThemeEntity> queryThemesByUserId(String userId, String lastId, Integer pageSize) {
+        LambdaQueryWrapper<ThemeEntity> queryWrapper = new LambdaQueryWrapper<ThemeEntity>()
+                .eq(ThemeEntity::getAuthorId, userId)
+                .eq(ThemeEntity::getDeleteTag, DeleteTagEnum.NOT_DELETED.getCode())
+                .orderByDesc(ThemeEntity::getId);
+        if (StringUtils.isNotEmpty(lastId)) {
+            ThemeEntity lastEntity = queryByThemeId(lastId);
+            if (lastEntity==null) throw new BizException("主题未找到，id："+lastId);
+            queryWrapper.lt(ThemeEntity::getUpdateTime, lastEntity.getCreateTime());
+        }
+        if (pageSize!=null){
+            queryWrapper.last("limit "+pageSize);
+        }
+        return themeMapper.selectList(queryWrapper);
+    }
+
+    //根据ids返回主题详情
+    public List<ThemeEntity> queryByThemeIds(List<String> themeIds, String lastId,Integer pageSize) {
+        LambdaQueryWrapper<ThemeEntity> queryWrapper = new LambdaQueryWrapper<ThemeEntity>()
+                .in(ThemeEntity::getThemeId, themeIds)
+                .eq(ThemeEntity::getDeleteTag, DeleteTagEnum.NOT_DELETED.getCode());
+        if (StringUtils.isNotEmpty(lastId)) {
+            ThemeEntity lastEntity = queryByThemeId(lastId);
+            if (lastEntity==null) throw new BizException("主题未找到，id："+lastId);
+            queryWrapper.lt(ThemeEntity::getUpdateTime, lastEntity.getCreateTime());
+        }
+        if (pageSize!=null){
+            queryWrapper.last("limit "+pageSize);
+        }
+        return themeMapper.selectList(queryWrapper);
     }
 
     //根据ids返回主题详情
     public List<ThemeEntity> queryByThemeIds(List<String> themeIds) {
-        return themeMapper.selectList(new LambdaQueryWrapper<ThemeEntity>()
-                .in(ThemeEntity::getThemeId,themeIds)
-                .eq(ThemeEntity::getDeleteTag,DeleteTagEnum.NOT_DELETED.getCode()));
+        LambdaQueryWrapper<ThemeEntity> queryWrapper = new LambdaQueryWrapper<ThemeEntity>()
+                .in(ThemeEntity::getThemeId, themeIds)
+                .eq(ThemeEntity::getDeleteTag, DeleteTagEnum.NOT_DELETED.getCode());
+
+        return themeMapper.selectList(queryWrapper);
     }
 
     //分页倒叙lastId之前的主题
     public List<ThemeEntity> selectAll(String lastId,Integer pageSize) {
-        LambdaQueryWrapper<ThemeEntity> queryWrapper = new LambdaQueryWrapper<ThemeEntity>()
-                .orderByDesc(ThemeEntity::getUpdateTime);
+        LambdaQueryWrapper<ThemeEntity> queryWrapper = new LambdaQueryWrapper<ThemeEntity>();
+
+
         if (StringUtils.isNotEmpty(lastId)) {
             ThemeEntity lastEntity = queryByThemeId(lastId);
             if (lastEntity==null) throw new BizException("主题未找到，id："+lastId);
-            queryWrapper.lt(ThemeEntity::getUpdateTime, lastEntity.getUpdateTime());
+            queryWrapper.lt(ThemeEntity::getUpdateTime, lastEntity.getCreateTime());
         }
+
         queryWrapper.last("limit "+pageSize);
         queryWrapper.orderByDesc(ThemeEntity::getId);
+        queryWrapper.orderByDesc(ThemeEntity::getCreateTime);
+        queryWrapper.eq(ThemeEntity::getDeleteTag,DeleteTagEnum.NOT_DELETED.getCode());
         return themeMapper.selectList(queryWrapper);
     }
 
@@ -79,18 +118,19 @@ public class ThemeService {
      * @param pageSize 查询数量
      * @return
      */
-    public List<ThemeEntity> queryByTopic(String topidId, String lastId,Integer pageSize) {
+    public List<ThemeEntity> queryByTopic(String topidId, String lastId, Integer pageSize) {
         LambdaQueryWrapper<ThemeEntity> queryWrapper = new LambdaQueryWrapper<ThemeEntity>()
                 .eq(ThemeEntity::getTopicId, topidId);
         if (StringUtils.isNotEmpty(lastId)) {
             ThemeEntity lastEntity = queryByThemeId(lastId);
             if (lastEntity==null) throw new BizException("主题未找到，id："+lastId);
-            queryWrapper.lt(ThemeEntity::getUpdateTime, lastEntity.getUpdateTime());
+            queryWrapper.lt(ThemeEntity::getUpdateTime, lastEntity.getCreateTime());
         }
         if (pageSize!=null){
             queryWrapper.last("limit "+pageSize);
         }
-        queryWrapper.orderByDesc(ThemeEntity::getId);
+        queryWrapper.orderByDesc(ThemeEntity::getCreateTime);
+        queryWrapper.eq(ThemeEntity::getDeleteTag,DeleteTagEnum.NOT_DELETED.getCode());
         return themeMapper.selectList(queryWrapper);
     }
 
@@ -109,15 +149,15 @@ public class ThemeService {
     //关注的主题列表
     public List<ThemeEntity> queryByUserIds(List<String> userIds, String lastId, Integer pageSize) {
         LambdaQueryWrapper<ThemeEntity> queryWrapper = new LambdaQueryWrapper<ThemeEntity>()
-                .in(ThemeEntity::getAuthorId, userIds)
-                .orderByDesc(ThemeEntity::getUpdateTime);
+                .in(ThemeEntity::getAuthorId, userIds);
         if (StringUtils.isNotEmpty(lastId)) {
             ThemeEntity lastEntity = queryByThemeId(lastId);
             if (lastEntity==null) throw new BizException("主题未找到，id："+lastId);
-            queryWrapper.lt(ThemeEntity::getUpdateTime, lastEntity.getUpdateTime());
+            queryWrapper.lt(ThemeEntity::getUpdateTime, lastEntity.getCreateTime());
         }
         queryWrapper.last("limit "+pageSize);
-
+        queryWrapper.orderByDesc(ThemeEntity::getCreateTime);
+        queryWrapper.eq(ThemeEntity::getDeleteTag,DeleteTagEnum.NOT_DELETED.getCode());
         return themeMapper.selectList(queryWrapper);
 
     }
@@ -145,7 +185,8 @@ public class ThemeService {
 
     @Transactional
     public void deleteById(String themeId) {
-        ThemeEntity themeEntity = themeMapper.selectById(themeId);
+        ThemeEntity themeEntity = themeMapper.selectOne(new LambdaQueryWrapper<ThemeEntity>()
+                .eq(ThemeEntity::getThemeId, themeId));
         if (themeEntity==null){
             throw new BizException("主题未找到，id:"+themeId);
         }

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

@@ -7,12 +7,14 @@ import com.tanpu.community.api.enums.DeleteTagEnum;
 import com.tanpu.community.api.enums.TopicStatusEnum;
 import com.tanpu.community.dao.entity.community.TopicEntity;
 import com.tanpu.community.dao.mapper.community.TopicMapper;
+import org.apache.commons.collections4.CollectionUtils;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.cache.annotation.EnableCaching;
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
 
 import javax.annotation.Resource;
+import java.util.Collections;
 import java.util.List;
 
 
@@ -83,11 +85,14 @@ public class TopicService {
     }
 
     public List<TopicEntity> queryByIds(List<String> topicIds) {
+        if (CollectionUtils.isEmpty(topicIds)){
+            return Collections.emptyList();
+        }
         return topicMapper.selectList(new LambdaQueryWrapper<TopicEntity>().in(TopicEntity::getTopicId,topicIds));
     }
 
     public void modifyViewCount(String topicId, long Count) {
-        TopicEntity topicEntity = topicMapper.selectById(topicId);
+        TopicEntity topicEntity = queryById(topicId);
         Long oldCount = topicEntity.getviewCntAdjust();
         topicEntity.setViewAmountModify(topicEntity.getviewCntAdjust() + Count);
         topicMapper.update(topicEntity, new LambdaUpdateWrapper<TopicEntity>()

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

@@ -14,11 +14,11 @@ public class UserInfoService {
     private UserInfoMapper userInfoMapper;
 
 
-    public UserInfoEntity selectById(String userId) {
+    public UserInfoEntity queryUserById(String userId) {
         return userInfoMapper.selectById(userId);
     }
 
-    public List<UserInfoEntity> selectByIds(List<String> ids) {
+    public List<UserInfoEntity> queryUserByIds(List<String> ids) {
         return userInfoMapper.selectBatchIds(ids);
     }
 }

community-service/src/main/java/com/tanpu/community/service/other/UserService.java → community-service/src/main/java/com/tanpu/community/service/UserService.java

-package com.tanpu.community.service.other;
+package com.tanpu.community.service;
 
 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import com.tanpu.community.dao.entity.user.UserRistRzEntity;

community-service/src/main/java/com/tanpu/community/service/other/CurriculumPriceService.java

-package com.tanpu.community.service.other;
-
-import com.tanpu.community.dao.entity.user.CurriculumPriceEntity;
-import com.tanpu.community.dao.mapper.user.CurriculumPriceMapper;
-import org.apache.commons.collections4.CollectionUtils;
-import org.springframework.stereotype.Service;
-
-import javax.annotation.Resource;
-import java.util.Collections;
-import java.util.List;
-
-@Service
-public class CurriculumPriceService {
-
-    @Resource
-    private CurriculumPriceMapper curriculumPriceMapper;
-
-
-    public CurriculumPriceEntity selectById(String id){
-        return curriculumPriceMapper.selectById(id);
-    }
-
-    public List<CurriculumPriceEntity> selectByIds(List<String> ids){
-        if (CollectionUtils.isEmpty(ids)){
-            return Collections.emptyList();
-        }
-        return curriculumPriceMapper.selectBatchIds(ids);
-    }
-}

community-service/src/main/java/com/tanpu/community/service/other/CurriculumResService.java

-package com.tanpu.community.service.other;
-
-import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
-import com.tanpu.community.api.enums.CurriculumEnum;
-import com.tanpu.community.api.enums.DeleteTagEnum;
-import com.tanpu.community.dao.entity.user.CurriculumResEntity;
-import com.tanpu.community.dao.mapper.user.CurriculumResMapper;
-import org.springframework.stereotype.Service;
-
-import javax.annotation.Resource;
-
-/**
- * 短视频详情
- */
-@Service
-public class CurriculumResService {
-
-    @Resource
-    private CurriculumResMapper curriculumResMapper;
-
-    public CurriculumResEntity selectById(String id) {
-        return curriculumResMapper.selectById(id);
-    }
-
-    public CurriculumResEntity selectShortVideo(String id){
-        return curriculumResMapper.selectOne(new LambdaQueryWrapper<CurriculumResEntity>()
-                .eq(CurriculumResEntity::getId,id)
-                .eq(CurriculumResEntity::getDeleteTag, DeleteTagEnum.NOT_DELETED.getCode())
-                .eq(CurriculumResEntity::getStatus, CurriculumEnum.CcStatus.up));
-    }
-}

community-service/src/main/java/com/tanpu/community/service/other/FinProResService.java

-package com.tanpu.community.service.other;
-
-import com.tanpu.community.dao.entity.user.FinProResEntity;
-import com.tanpu.community.dao.mapper.user.FinProResMapper;
-import org.springframework.stereotype.Service;
-
-import javax.annotation.Resource;
-
-/**
- * 产品详情
- */
-@Service
-public class FinProResService {
-
-    @Resource
-    private FinProResMapper finProResMapper;
-
-    public FinProResEntity selectById(String id){
-        return finProResMapper.selectById(id);
-    }
-}

community-service/src/main/java/com/tanpu/community/service/other/OrderFlowService.java

-package com.tanpu.community.service.other;
-
-import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
-import com.tanpu.community.api.enums.DeleteTagEnum;
-import com.tanpu.community.dao.entity.user.OrderFlowEntity;
-import com.tanpu.community.dao.mapper.user.OrderFlowMapper;
-import org.apache.commons.collections4.CollectionUtils;
-import org.springframework.stereotype.Service;
-
-import javax.annotation.Resource;
-import java.util.Collections;
-import java.util.List;
-
-@Service
-public class OrderFlowService {
-
-    @Resource
-    private OrderFlowMapper orderFlowMapper;
-
-    public OrderFlowEntity selectById(String id){
-        return orderFlowMapper.selectById(id);
-    }
-
-    public List<OrderFlowEntity> selectByIds(List<String> ids){
-        if (CollectionUtils.isEmpty(ids)){
-            return Collections.emptyList();
-        }
-        return orderFlowMapper.selectBatchIds(ids);
-    }
-
-    public OrderFlowEntity queryByUserAndProId(String proId,String userId){
-        return orderFlowMapper.selectOne(new LambdaQueryWrapper<OrderFlowEntity>()
-                .eq(OrderFlowEntity::getCreateby,userId)
-                .eq(OrderFlowEntity::getAbProid,proId)
-                .eq(OrderFlowEntity::getDeletetag, DeleteTagEnum.NOT_DELETED.getCode())
-                .eq(OrderFlowEntity::getAbStatus,"SUCCESS"));
-    }
-}

community-service/src/main/java/com/tanpu/community/service/other/ZhiboService.java

-package com.tanpu.community.service.other;
-
-import com.tanpu.community.dao.entity.zhibo.ZhiboThemeEntity;
-import com.tanpu.community.dao.mapper.zhibo.ZhiboThemeMapper;
-import org.springframework.stereotype.Service;
-
-import javax.annotation.Resource;
-
-/**
- * 直播详情
- */
-@Service
-public class ZhiboService {
-
-    @Resource
-    private ZhiboThemeMapper zhiboThemeMapper;
-
-    public ZhiboThemeEntity selectByid(String id) {
-        return zhiboThemeMapper.selectById(id);
-    }
-}

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

@@ -10,6 +10,7 @@ import com.tanpu.community.api.beans.req.theme.ThemeContentReq;
 import com.tanpu.community.api.enums.DeleteTagEnum;
 import com.tanpu.community.api.enums.RelTypeEnum;
 import com.tanpu.community.dao.entity.community.*;
+import com.tanpu.community.dao.entity.user.UserInfoEntity;
 import org.springframework.beans.BeanUtils;
 
 import java.util.ArrayList;
@@ -19,20 +20,21 @@ import java.util.stream.Collectors;
 public class ConvertUtil {
 
     public static ThemeQo themeEntityToQo(ThemeEntity themeEntity) {
-        if (themeEntity==null){
+        if (themeEntity == null) {
             return null;
         }
         ThemeQo themeQO = new ThemeQo();
         BeanUtils.copyProperties(themeEntity, themeQO);
         themeQO.setUpdateTime(TimeUtil.getTimestampOfDateTime(themeEntity.getUpdateTime()));
         themeQO.setCreateTime(TimeUtil.getTimestampOfDateTime(themeEntity.getCreateTime()));
-        List<ThemeContentQo> themeContentQos = JsonUtil.toBean(themeEntity.getContent(), new TypeReference<List<ThemeContentQo>>() {});
+        List<ThemeContentQo> themeContentQos = JsonUtil.toBean(themeEntity.getContent(), new TypeReference<List<ThemeContentQo>>() {
+        });
         themeQO.setContent(themeContentQos);
         return themeQO;
     }
 
     public static ThemeQo themeEntityToQo2(ThemeEntity themeEntity) {
-        if (themeEntity==null){
+        if (themeEntity == null) {
             return null;
         }
         ThemeQo themeQO = new ThemeQo();
@@ -40,12 +42,13 @@ public class ConvertUtil {
         themeQO.setUpdateTime(TimeUtil.getTimestampOfDateTime(themeEntity.getUpdateTime()));
         themeQO.setCreateTime(TimeUtil.getTimestampOfDateTime(themeEntity.getCreateTime()));
         themeQO.setUpToNowTime(TimeUtil.calUpToNowTime(themeEntity.getCreateTime()));
-        List<ThemeContentQo> themeContentQos = JsonUtil.toBean(themeEntity.getContent(), new TypeReference<List<ThemeContentQo>>() {});
+        List<ThemeContentQo> themeContentQos = JsonUtil.toBean(themeEntity.getContent(), new TypeReference<List<ThemeContentQo>>() {
+        });
         //首页列表使用，限制附件个数为1（1文本+1附件）,-》已经改为全部返回
 //        if (themeContentQos != null && themeContentQos.size() > 2) {
 //            themeQO.setContent(themeContentQos.subList(0, 2));
 //        }else{
-            themeQO.setContent(themeContentQos);
+        themeQO.setContent(themeContentQos);
 //        }
 
         return themeQO;
@@ -60,6 +63,7 @@ public class ConvertUtil {
 
     /**
      * 首页主题列表，限制附件个数为1（1文本+1附件）
+     *
      * @param themeEntities
      * @return
      */
@@ -80,7 +84,7 @@ public class ConvertUtil {
         return topicHotQo;
     }
 
-    public static List<TopicHotQo> topicEntityToHotQos(List<TopicEntity> topicEntities){
+    public static List<TopicHotQo> topicEntityToHotQos(List<TopicEntity> topicEntities) {
         return topicEntities.stream().map(ConvertUtil::topicEntityToHotQo).collect(Collectors.toList());
     }
 
@@ -89,6 +93,7 @@ public class ConvertUtil {
         BeanUtils.copyProperties(topicEntity, topicTitileQo);
         return topicTitileQo;
     }
+
     public static CommentQo commentEntity2Qo(CommentEntity entity) {
         CommentQo qo = new CommentQo();
         BeanUtils.copyProperties(entity, qo);
@@ -96,7 +101,7 @@ public class ConvertUtil {
         return qo;
     }
 
-    public static List<CommentQo> commentEntity2Qos(List<CommentEntity> entities){
+    public static List<CommentQo> commentEntity2Qos(List<CommentEntity> entities) {
         return entities.stream().map(ConvertUtil::commentEntity2Qo).collect(Collectors.toList());
     }
 
@@ -106,7 +111,7 @@ public class ConvertUtil {
         return qo;
     }
 
-    public static List<CommentLv2Qo> commentLv2Entity2Qos(List<CommentEntity> entities){
+    public static List<CommentLv2Qo> commentLv2Entity2Qos(List<CommentEntity> entities) {
         return entities.stream().map(ConvertUtil::commentLv2Entity2Qo).collect(Collectors.toList());
     }
 
@@ -119,8 +124,6 @@ public class ConvertUtil {
     }
 
 
-
-
     public static DeleteTagEnum deleteTagShift(DeleteTagEnum deleteTagEnum) {
         if (deleteTagEnum.getCode().equals(DeleteTagEnum.NOT_DELETED.getCode())) {
             return DeleteTagEnum.DELETED;
@@ -139,6 +142,7 @@ public class ConvertUtil {
 
     /**
      * 解析 List<ThemeContentReq>为Attachment列表
+     *
      * @param req
      * @param themeId
      * @return
@@ -148,9 +152,9 @@ public class ConvertUtil {
 
         List<ThemeAttachmentEntity> list = new ArrayList<>();
         for (ThemeContentReq content : contents) {
-            if (!RelTypeEnum.TEXT.type.equals(content.getType())){
+            if (!RelTypeEnum.TEXT.type.equals(content.getType())) {
                 //讨论-多图类型，拆开解析到attachment表中
-                if ((content.getType().equals(RelTypeEnum.MULTIPLE_IMAGE.type))){
+                if ((content.getType().equals(RelTypeEnum.MULTIPLE_IMAGE.type))) {
                     List<ImagesDTO> imgList = content.getImgList();
                     for (ImagesDTO imagesDTO : imgList) {
                         list.add(ThemeAttachmentEntity.builder()
@@ -159,7 +163,7 @@ public class ConvertUtil {
                                 .themeId(themeId)
                                 .build());
                     }
-                }else {
+                } else {
                     list.add(ThemeAttachmentEntity.builder()
                             .attachType(Integer.valueOf(content.getType()))
                             .attachId(content.getValue())
@@ -171,14 +175,33 @@ public class ConvertUtil {
         return list;
     }
 
-    public static FollowQo homePageEntity2FollowQo(HomePageEntity entity) {
+    public static FollowQo homePageEntity2FollowQo(UserInfoEntity entity) {
         if (entity == null) {
             return null;
         }
-        FollowQo followQo = new FollowQo();
-        BeanUtils.copyProperties(entity, followQo);
-        return followQo;
+        return FollowQo.builder().userId(entity.getId())
+                .nickName(entity.getUiNickname())
+                .headImg(entity.getUiHeadimg())
+                .introduction(entity.getUiIntroduction())
+                .build();
     }
 
+    public static FormerThemeQo themeQo2FormerThemeQo(ThemeQo formerTheme) {
+        if (formerTheme == null) {
+            return null;
+        }
+        return FormerThemeQo.builder().themeId(formerTheme.getThemeId())
+                .content(formerTheme.getContent())
+                .userImg(formerTheme.getUserImg())
+                .nickName(formerTheme.getNickName())
+                .title(formerTheme.getTitle())
+                .topicId(formerTheme.getTopicId())
+                .topicTitle(formerTheme.getTopicTitle())
+                .authorId(formerTheme.getAuthorId())
+                .themeType(formerTheme.getThemeType())
+                .build();
+    }
+
+
 
 }