排序优化

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

@@ -131,11 +131,10 @@ public class RankService {
             this.calculateThemeScore(theme);
         }
         //排序
-        Map<ThemeAnalysDO, Double> map = themeAnalysDOS.stream().collect(Collectors.toMap(o -> o, ThemeAnalysDO::getScore));
 
-        hotestThemes = map.entrySet().stream()
-                .sorted(Map.Entry.comparingByValue(Comparator.reverseOrder()))
-                .map(Map.Entry::getKey).collect(Collectors.toList());
+        hotestThemes = themeAnalysDOS.stream()
+                .sorted(Comparator.comparing(ThemeAnalysDO::getScore).reversed())
+                .collect(Collectors.toList());
         //落库
         rankLogService.logThemeRank(hotestThemes, start, TimeUtils.calMillisTillNow(start));
     }
@@ -185,10 +184,8 @@ public class RankService {
 
         }
         // 排序
-        Map<TopicRankQo, Double> map = topicRankQos.stream().collect(Collectors.toMap(o -> o, TopicRankQo::getScore));
-        List<TopicRankQo> rankList = map.entrySet().stream()
-                .sorted(Map.Entry.comparingByValue(Comparator.reverseOrder()))
-                .map(Map.Entry::getKey)
+        List<TopicRankQo> rankList = topicRankQos.stream()
+                .sorted(Comparator.comparing(TopicRankQo::getScore).reversed())
                 .collect(Collectors.toList());
         // 非“新”话题才能添加“热”标签
         if (!TopicStatusEnum.NEWEST.getCode().equals(rankList.get(0).getType())) {
@@ -201,10 +198,12 @@ public class RankService {
         List<TopicRankQo> top4Topic = rankList.stream()
                 .limit(6)
                 .filter(o -> !newest2Topic.contains(o))
-                .limit(4-newest2Topic.size())
+                .limit(4 - newest2Topic.size())
                 .collect(Collectors.toList());
         top4Topic.addAll(newest2Topic);
-        this.rankTopicListTop4 = top4Topic;
+        this.rankTopicListTop4 = top4Topic.stream()
+                .sorted(Comparator.comparing(TopicRankQo::getScore).reversed())
+                .collect(Collectors.toList());
 
         //落库
         rankLogService.logTopicRank(rankList, start, TimeUtils.calMillisTillNow(start));