推荐主题

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

@@ -41,7 +41,7 @@ public class CommentQo {
     @ApiModelProperty(value = "2级评论")
     private List<CommentLv2Qo> commentLv2Qos;
 
-    //认证标签相关
+    // 认证标签相关
     @ApiModelProperty("认证标签用-用户等级体系 0 游客 1注册用户 10投资人 20 探普理顾 30 探普专家理顾 40 交易理财师 50 首席投顾")
     private Integer levelGrade;
     @ApiModelProperty("认证标签用-当levelGrade=10有值 1投资萌新 2投资达人")

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

@@ -63,9 +63,10 @@ public class CommentManager {
         commentService.insertComment(commentEntity);
     }
 
-    //查询评论
+    // 查询评论
     public List<CommentQo> queryComments(String themeId, String userId) {
-        List<CommentEntity> commentEntities = commentService.selectByThemeIdAndParentId(themeId, null);
+        // 因为需要排序，所以从库中查询所有评论
+        List<CommentEntity> commentEntities = commentService.selectByThemeId(themeId);
         List<CommentQo> commentQos = ConvertUtil.commentEntity2Qos(commentEntities);
 
         Set<String> likeCommentList = collectionService.getListByUser(userId, CollectionTypeEnum.LIKE_COMMENT);

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

@@ -154,7 +154,7 @@ public class ThemeManager {
         return CreateThemeResp.builder().themeId(themeEntity.getThemeId()).build();
     }
 
-    //转发主题
+    // 转发主题
     public CreateThemeResp forward(ForwardThemeReq req, String userId) {
         ThemeEntity targetTheme = themeService.queryByThemeId(req.getFormerThemeId());
         ThemeEntity themeEntity = ThemeEntity.builder()
@@ -178,7 +178,7 @@ public class ThemeManager {
     }
 
 
-    //查询主题列表：推荐/关注/热门/最新
+    // 查询主题列表：推荐/关注/热门/最新
     public List<ThemeQo> queryThemes(ThemeListReq req, String userId) {
         List<ThemeEntity> themeEntities = new ArrayList<>();
         if (ThemeListTypeEnum.RECOMMEND.getCode().equals(req.getType())) {

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

@@ -28,7 +28,7 @@ public class TopicManager {
     @Resource
     private UserHolder userHolder;
 
-    //新增话题
+    // 新增话题
     public void insertTopic(String topicTitle, String userId) {
         if (topicService.queryByTitile(topicTitle) == null) {
             throw new BizException("话题名称已存在:" + topicTitle);
@@ -37,18 +37,20 @@ public class TopicManager {
 
     }
 
-    //首页-话题标签
+    // 首页-话题标签
     public List<TopicRankQo> getTop4TopicTitles() {
         return rankService.getRankTopicListTop4();
     }
 
 
-    //话题搜索列表
+    // 话题搜索列表
     public Page<TopicRankQo> getAllTopicBriefInfo(TopicSearchReq req) {
-        return PageUtils.page(req.getPage(), rankService.getRankTopicList());
+
+        List<TopicRankQo> topicList = rankService.getRankTopicList(req.getSearchKeyword());
+        return PageUtils.page(req.getPage(), topicList);
     }
 
-    //话题详情页
+    // 话题详情页
     public TopicRankQo getDetail(String topicId) {
         //话题详情
         visitSummaryService.addPageView(userHolder.getUserId(), topicId, VisitTypeEnum.TOPIC_PAGE_VIEW);

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

@@ -3,7 +3,6 @@ package com.tanpu.community.service;
 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import com.fasterxml.jackson.core.type.TypeReference;
 import com.tanpu.common.exception.BizException;
-import com.tanpu.common.redis.RedisKeyHelper;
 import com.tanpu.common.uuid.UuidGenHelper;
 import com.tanpu.community.api.enums.CommentTypeEnum;
 import com.tanpu.community.api.enums.DeleteTagEnum;
@@ -41,6 +40,8 @@ public class CommentService {
     public void insertComment(CommentEntity commentEntity) {
         commentEntity.setCommentId(uuidGenHelper.getUuidStr());
         commentMapper.insert(commentEntity);
+        //失效缓存
+        redisCache.evict(StringUtils.joinWith("_", CACHE_COMMENT_THEMEID, commentEntity.getThemeId()));
     }
 
 
@@ -72,8 +73,8 @@ public class CommentService {
                 .stream().map(CommentEntity::getAuthorId).collect(Collectors.toSet());
     }
 
-    public List<CommentEntity> selectByThemeIdAndParentId(String themeId, String parentId) {
-        return redisCache.getList(StringUtils.joinWith("_", CACHE_COMMENT_THEMEID, themeId, parentId),
+    public List<CommentEntity> selectByThemeId(String themeId) {
+        return redisCache.getList(StringUtils.joinWith("_", CACHE_COMMENT_THEMEID, themeId),
                 60, () -> {
             LambdaQueryWrapper<CommentEntity> queryWrapper = new LambdaQueryWrapper<CommentEntity>()
                     .eq(CommentEntity::getThemeId, themeId)

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

@@ -55,7 +55,7 @@ public class RankService {
      */
     public void rankThemes() {
         //7天内所有主题进行热度值排序
-        List<ThemeEntity> themeEntities = themeService.queryRecentdays(7);
+        List<ThemeEntity> themeEntities = themeService.queryRecentdays(4);
         List<ThemeAnalysDO> themeAnalysDOS = ConvertUtil.themeEntityToAnalysDOs(themeEntities);
         for (ThemeAnalysDO theme : themeAnalysDOS) {
             String themeId = theme.getThemeId();
@@ -166,11 +166,16 @@ public class RankService {
     }
 
 
-    public List<TopicRankQo> getRankTopicList() {
+    public List<TopicRankQo> getRankTopicList(String keyword) {
         if (this.rankTopicList.size() == 0) {
             this.rankTopics();
         }
-        return rankTopicList;
+        if (StringUtils.isEmpty(keyword)){
+            return rankTopicList;
+        }else {
+            //过滤关键字
+            return this.rankTopicList.stream().filter(o->o.getTopicTitle().contains(keyword)).collect(Collectors.toList());
+        }
     }
 
     public List<TopicRankQo> getRankTopicListTop4() {

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

@@ -66,18 +66,20 @@ public class RecommendService {
         List<String> recThemeIds = getPythonRecommendList(userId);
 
         //混合
-        Set<String> returnedIds = (StringUtils.isEmpty(lastId)) ? new HashSet<>() : returnedIdsMap.get(userId);
+        Set<String> returnedIds = (StringUtils.isEmpty(lastId)) || !returnedIdsMap.containsKey(userId)
+                || returnedIdsMap.get(userId) == null ?
+                new HashSet<>() : returnedIdsMap.get(userId);
         List<String> result = new ArrayList<>();
-        getResultList(hotThemeIds, 0, newThemeIds, 0, recThemeIds, 0, returnedIds, result, pageSize,userId);
+        getResultList(hotThemeIds, 0, newThemeIds, 0, recThemeIds, 0, returnedIds, result, pageSize, userId);
         result = result.stream().limit(pageSize).collect(Collectors.toList());
         //记录已返回主题id
-        if(StringUtils.isEmpty(lastId)){
-            returnedIdsMap.put(userId,new HashSet<>(result));
-        }else {
+        if (StringUtils.isEmpty(lastId)) {
+            returnedIdsMap.put(userId, new HashSet<>(result));
+        } else {
             HashSet<String> newSet = new HashSet<>();
             newSet.addAll(returnedIdsMap.get(userId));
             newSet.addAll(result);
-            returnedIdsMap.put(userId,newSet);
+            returnedIdsMap.put(userId, newSet);
         }
         return result;
     }
@@ -168,7 +170,7 @@ public class RecommendService {
 
         }
         //去重已看过(查看正文)
-        result = visitSummaryService.filterUserNotVisited(userId,result);
+        result = visitSummaryService.filterUserNotVisited(userId, result);
 
         if (result.size() < pageSize) {
             getResultList(hotThemeIds, hotTag, newThemeIds, newTag, recThemeIds, recTag, returnedIds, result, pageSize, userId);

community-service/src/main/resources/application-dev.yml

@@ -110,5 +110,5 @@ recommend:
     new: 2
     python: 1
   python:
-    enable: true
+    enable: false
     url: http://172.168.0.164:9000/api/get_recommend?user_id=2431614397151511
\ No newline at end of file