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

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

@@ -124,8 +124,13 @@ public class ThemeManager {
         themeEntity.setAuthorId(userId);
         themeEntity.setContent(JsonUtil.toJson(req.getContent()));
         //讨论类型，将讨论中的文本放入到discussContent中
-        if (ThemeTypeEnum.DISCUSSION.getCode().equals(themeEntity.getThemeType()))
-            themeEntity.setDiscussContent(req.getContent().get(0).getValue());
+        if (ThemeTypeEnum.DISCUSSION.getCode().equals(themeEntity.getThemeType())) {
+            String content = req.getContent().get(0).getValue();
+            if (content.length()>256){
+                content= content.substring(0,255);
+            }
+            themeEntity.setDiscussContent(content);
+        }
 
         //腾讯云敏感词校验
         checkContent(themeEntity.getContent());

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

@@ -138,25 +138,7 @@ public class RankService {
     }
 
     /**
-     * 最新和热门主题集合
-     *
-     * @param hotCount
-     * @param newCount
-     * @return
-     */
-//    public List<String> getHotAndNewThemes(Integer hotCount, Integer newCount, String userId) {
-//        Set<String> hotThemeIds = this.hotestThemes.stream().limit(hotCount)
-//                .filter(o -> !userId.equals(o.getAuthorId()))
-//                .map(ThemeAnalysDO::getThemeId)
-//                .collect(Collectors.toSet());
-//        Set<String> newThemeIds = themeService.selectExcludeUser(null, null, newCount)
-//                .stream().map(ThemeEntity::getThemeId).collect(Collectors.toSet());
-//        hotThemeIds.addAll(newThemeIds);
-//        return new ArrayList<>(hotThemeIds);
-//    }
-
-    /**
-     * 话题详情
+     * 从排序列表中返回话题详情
      *
      * @param topicId 话题Id
      * @return

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

@@ -111,7 +111,7 @@ public class VisitSummaryService {
         }
     }
 
-    //统计主题集合的浏览量
+    //统计行为集合的浏览量
     public Map<String, Integer> getCountMapByTargetIds(List<String> refIds, VisitTypeEnum type) {
         if (CollectionUtils.isEmpty(refIds)){
             return new HashMap<>();