Przeglądaj źródła

ScoreStrategyEnum枚举修改

wangyunpeng 8 miesięcy temu
rodzic
commit
b3d6eafde8
18 zmienionych plików z 229 dodań i 228 usunięć
  1. 23 22
      long-article-recommend-service/src/main/java/com/tzld/longarticle/recommend/server/common/enums/ScoreStrategyEnum.java
  2. 2 2
      long-article-recommend-service/src/main/java/com/tzld/longarticle/recommend/server/service/rank/RankStrategy.java
  3. 4 4
      long-article-recommend-service/src/main/java/com/tzld/longarticle/recommend/server/service/rank/strategy/DefaultRankStrategy.java
  4. 10 10
      long-article-recommend-service/src/main/java/com/tzld/longarticle/recommend/server/service/rank/strategy/FwhColdStartRankStrategy.java
  5. 5 5
      long-article-recommend-service/src/main/java/com/tzld/longarticle/recommend/server/service/rank/strategy/LateRankStrategy.java
  6. 11 11
      long-article-recommend-service/src/main/java/com/tzld/longarticle/recommend/server/service/rank/strategy/RankV10Strategy.java
  7. 21 21
      long-article-recommend-service/src/main/java/com/tzld/longarticle/recommend/server/service/rank/strategy/RankV11Strategy.java
  8. 21 21
      long-article-recommend-service/src/main/java/com/tzld/longarticle/recommend/server/service/rank/strategy/RankV12Strategy.java
  9. 21 21
      long-article-recommend-service/src/main/java/com/tzld/longarticle/recommend/server/service/rank/strategy/RankV13Strategy.java
  10. 21 21
      long-article-recommend-service/src/main/java/com/tzld/longarticle/recommend/server/service/rank/strategy/RankV14Strategy.java
  11. 4 4
      long-article-recommend-service/src/main/java/com/tzld/longarticle/recommend/server/service/rank/strategy/RankV2Strategy.java
  12. 10 10
      long-article-recommend-service/src/main/java/com/tzld/longarticle/recommend/server/service/rank/strategy/RankV3Strategy.java
  13. 10 10
      long-article-recommend-service/src/main/java/com/tzld/longarticle/recommend/server/service/rank/strategy/RankV4Strategy.java
  14. 12 12
      long-article-recommend-service/src/main/java/com/tzld/longarticle/recommend/server/service/rank/strategy/RankV5Strategy.java
  15. 11 11
      long-article-recommend-service/src/main/java/com/tzld/longarticle/recommend/server/service/rank/strategy/RankV7Strategy.java
  16. 14 14
      long-article-recommend-service/src/main/java/com/tzld/longarticle/recommend/server/service/rank/strategy/RankV8Strategy.java
  17. 11 11
      long-article-recommend-service/src/main/java/com/tzld/longarticle/recommend/server/service/rank/strategy/RankV9Strategy.java
  18. 18 18
      long-article-recommend-service/src/main/java/com/tzld/longarticle/recommend/server/service/score/ScoreService.java

+ 23 - 22
long-article-recommend-service/src/main/java/com/tzld/longarticle/recommend/server/common/enums/ScoreStrategyEnum.java

@@ -1,30 +1,31 @@
 package com.tzld.longarticle.recommend.server.common.enums;
 
-import lombok.Getter;
-
-@Getter
 public enum ScoreStrategyEnum {
-    ACCOUNT_PRE_DISTRIBUTE_STRATEGY("AccountPreDistributeStrategy"),
-    CATEGORY_STRATEGY("CategoryStrategy"),
-    CONTENT_POOL_STRATEGY("ContentPoolStrategy"),
-    FLOW_CTL_DECREASE_STRATEGY("FlowCtlDecreaseStrategy"),
-    HIS_FISSION_AVG_READ_RATE_CORRELATION_RATE_STRATEGY("HisFissionAvgReadRateCorrelationRateStrategy"),
-    HIS_FISSION_AVG_READ_RATE_RATE_STRATEGY("HisFissionAvgReadRateRateStrategy"),
-    HIS_FISSION_AVG_READ_SUM_RATE_STRATEGY("HisFissionAvgReadSumRateStrategy"),
-    HIS_FISSION_DE_WEIGHT_AVG_READ_SUM_RATE_STRATEGY("HisFissionDeWeightAvgReadSumRateStrategy"),
-    HIS_FISSION_FANS_RATE_RATE_STRATEGY("HisFissionFansRateRateStrategy"),
-    HIS_FISSION_FANS_SUM_RATE_STRATEGY("HisFissionFansSumRateStrategy"),
-    PUBLISH_TIMES_STRATEGY("PublishTimesStrategy"),
-    SIMILARITY_STRATEGY("SimilarityStrategy"),
-    VIEW_COUNT_RATE_CORRELATION_STRATEGY("ViewCountRateCorrelationStrategy"),
-    VIEW_COUNT_RATE_STRATEGY("ViewCountRateStrategy"),
-    VIEW_COUNT_STRATEGY("ViewCountStrategy"),
-    VIEW_MULTIPLIER_STRATEGY("ViewMultiplierStrategy"),
+    ACCOUNT_PRE_DISTRIBUTE("AccountPreDistributeStrategy"),
+    CATEGORY("CategoryStrategy"),
+    CONTENT_POOL("ContentPoolStrategy"),
+    FLOW_CTL_DECREASE("FlowCtlDecreaseStrategy"),
+    HIS_FISSION_AVG_READ_RATE_CORRELATION_RATE("HisFissionAvgReadRateCorrelationRateStrategy"),
+    HIS_FISSION_AVG_READ_RATE_RATE("HisFissionAvgReadRateRateStrategy"),
+    HIS_FISSION_AVG_READ_SUM_RATE("HisFissionAvgReadSumRateStrategy"),
+    HIS_FISSION_DE_WEIGHT_AVG_READ_SUM_RATE("HisFissionDeWeightAvgReadSumRateStrategy"),
+    HIS_FISSION_FANS_RATE_RATE("HisFissionFansRateRateStrategy"),
+    HIS_FISSION_FANS_SUM_RATE("HisFissionFansSumRateStrategy"),
+    PUBLISH_TIMES("PublishTimesStrategy"),
+    SIMILARITY("SimilarityStrategy"),
+    VIEW_COUNT_RATE_CORRELATION("ViewCountRateCorrelationStrategy"),
+    VIEW_COUNT_RATE("ViewCountRateStrategy"),
+    VIEW_COUNT("ViewCountStrategy"),
+    VIEW_MULTIPLIER("ViewMultiplierStrategy"),
     ;
 
-    private final String strategy;
+    private final String name;
+
+    ScoreStrategyEnum(String name) {
+        this.name = name;
+    }
 
-    ScoreStrategyEnum(String strategy) {
-        this.strategy = strategy;
+    public String getName() {
+        return name;
     }
 }

+ 2 - 2
long-article-recommend-service/src/main/java/com/tzld/longarticle/recommend/server/service/rank/RankStrategy.java

@@ -89,8 +89,8 @@ public interface RankStrategy {
 
     static boolean SimilarityScoreZero(List<RankItem> items, RankParam param, List<Article> articleList) {
         if (CollectionUtils.isNotEmpty(items)
-                && items.get(0).getScoreMap().containsKey(ScoreStrategyEnum.SIMILARITY_STRATEGY.getStrategy())
-                && items.get(0).getScoreMap().get(ScoreStrategyEnum.SIMILARITY_STRATEGY.getStrategy()) == 0) {
+                && items.get(0).getScoreMap().containsKey(ScoreStrategyEnum.SIMILARITY.getName())
+                && items.get(0).getScoreMap().get(ScoreStrategyEnum.SIMILARITY.getName()) == 0) {
                 FeishuMessageSender.sendWebHookMessage(FeishuRobotIdEnum.RECOMMEND.getRobotId(),
                         "内容评分为0\n"
                                 + "ghId: " + param.getGhId() + "\n"

+ 4 - 4
long-article-recommend-service/src/main/java/com/tzld/longarticle/recommend/server/service/rank/strategy/DefaultRankStrategy.java

@@ -66,8 +66,8 @@ public class DefaultRankStrategy implements RankStrategy {
                 List<RankItem> data = itemMap.get(contentPools[i]);
                 if (CollectionUtils.isNotEmpty(data)) {
                     Collections.sort(data, (o1, o2) -> -Double.compare(
-                            o1.getScore(ScoreStrategyEnum.VIEW_COUNT_STRATEGY.getStrategy()),
-                            o2.getScore(ScoreStrategyEnum.VIEW_COUNT_STRATEGY.getStrategy())));
+                            o1.getScore(ScoreStrategyEnum.VIEW_COUNT.getName()),
+                            o2.getScore(ScoreStrategyEnum.VIEW_COUNT.getName())));
                     sortedItems.addAll(data);
                 }
             } else {
@@ -75,8 +75,8 @@ public class DefaultRankStrategy implements RankStrategy {
                 List<RankItem> data = itemMap.get(contentPools[i]);
                 if (CollectionUtils.isNotEmpty(data)) {
                     Collections.sort(data, (o1, o2) -> -Double.compare(
-                            o1.getScore(ScoreStrategyEnum.SIMILARITY_STRATEGY.getStrategy()),
-                            o2.getScore(ScoreStrategyEnum.SIMILARITY_STRATEGY.getStrategy())));
+                            o1.getScore(ScoreStrategyEnum.SIMILARITY.getName()),
+                            o2.getScore(ScoreStrategyEnum.SIMILARITY.getName())));
                     sortedItems.addAll(data);
                 }
             }

+ 10 - 10
long-article-recommend-service/src/main/java/com/tzld/longarticle/recommend/server/service/rank/strategy/FwhColdStartRankStrategy.java

@@ -47,18 +47,18 @@ public class FwhColdStartRankStrategy implements RankStrategy {
             double score;
             if (contentPools[0].equals(item.getContent().getContentPoolType())
                     || contentPools[1].equals(item.getContent().getContentPoolType())) {
-                score = item.getScore(ScoreStrategyEnum.SIMILARITY_STRATEGY.getStrategy())
-                        + item.getScore(ScoreStrategyEnum.CATEGORY_STRATEGY.getStrategy())
-                        + item.getScore(ScoreStrategyEnum.FLOW_CTL_DECREASE_STRATEGY.getStrategy());
-                if (item.getScore(ScoreStrategyEnum.PUBLISH_TIMES_STRATEGY.getStrategy()) >= 0) {
-                    score += item.getScore(ScoreStrategyEnum.VIEW_COUNT_RATE_STRATEGY.getStrategy());
+                score = item.getScore(ScoreStrategyEnum.SIMILARITY.getName())
+                        + item.getScore(ScoreStrategyEnum.CATEGORY.getName())
+                        + item.getScore(ScoreStrategyEnum.FLOW_CTL_DECREASE.getName());
+                if (item.getScore(ScoreStrategyEnum.PUBLISH_TIMES.getName()) >= 0) {
+                    score += item.getScore(ScoreStrategyEnum.VIEW_COUNT_RATE.getName());
                 }
             } else {
-                score = item.getScore(ScoreStrategyEnum.SIMILARITY_STRATEGY.getStrategy())
-                        + item.getScore(ScoreStrategyEnum.CATEGORY_STRATEGY.getStrategy())
-                        + item.getScore(ScoreStrategyEnum.ACCOUNT_PRE_DISTRIBUTE_STRATEGY.getStrategy())
-                        + item.getScore(ScoreStrategyEnum.PUBLISH_TIMES_STRATEGY.getStrategy())
-                        + item.getScore(ScoreStrategyEnum.FLOW_CTL_DECREASE_STRATEGY.getStrategy());
+                score = item.getScore(ScoreStrategyEnum.SIMILARITY.getName())
+                        + item.getScore(ScoreStrategyEnum.CATEGORY.getName())
+                        + item.getScore(ScoreStrategyEnum.ACCOUNT_PRE_DISTRIBUTE.getName())
+                        + item.getScore(ScoreStrategyEnum.PUBLISH_TIMES.getName())
+                        + item.getScore(ScoreStrategyEnum.FLOW_CTL_DECREASE.getName());
             }
             item.setScore(score);
             return item;

+ 5 - 5
long-article-recommend-service/src/main/java/com/tzld/longarticle/recommend/server/service/rank/strategy/LateRankStrategy.java

@@ -45,11 +45,11 @@ public class LateRankStrategy implements RankStrategy {
             item.setScoreMap(scoreMap.get(c.getId()));
             double score = 0.0;
             if (contentPools[2].equals(item.getContent().getContentPoolType())) {
-                score = item.getScore(ScoreStrategyEnum.SIMILARITY_STRATEGY.getStrategy())
-                        + item.getScore(ScoreStrategyEnum.CATEGORY_STRATEGY.getStrategy())
-                        + item.getScore(ScoreStrategyEnum.ACCOUNT_PRE_DISTRIBUTE_STRATEGY.getStrategy())
-                        + item.getScore(ScoreStrategyEnum.PUBLISH_TIMES_STRATEGY.getStrategy())
-                        + item.getScore(ScoreStrategyEnum.FLOW_CTL_DECREASE_STRATEGY.getStrategy());
+                score = item.getScore(ScoreStrategyEnum.SIMILARITY.getName())
+                        + item.getScore(ScoreStrategyEnum.CATEGORY.getName())
+                        + item.getScore(ScoreStrategyEnum.ACCOUNT_PRE_DISTRIBUTE.getName())
+                        + item.getScore(ScoreStrategyEnum.PUBLISH_TIMES.getName())
+                        + item.getScore(ScoreStrategyEnum.FLOW_CTL_DECREASE.getName());
             }
             c.setScore(score);
             item.setScore(score);

+ 11 - 11
long-article-recommend-service/src/main/java/com/tzld/longarticle/recommend/server/service/rank/strategy/RankV10Strategy.java

@@ -53,20 +53,20 @@ public class RankV10Strategy implements RankStrategy {
             item.setScoreMap(scoreMap.get(c.getId()));
             double score;
             if (contentPools[0].equals(item.getContent().getContentPoolType())) {
-                score = item.getScore(ScoreStrategyEnum.HIS_FISSION_AVG_READ_SUM_RATE_STRATEGY.getStrategy());
+                score = item.getScore(ScoreStrategyEnum.HIS_FISSION_AVG_READ_SUM_RATE.getName());
             } else if (contentPools[1].equals(item.getContent().getContentPoolType())) {
-                score = item.getScore(ScoreStrategyEnum.SIMILARITY_STRATEGY.getStrategy())
-                        + item.getScore(ScoreStrategyEnum.CATEGORY_STRATEGY.getStrategy())
-                        + item.getScore(ScoreStrategyEnum.FLOW_CTL_DECREASE_STRATEGY.getStrategy());
-                if (item.getScore(ScoreStrategyEnum.PUBLISH_TIMES_STRATEGY.getStrategy()) >= 0) {
-                    score += item.getScore(ScoreStrategyEnum.VIEW_COUNT_RATE_STRATEGY.getStrategy());
+                score = item.getScore(ScoreStrategyEnum.SIMILARITY.getName())
+                        + item.getScore(ScoreStrategyEnum.CATEGORY.getName())
+                        + item.getScore(ScoreStrategyEnum.FLOW_CTL_DECREASE.getName());
+                if (item.getScore(ScoreStrategyEnum.PUBLISH_TIMES.getName()) >= 0) {
+                    score += item.getScore(ScoreStrategyEnum.VIEW_COUNT_RATE.getName());
                 }
             } else {
-                score = item.getScore(ScoreStrategyEnum.SIMILARITY_STRATEGY.getStrategy())
-                        + item.getScore(ScoreStrategyEnum.CATEGORY_STRATEGY.getStrategy())
-                        + item.getScore(ScoreStrategyEnum.ACCOUNT_PRE_DISTRIBUTE_STRATEGY.getStrategy())
-                        + item.getScore(ScoreStrategyEnum.PUBLISH_TIMES_STRATEGY.getStrategy())
-                        + item.getScore(ScoreStrategyEnum.FLOW_CTL_DECREASE_STRATEGY.getStrategy());
+                score = item.getScore(ScoreStrategyEnum.SIMILARITY.getName())
+                        + item.getScore(ScoreStrategyEnum.CATEGORY.getName())
+                        + item.getScore(ScoreStrategyEnum.ACCOUNT_PRE_DISTRIBUTE.getName())
+                        + item.getScore(ScoreStrategyEnum.PUBLISH_TIMES.getName())
+                        + item.getScore(ScoreStrategyEnum.FLOW_CTL_DECREASE.getName());
             }
             c.setScore(score);
             item.setScore(score);

+ 21 - 21
long-article-recommend-service/src/main/java/com/tzld/longarticle/recommend/server/service/rank/strategy/RankV11Strategy.java

@@ -55,38 +55,38 @@ public class RankV11Strategy implements RankStrategy {
             double score;
             int index = weightService.getIndex(item.getContent().getContentPoolType(), contentPools);
             if (contentPools[0].equals(item.getContent().getContentPoolType())) {
-                score = item.getScore(ScoreStrategyEnum.HIS_FISSION_AVG_READ_RATE_RATE_STRATEGY.getStrategy())
+                score = item.getScore(ScoreStrategyEnum.HIS_FISSION_AVG_READ_RATE_RATE.getName())
                         * weightService.getWeight(param.getStrategy(), param.getGhId(), index,
-                        ScoreStrategyEnum.HIS_FISSION_AVG_READ_RATE_RATE_STRATEGY.getStrategy());
-                score += item.getScore(ScoreStrategyEnum.SIMILARITY_STRATEGY.getStrategy())
+                        ScoreStrategyEnum.HIS_FISSION_AVG_READ_RATE_RATE.getName());
+                score += item.getScore(ScoreStrategyEnum.SIMILARITY.getName())
                         * weightService.getWeight(param.getStrategy(), param.getGhId(), index,
-                        ScoreStrategyEnum.SIMILARITY_STRATEGY.getStrategy());
-                if (item.getScore(ScoreStrategyEnum.PUBLISH_TIMES_STRATEGY.getStrategy()) >= 0) {
-                    score += item.getScore(ScoreStrategyEnum.VIEW_COUNT_RATE_STRATEGY.getStrategy())
+                        ScoreStrategyEnum.SIMILARITY.getName());
+                if (item.getScore(ScoreStrategyEnum.PUBLISH_TIMES.getName()) >= 0) {
+                    score += item.getScore(ScoreStrategyEnum.VIEW_COUNT_RATE.getName())
                             * weightService.getWeight(param.getStrategy(), param.getGhId(), index,
-                            ScoreStrategyEnum.VIEW_COUNT_RATE_STRATEGY.getStrategy());
+                            ScoreStrategyEnum.VIEW_COUNT_RATE.getName());
                 }
             } else if (contentPools[1].equals(item.getContent().getContentPoolType())) {
-                score = (item.getScore(ScoreStrategyEnum.SIMILARITY_STRATEGY.getStrategy())
+                score = (item.getScore(ScoreStrategyEnum.SIMILARITY.getName())
                         * weightService.getWeight(param.getStrategy(), param.getGhId(), index,
-                        ScoreStrategyEnum.SIMILARITY_STRATEGY.getStrategy()))
-                        + item.getScore(ScoreStrategyEnum.CATEGORY_STRATEGY.getStrategy())
-                        + item.getScore(ScoreStrategyEnum.FLOW_CTL_DECREASE_STRATEGY.getStrategy());
-                if (item.getScore(ScoreStrategyEnum.PUBLISH_TIMES_STRATEGY.getStrategy()) >= 0) {
-                    score += item.getScore(ScoreStrategyEnum.VIEW_COUNT_RATE_STRATEGY.getStrategy())
+                        ScoreStrategyEnum.SIMILARITY.getName()))
+                        + item.getScore(ScoreStrategyEnum.CATEGORY.getName())
+                        + item.getScore(ScoreStrategyEnum.FLOW_CTL_DECREASE.getName());
+                if (item.getScore(ScoreStrategyEnum.PUBLISH_TIMES.getName()) >= 0) {
+                    score += item.getScore(ScoreStrategyEnum.VIEW_COUNT_RATE.getName())
                             * weightService.getWeight(param.getStrategy(), param.getGhId(), index,
-                            ScoreStrategyEnum.VIEW_COUNT_RATE_STRATEGY.getStrategy());
+                            ScoreStrategyEnum.VIEW_COUNT_RATE.getName());
                 }
             } else {
-                score = (item.getScore(ScoreStrategyEnum.SIMILARITY_STRATEGY.getStrategy())
+                score = (item.getScore(ScoreStrategyEnum.SIMILARITY.getName())
                         * weightService.getWeight(param.getStrategy(), param.getGhId(), index,
-                        ScoreStrategyEnum.SIMILARITY_STRATEGY.getStrategy()))
-                        + item.getScore(ScoreStrategyEnum.CATEGORY_STRATEGY.getStrategy())
-                        + (item.getScore(ScoreStrategyEnum.ACCOUNT_PRE_DISTRIBUTE_STRATEGY.getStrategy())
+                        ScoreStrategyEnum.SIMILARITY.getName()))
+                        + item.getScore(ScoreStrategyEnum.CATEGORY.getName())
+                        + (item.getScore(ScoreStrategyEnum.ACCOUNT_PRE_DISTRIBUTE.getName())
                         * weightService.getWeight(param.getStrategy(), param.getGhId(), index,
-                        ScoreStrategyEnum.ACCOUNT_PRE_DISTRIBUTE_STRATEGY.getStrategy()))
-                        + item.getScore(ScoreStrategyEnum.PUBLISH_TIMES_STRATEGY.getStrategy())
-                        + item.getScore(ScoreStrategyEnum.FLOW_CTL_DECREASE_STRATEGY.getStrategy());
+                        ScoreStrategyEnum.ACCOUNT_PRE_DISTRIBUTE.getName()))
+                        + item.getScore(ScoreStrategyEnum.PUBLISH_TIMES.getName())
+                        + item.getScore(ScoreStrategyEnum.FLOW_CTL_DECREASE.getName());
             }
             c.setScore(score);
             c.setHisPublishArticleList(null);

+ 21 - 21
long-article-recommend-service/src/main/java/com/tzld/longarticle/recommend/server/service/rank/strategy/RankV12Strategy.java

@@ -55,38 +55,38 @@ public class RankV12Strategy implements RankStrategy {
             double score;
             int index = weightService.getIndex(item.getContent().getContentPoolType(), contentPools);
             if (contentPools[0].equals(item.getContent().getContentPoolType())) {
-                score = item.getScore(ScoreStrategyEnum.HIS_FISSION_DE_WEIGHT_AVG_READ_SUM_RATE_STRATEGY.getStrategy())
+                score = item.getScore(ScoreStrategyEnum.HIS_FISSION_DE_WEIGHT_AVG_READ_SUM_RATE.getName())
                         * weightService.getWeight(param.getStrategy(), param.getGhId(), index,
-                        ScoreStrategyEnum.HIS_FISSION_DE_WEIGHT_AVG_READ_SUM_RATE_STRATEGY.getStrategy());
-                score += item.getScore(ScoreStrategyEnum.SIMILARITY_STRATEGY.getStrategy())
+                        ScoreStrategyEnum.HIS_FISSION_DE_WEIGHT_AVG_READ_SUM_RATE.getName());
+                score += item.getScore(ScoreStrategyEnum.SIMILARITY.getName())
                         * weightService.getWeight(param.getStrategy(), param.getGhId(), index,
-                        ScoreStrategyEnum.SIMILARITY_STRATEGY.getStrategy());
-                if (item.getScore(ScoreStrategyEnum.PUBLISH_TIMES_STRATEGY.getStrategy()) >= 0) {
-                    score += item.getScore(ScoreStrategyEnum.VIEW_COUNT_RATE_STRATEGY.getStrategy())
+                        ScoreStrategyEnum.SIMILARITY.getName());
+                if (item.getScore(ScoreStrategyEnum.PUBLISH_TIMES.getName()) >= 0) {
+                    score += item.getScore(ScoreStrategyEnum.VIEW_COUNT_RATE.getName())
                             * weightService.getWeight(param.getStrategy(), param.getGhId(), index,
-                            ScoreStrategyEnum.VIEW_COUNT_RATE_STRATEGY.getStrategy());
+                            ScoreStrategyEnum.VIEW_COUNT_RATE.getName());
                 }
             } else if (contentPools[1].equals(item.getContent().getContentPoolType())) {
-                score = (item.getScore(ScoreStrategyEnum.SIMILARITY_STRATEGY.getStrategy())
+                score = (item.getScore(ScoreStrategyEnum.SIMILARITY.getName())
                         * weightService.getWeight(param.getStrategy(), param.getGhId(), index,
-                        ScoreStrategyEnum.SIMILARITY_STRATEGY.getStrategy()))
-                        + item.getScore(ScoreStrategyEnum.CATEGORY_STRATEGY.getStrategy())
-                        + item.getScore(ScoreStrategyEnum.FLOW_CTL_DECREASE_STRATEGY.getStrategy());
-                if (item.getScore(ScoreStrategyEnum.PUBLISH_TIMES_STRATEGY.getStrategy()) >= 0) {
-                    score += item.getScore(ScoreStrategyEnum.VIEW_COUNT_RATE_STRATEGY.getStrategy())
+                        ScoreStrategyEnum.SIMILARITY.getName()))
+                        + item.getScore(ScoreStrategyEnum.CATEGORY.getName())
+                        + item.getScore(ScoreStrategyEnum.FLOW_CTL_DECREASE.getName());
+                if (item.getScore(ScoreStrategyEnum.PUBLISH_TIMES.getName()) >= 0) {
+                    score += item.getScore(ScoreStrategyEnum.VIEW_COUNT_RATE.getName())
                             * weightService.getWeight(param.getStrategy(), param.getGhId(), index,
-                            ScoreStrategyEnum.VIEW_COUNT_RATE_STRATEGY.getStrategy());
+                            ScoreStrategyEnum.VIEW_COUNT_RATE.getName());
                 }
             } else {
-                score = (item.getScore(ScoreStrategyEnum.SIMILARITY_STRATEGY.getStrategy())
+                score = (item.getScore(ScoreStrategyEnum.SIMILARITY.getName())
                         * weightService.getWeight(param.getStrategy(), param.getGhId(), index,
-                        ScoreStrategyEnum.SIMILARITY_STRATEGY.getStrategy()))
-                        + item.getScore(ScoreStrategyEnum.CATEGORY_STRATEGY.getStrategy())
-                        + (item.getScore(ScoreStrategyEnum.ACCOUNT_PRE_DISTRIBUTE_STRATEGY.getStrategy())
+                        ScoreStrategyEnum.SIMILARITY.getName()))
+                        + item.getScore(ScoreStrategyEnum.CATEGORY.getName())
+                        + (item.getScore(ScoreStrategyEnum.ACCOUNT_PRE_DISTRIBUTE.getName())
                         * weightService.getWeight(param.getStrategy(), param.getGhId(), index,
-                        ScoreStrategyEnum.ACCOUNT_PRE_DISTRIBUTE_STRATEGY.getStrategy()))
-                        + item.getScore(ScoreStrategyEnum.PUBLISH_TIMES_STRATEGY.getStrategy())
-                        + item.getScore(ScoreStrategyEnum.FLOW_CTL_DECREASE_STRATEGY.getStrategy());
+                        ScoreStrategyEnum.ACCOUNT_PRE_DISTRIBUTE.getName()))
+                        + item.getScore(ScoreStrategyEnum.PUBLISH_TIMES.getName())
+                        + item.getScore(ScoreStrategyEnum.FLOW_CTL_DECREASE.getName());
             }
             c.setScore(score);
             c.setHisPublishArticleList(null);

+ 21 - 21
long-article-recommend-service/src/main/java/com/tzld/longarticle/recommend/server/service/rank/strategy/RankV13Strategy.java

@@ -55,39 +55,39 @@ public class RankV13Strategy implements RankStrategy {
             double score;
             int index = weightService.getIndex(item.getContent().getContentPoolType(), contentPools);
             if (contentPools[0].equals(item.getContent().getContentPoolType())) {
-                double similarityScore = Math.pow(item.getScore(ScoreStrategyEnum.SIMILARITY_STRATEGY.getStrategy()),
+                double similarityScore = Math.pow(item.getScore(ScoreStrategyEnum.SIMILARITY.getName()),
                         weightService.getWeight(param.getStrategy(), param.getGhId(), index,
-                                ScoreStrategyEnum.SIMILARITY_STRATEGY.getStrategy()));
-                score = item.getScore(ScoreStrategyEnum.HIS_FISSION_AVG_READ_RATE_RATE_STRATEGY.getStrategy())
+                                ScoreStrategyEnum.SIMILARITY.getName()));
+                score = item.getScore(ScoreStrategyEnum.HIS_FISSION_AVG_READ_RATE_RATE.getName())
                         * weightService.getWeight(param.getStrategy(), param.getGhId(), index,
-                        ScoreStrategyEnum.HIS_FISSION_AVG_READ_RATE_RATE_STRATEGY.getStrategy());
-                if (item.getScore(ScoreStrategyEnum.PUBLISH_TIMES_STRATEGY.getStrategy()) >= 0) {
-                    score += item.getScore(ScoreStrategyEnum.VIEW_COUNT_RATE_STRATEGY.getStrategy())
+                        ScoreStrategyEnum.HIS_FISSION_AVG_READ_RATE_RATE.getName());
+                if (item.getScore(ScoreStrategyEnum.PUBLISH_TIMES.getName()) >= 0) {
+                    score += item.getScore(ScoreStrategyEnum.VIEW_COUNT_RATE.getName())
                             * weightService.getWeight(param.getStrategy(), param.getGhId(), index,
-                            ScoreStrategyEnum.VIEW_COUNT_RATE_STRATEGY.getStrategy());
+                            ScoreStrategyEnum.VIEW_COUNT_RATE.getName());
                 }
                 score = score * similarityScore;
             } else if (contentPools[1].equals(item.getContent().getContentPoolType())) {
-                score = (item.getScore(ScoreStrategyEnum.SIMILARITY_STRATEGY.getStrategy())
+                score = (item.getScore(ScoreStrategyEnum.SIMILARITY.getName())
                         * weightService.getWeight(param.getStrategy(), param.getGhId(), index,
-                        ScoreStrategyEnum.SIMILARITY_STRATEGY.getStrategy()))
-                        + item.getScore(ScoreStrategyEnum.CATEGORY_STRATEGY.getStrategy())
-                        + item.getScore(ScoreStrategyEnum.FLOW_CTL_DECREASE_STRATEGY.getStrategy());
-                if (item.getScore(ScoreStrategyEnum.PUBLISH_TIMES_STRATEGY.getStrategy()) >= 0) {
-                    score += item.getScore(ScoreStrategyEnum.VIEW_COUNT_RATE_STRATEGY.getStrategy())
+                        ScoreStrategyEnum.SIMILARITY.getName()))
+                        + item.getScore(ScoreStrategyEnum.CATEGORY.getName())
+                        + item.getScore(ScoreStrategyEnum.FLOW_CTL_DECREASE.getName());
+                if (item.getScore(ScoreStrategyEnum.PUBLISH_TIMES.getName()) >= 0) {
+                    score += item.getScore(ScoreStrategyEnum.VIEW_COUNT_RATE.getName())
                             * weightService.getWeight(param.getStrategy(), param.getGhId(), index,
-                            ScoreStrategyEnum.VIEW_COUNT_RATE_STRATEGY.getStrategy());
+                            ScoreStrategyEnum.VIEW_COUNT_RATE.getName());
                 }
             } else {
-                score = (item.getScore(ScoreStrategyEnum.SIMILARITY_STRATEGY.getStrategy())
+                score = (item.getScore(ScoreStrategyEnum.SIMILARITY.getName())
                         * weightService.getWeight(param.getStrategy(), param.getGhId(), index,
-                        ScoreStrategyEnum.SIMILARITY_STRATEGY.getStrategy()))
-                        + item.getScore(ScoreStrategyEnum.CATEGORY_STRATEGY.getStrategy())
-                        + (item.getScore(ScoreStrategyEnum.ACCOUNT_PRE_DISTRIBUTE_STRATEGY.getStrategy())
+                        ScoreStrategyEnum.SIMILARITY.getName()))
+                        + item.getScore(ScoreStrategyEnum.CATEGORY.getName())
+                        + (item.getScore(ScoreStrategyEnum.ACCOUNT_PRE_DISTRIBUTE.getName())
                         * weightService.getWeight(param.getStrategy(), param.getGhId(), index,
-                        ScoreStrategyEnum.ACCOUNT_PRE_DISTRIBUTE_STRATEGY.getStrategy()))
-                        + item.getScore(ScoreStrategyEnum.PUBLISH_TIMES_STRATEGY.getStrategy())
-                        + item.getScore(ScoreStrategyEnum.FLOW_CTL_DECREASE_STRATEGY.getStrategy());
+                        ScoreStrategyEnum.ACCOUNT_PRE_DISTRIBUTE.getName()))
+                        + item.getScore(ScoreStrategyEnum.PUBLISH_TIMES.getName())
+                        + item.getScore(ScoreStrategyEnum.FLOW_CTL_DECREASE.getName());
             }
             c.setScore(score);
             c.setHisPublishArticleList(null);

+ 21 - 21
long-article-recommend-service/src/main/java/com/tzld/longarticle/recommend/server/service/rank/strategy/RankV14Strategy.java

@@ -55,39 +55,39 @@ public class RankV14Strategy implements RankStrategy {
             double score;
             int index = weightService.getIndex(item.getContent().getContentPoolType(), contentPools);
             if (contentPools[0].equals(item.getContent().getContentPoolType())) {
-                double similarityScore = Math.pow(item.getScore(ScoreStrategyEnum.SIMILARITY_STRATEGY.getStrategy()),
+                double similarityScore = Math.pow(item.getScore(ScoreStrategyEnum.SIMILARITY.getName()),
                         weightService.getWeight(param.getStrategy(), param.getGhId(), index,
-                                ScoreStrategyEnum.SIMILARITY_STRATEGY.getStrategy()));
-                score = item.getScore(ScoreStrategyEnum.HIS_FISSION_DE_WEIGHT_AVG_READ_SUM_RATE_STRATEGY.getStrategy())
+                                ScoreStrategyEnum.SIMILARITY.getName()));
+                score = item.getScore(ScoreStrategyEnum.HIS_FISSION_DE_WEIGHT_AVG_READ_SUM_RATE.getName())
                         * weightService.getWeight(param.getStrategy(), param.getGhId(), index,
-                        ScoreStrategyEnum.HIS_FISSION_DE_WEIGHT_AVG_READ_SUM_RATE_STRATEGY.getStrategy());
-                if (item.getScore(ScoreStrategyEnum.PUBLISH_TIMES_STRATEGY.getStrategy()) >= 0) {
-                    score += item.getScore(ScoreStrategyEnum.VIEW_COUNT_RATE_STRATEGY.getStrategy())
+                        ScoreStrategyEnum.HIS_FISSION_DE_WEIGHT_AVG_READ_SUM_RATE.getName());
+                if (item.getScore(ScoreStrategyEnum.PUBLISH_TIMES.getName()) >= 0) {
+                    score += item.getScore(ScoreStrategyEnum.VIEW_COUNT_RATE.getName())
                             * weightService.getWeight(param.getStrategy(), param.getGhId(), index,
-                            ScoreStrategyEnum.VIEW_COUNT_RATE_STRATEGY.getStrategy());
+                            ScoreStrategyEnum.VIEW_COUNT_RATE.getName());
                 }
                 score = score * similarityScore;
             } else if (contentPools[1].equals(item.getContent().getContentPoolType())) {
-                score = (item.getScore(ScoreStrategyEnum.SIMILARITY_STRATEGY.getStrategy())
+                score = (item.getScore(ScoreStrategyEnum.SIMILARITY.getName())
                         * weightService.getWeight(param.getStrategy(), param.getGhId(), index,
-                        ScoreStrategyEnum.SIMILARITY_STRATEGY.getStrategy()))
-                        + item.getScore(ScoreStrategyEnum.CATEGORY_STRATEGY.getStrategy())
-                        + item.getScore(ScoreStrategyEnum.FLOW_CTL_DECREASE_STRATEGY.getStrategy());
-                if (item.getScore(ScoreStrategyEnum.PUBLISH_TIMES_STRATEGY.getStrategy()) >= 0) {
-                    score += item.getScore(ScoreStrategyEnum.VIEW_COUNT_RATE_STRATEGY.getStrategy())
+                        ScoreStrategyEnum.SIMILARITY.getName()))
+                        + item.getScore(ScoreStrategyEnum.CATEGORY.getName())
+                        + item.getScore(ScoreStrategyEnum.FLOW_CTL_DECREASE.getName());
+                if (item.getScore(ScoreStrategyEnum.PUBLISH_TIMES.getName()) >= 0) {
+                    score += item.getScore(ScoreStrategyEnum.VIEW_COUNT_RATE.getName())
                             * weightService.getWeight(param.getStrategy(), param.getGhId(), index,
-                            ScoreStrategyEnum.VIEW_COUNT_RATE_STRATEGY.getStrategy());
+                            ScoreStrategyEnum.VIEW_COUNT_RATE.getName());
                 }
             } else {
-                score = (item.getScore(ScoreStrategyEnum.SIMILARITY_STRATEGY.getStrategy())
+                score = (item.getScore(ScoreStrategyEnum.SIMILARITY.getName())
                         * weightService.getWeight(param.getStrategy(), param.getGhId(), index,
-                        ScoreStrategyEnum.SIMILARITY_STRATEGY.getStrategy()))
-                        + item.getScore(ScoreStrategyEnum.CATEGORY_STRATEGY.getStrategy())
-                        + (item.getScore(ScoreStrategyEnum.ACCOUNT_PRE_DISTRIBUTE_STRATEGY.getStrategy())
+                        ScoreStrategyEnum.SIMILARITY.getName()))
+                        + item.getScore(ScoreStrategyEnum.CATEGORY.getName())
+                        + (item.getScore(ScoreStrategyEnum.ACCOUNT_PRE_DISTRIBUTE.getName())
                         * weightService.getWeight(param.getStrategy(), param.getGhId(), index,
-                        ScoreStrategyEnum.ACCOUNT_PRE_DISTRIBUTE_STRATEGY.getStrategy()))
-                        + item.getScore(ScoreStrategyEnum.PUBLISH_TIMES_STRATEGY.getStrategy())
-                        + item.getScore(ScoreStrategyEnum.FLOW_CTL_DECREASE_STRATEGY.getStrategy());
+                        ScoreStrategyEnum.ACCOUNT_PRE_DISTRIBUTE.getName()))
+                        + item.getScore(ScoreStrategyEnum.PUBLISH_TIMES.getName())
+                        + item.getScore(ScoreStrategyEnum.FLOW_CTL_DECREASE.getName());
             }
             c.setScore(score);
             c.setHisPublishArticleList(null);

+ 4 - 4
long-article-recommend-service/src/main/java/com/tzld/longarticle/recommend/server/service/rank/strategy/RankV2Strategy.java

@@ -47,15 +47,15 @@ public class RankV2Strategy implements RankStrategy {
         // 1 排序
         Collections.sort(items, (o1, o2) -> {
             int result = -Double.compare(
-                    o1.getScore(ScoreStrategyEnum.SIMILARITY_STRATEGY.getStrategy()),
-                    o2.getScore(ScoreStrategyEnum.SIMILARITY_STRATEGY.getStrategy()));
+                    o1.getScore(ScoreStrategyEnum.SIMILARITY.getName()),
+                    o2.getScore(ScoreStrategyEnum.SIMILARITY.getName()));
             if (result != 0) {
                 return result;
             }
 
             return -Double.compare(
-                    o1.getScore(ScoreStrategyEnum.VIEW_COUNT_STRATEGY.getStrategy()),
-                    o2.getScore(ScoreStrategyEnum.VIEW_COUNT_STRATEGY.getStrategy()));
+                    o1.getScore(ScoreStrategyEnum.VIEW_COUNT.getName()),
+                    o2.getScore(ScoreStrategyEnum.VIEW_COUNT.getName()));
         });
         // 2 选文章
         List<Content> result = new ArrayList<>();

+ 10 - 10
long-article-recommend-service/src/main/java/com/tzld/longarticle/recommend/server/service/rank/strategy/RankV3Strategy.java

@@ -54,18 +54,18 @@ public class RankV3Strategy implements RankStrategy {
             double score;
             if (contentPools[0].equals(item.getContent().getContentPoolType())
                     || contentPools[1].equals(item.getContent().getContentPoolType())) {
-                score = item.getScore(ScoreStrategyEnum.SIMILARITY_STRATEGY.getStrategy())
-                        + item.getScore(ScoreStrategyEnum.CATEGORY_STRATEGY.getStrategy())
-                        + item.getScore(ScoreStrategyEnum.FLOW_CTL_DECREASE_STRATEGY.getStrategy());
-                if (item.getScore(ScoreStrategyEnum.PUBLISH_TIMES_STRATEGY.getStrategy()) >= 0) {
-                    score += item.getScore(ScoreStrategyEnum.VIEW_COUNT_RATE_STRATEGY.getStrategy());
+                score = item.getScore(ScoreStrategyEnum.SIMILARITY.getName())
+                        + item.getScore(ScoreStrategyEnum.CATEGORY.getName())
+                        + item.getScore(ScoreStrategyEnum.FLOW_CTL_DECREASE.getName());
+                if (item.getScore(ScoreStrategyEnum.PUBLISH_TIMES.getName()) >= 0) {
+                    score += item.getScore(ScoreStrategyEnum.VIEW_COUNT_RATE.getName());
                 }
             } else {
-                score = item.getScore(ScoreStrategyEnum.SIMILARITY_STRATEGY.getStrategy())
-                        + item.getScore(ScoreStrategyEnum.CATEGORY_STRATEGY.getStrategy())
-                        + item.getScore(ScoreStrategyEnum.ACCOUNT_PRE_DISTRIBUTE_STRATEGY.getStrategy())
-                        + item.getScore(ScoreStrategyEnum.PUBLISH_TIMES_STRATEGY.getStrategy())
-                        + item.getScore(ScoreStrategyEnum.FLOW_CTL_DECREASE_STRATEGY.getStrategy());
+                score = item.getScore(ScoreStrategyEnum.SIMILARITY.getName())
+                        + item.getScore(ScoreStrategyEnum.CATEGORY.getName())
+                        + item.getScore(ScoreStrategyEnum.ACCOUNT_PRE_DISTRIBUTE.getName())
+                        + item.getScore(ScoreStrategyEnum.PUBLISH_TIMES.getName())
+                        + item.getScore(ScoreStrategyEnum.FLOW_CTL_DECREASE.getName());
             }
             c.setScore(score);
             item.setScore(score);

+ 10 - 10
long-article-recommend-service/src/main/java/com/tzld/longarticle/recommend/server/service/rank/strategy/RankV4Strategy.java

@@ -54,18 +54,18 @@ public class RankV4Strategy implements RankStrategy {
             double score;
             if (contentPools[0].equals(item.getContent().getContentPoolType())
                     || contentPools[1].equals(item.getContent().getContentPoolType())) {
-                score = item.getScore(ScoreStrategyEnum.SIMILARITY_STRATEGY.getStrategy())
-                        + item.getScore(ScoreStrategyEnum.CATEGORY_STRATEGY.getStrategy())
-                        + item.getScore(ScoreStrategyEnum.FLOW_CTL_DECREASE_STRATEGY.getStrategy());
-                if (item.getScore(ScoreStrategyEnum.PUBLISH_TIMES_STRATEGY.getStrategy()) >= 0) {
-                    score += item.getScore(ScoreStrategyEnum.VIEW_COUNT_RATE_CORRELATION_STRATEGY.getStrategy());
+                score = item.getScore(ScoreStrategyEnum.SIMILARITY.getName())
+                        + item.getScore(ScoreStrategyEnum.CATEGORY.getName())
+                        + item.getScore(ScoreStrategyEnum.FLOW_CTL_DECREASE.getName());
+                if (item.getScore(ScoreStrategyEnum.PUBLISH_TIMES.getName()) >= 0) {
+                    score += item.getScore(ScoreStrategyEnum.VIEW_COUNT_RATE_CORRELATION.getName());
                 }
             } else {
-                score = item.getScore(ScoreStrategyEnum.SIMILARITY_STRATEGY.getStrategy())
-                        + item.getScore(ScoreStrategyEnum.CATEGORY_STRATEGY.getStrategy())
-                        + item.getScore(ScoreStrategyEnum.ACCOUNT_PRE_DISTRIBUTE_STRATEGY.getStrategy())
-                        + item.getScore(ScoreStrategyEnum.PUBLISH_TIMES_STRATEGY.getStrategy())
-                        + item.getScore(ScoreStrategyEnum.FLOW_CTL_DECREASE_STRATEGY.getStrategy());
+                score = item.getScore(ScoreStrategyEnum.SIMILARITY.getName())
+                        + item.getScore(ScoreStrategyEnum.CATEGORY.getName())
+                        + item.getScore(ScoreStrategyEnum.ACCOUNT_PRE_DISTRIBUTE.getName())
+                        + item.getScore(ScoreStrategyEnum.PUBLISH_TIMES.getName())
+                        + item.getScore(ScoreStrategyEnum.FLOW_CTL_DECREASE.getName());
             }
             c.setScore(score);
             item.setScore(score);

+ 12 - 12
long-article-recommend-service/src/main/java/com/tzld/longarticle/recommend/server/service/rank/strategy/RankV5Strategy.java

@@ -56,22 +56,22 @@ public class RankV5Strategy implements RankStrategy {
             int index = weightService.getIndex(item.getContent().getContentPoolType(), contentPools);
             if (contentPools[0].equals(item.getContent().getContentPoolType())
                     || contentPools[1].equals(item.getContent().getContentPoolType())) {
-                score = item.getScore(ScoreStrategyEnum.SIMILARITY_STRATEGY.getStrategy())
+                score = item.getScore(ScoreStrategyEnum.SIMILARITY.getName())
                         * weightService.getWeight(param.getStrategy(), param.getGhId(), index,
-                        ScoreStrategyEnum.SIMILARITY_STRATEGY.getStrategy())
-                        + item.getScore(ScoreStrategyEnum.CATEGORY_STRATEGY.getStrategy())
-                        + item.getScore(ScoreStrategyEnum.FLOW_CTL_DECREASE_STRATEGY.getStrategy());
-                if (item.getScore(ScoreStrategyEnum.PUBLISH_TIMES_STRATEGY.getStrategy()) >= 0) {
-                    score += item.getScore(ScoreStrategyEnum.VIEW_COUNT_RATE_STRATEGY.getStrategy())
+                        ScoreStrategyEnum.SIMILARITY.getName())
+                        + item.getScore(ScoreStrategyEnum.CATEGORY.getName())
+                        + item.getScore(ScoreStrategyEnum.FLOW_CTL_DECREASE.getName());
+                if (item.getScore(ScoreStrategyEnum.PUBLISH_TIMES.getName()) >= 0) {
+                    score += item.getScore(ScoreStrategyEnum.VIEW_COUNT_RATE.getName())
                             * weightService.getWeight(param.getStrategy(), param.getGhId(), index,
-                            ScoreStrategyEnum.VIEW_COUNT_RATE_STRATEGY.getStrategy());
+                            ScoreStrategyEnum.VIEW_COUNT_RATE.getName());
                 }
             } else {
-                score = item.getScore(ScoreStrategyEnum.SIMILARITY_STRATEGY.getStrategy())
-                        + item.getScore(ScoreStrategyEnum.CATEGORY_STRATEGY.getStrategy())
-                        + item.getScore(ScoreStrategyEnum.ACCOUNT_PRE_DISTRIBUTE_STRATEGY.getStrategy())
-                        + item.getScore(ScoreStrategyEnum.PUBLISH_TIMES_STRATEGY.getStrategy())
-                        + item.getScore(ScoreStrategyEnum.FLOW_CTL_DECREASE_STRATEGY.getStrategy());
+                score = item.getScore(ScoreStrategyEnum.SIMILARITY.getName())
+                        + item.getScore(ScoreStrategyEnum.CATEGORY.getName())
+                        + item.getScore(ScoreStrategyEnum.ACCOUNT_PRE_DISTRIBUTE.getName())
+                        + item.getScore(ScoreStrategyEnum.PUBLISH_TIMES.getName())
+                        + item.getScore(ScoreStrategyEnum.FLOW_CTL_DECREASE.getName());
             }
             c.setScore(score);
             item.setScore(score);

+ 11 - 11
long-article-recommend-service/src/main/java/com/tzld/longarticle/recommend/server/service/rank/strategy/RankV7Strategy.java

@@ -53,20 +53,20 @@ public class RankV7Strategy implements RankStrategy {
             item.setScoreMap(scoreMap.get(c.getId()));
             double score;
             if (contentPools[0].equals(item.getContent().getContentPoolType())) {
-                score = item.getScore(ScoreStrategyEnum.HIS_FISSION_AVG_READ_RATE_CORRELATION_RATE_STRATEGY.getStrategy());
+                score = item.getScore(ScoreStrategyEnum.HIS_FISSION_AVG_READ_RATE_CORRELATION_RATE.getName());
             } else if (contentPools[1].equals(item.getContent().getContentPoolType())) {
-                score = item.getScore(ScoreStrategyEnum.SIMILARITY_STRATEGY.getStrategy())
-                        + item.getScore(ScoreStrategyEnum.CATEGORY_STRATEGY.getStrategy())
-                        + item.getScore(ScoreStrategyEnum.FLOW_CTL_DECREASE_STRATEGY.getStrategy());
-                if (item.getScore(ScoreStrategyEnum.PUBLISH_TIMES_STRATEGY.getStrategy()) >= 0) {
-                    score += item.getScore(ScoreStrategyEnum.VIEW_COUNT_RATE_STRATEGY.getStrategy());
+                score = item.getScore(ScoreStrategyEnum.SIMILARITY.getName())
+                        + item.getScore(ScoreStrategyEnum.CATEGORY.getName())
+                        + item.getScore(ScoreStrategyEnum.FLOW_CTL_DECREASE.getName());
+                if (item.getScore(ScoreStrategyEnum.PUBLISH_TIMES.getName()) >= 0) {
+                    score += item.getScore(ScoreStrategyEnum.VIEW_COUNT_RATE.getName());
                 }
             } else {
-                score = item.getScore(ScoreStrategyEnum.SIMILARITY_STRATEGY.getStrategy())
-                        + item.getScore(ScoreStrategyEnum.CATEGORY_STRATEGY.getStrategy())
-                        + item.getScore(ScoreStrategyEnum.ACCOUNT_PRE_DISTRIBUTE_STRATEGY.getStrategy())
-                        + item.getScore(ScoreStrategyEnum.PUBLISH_TIMES_STRATEGY.getStrategy())
-                        + item.getScore(ScoreStrategyEnum.FLOW_CTL_DECREASE_STRATEGY.getStrategy());
+                score = item.getScore(ScoreStrategyEnum.SIMILARITY.getName())
+                        + item.getScore(ScoreStrategyEnum.CATEGORY.getName())
+                        + item.getScore(ScoreStrategyEnum.ACCOUNT_PRE_DISTRIBUTE.getName())
+                        + item.getScore(ScoreStrategyEnum.PUBLISH_TIMES.getName())
+                        + item.getScore(ScoreStrategyEnum.FLOW_CTL_DECREASE.getName());
             }
             c.setScore(score);
             item.setScore(score);

+ 14 - 14
long-article-recommend-service/src/main/java/com/tzld/longarticle/recommend/server/service/rank/strategy/RankV8Strategy.java

@@ -53,23 +53,23 @@ public class RankV8Strategy implements RankStrategy {
             item.setScoreMap(scoreMap.get(c.getId()));
             double score;
             if (contentPools[0].equals(item.getContent().getContentPoolType())) {
-                score = item.getScore(ScoreStrategyEnum.SIMILARITY_STRATEGY.getStrategy())
-                        + item.getScore(ScoreStrategyEnum.CATEGORY_STRATEGY.getStrategy())
-                        + item.getScore(ScoreStrategyEnum.FLOW_CTL_DECREASE_STRATEGY.getStrategy());
-                score += item.getScore(ScoreStrategyEnum.HIS_FISSION_AVG_READ_RATE_RATE_STRATEGY.getStrategy());
+                score = item.getScore(ScoreStrategyEnum.SIMILARITY.getName())
+                        + item.getScore(ScoreStrategyEnum.CATEGORY.getName())
+                        + item.getScore(ScoreStrategyEnum.FLOW_CTL_DECREASE.getName());
+                score += item.getScore(ScoreStrategyEnum.HIS_FISSION_AVG_READ_RATE_RATE.getName());
             } else if (contentPools[1].equals(item.getContent().getContentPoolType())) {
-                score = item.getScore(ScoreStrategyEnum.SIMILARITY_STRATEGY.getStrategy())
-                        + item.getScore(ScoreStrategyEnum.CATEGORY_STRATEGY.getStrategy())
-                        + item.getScore(ScoreStrategyEnum.FLOW_CTL_DECREASE_STRATEGY.getStrategy());
-                if (item.getScore(ScoreStrategyEnum.PUBLISH_TIMES_STRATEGY.getStrategy()) >= 0) {
-                    score += item.getScore(ScoreStrategyEnum.VIEW_COUNT_RATE_STRATEGY.getStrategy());
+                score = item.getScore(ScoreStrategyEnum.SIMILARITY.getName())
+                        + item.getScore(ScoreStrategyEnum.CATEGORY.getName())
+                        + item.getScore(ScoreStrategyEnum.FLOW_CTL_DECREASE.getName());
+                if (item.getScore(ScoreStrategyEnum.PUBLISH_TIMES.getName()) >= 0) {
+                    score += item.getScore(ScoreStrategyEnum.VIEW_COUNT_RATE.getName());
                 }
             } else {
-                score = item.getScore(ScoreStrategyEnum.SIMILARITY_STRATEGY.getStrategy())
-                        + item.getScore(ScoreStrategyEnum.CATEGORY_STRATEGY.getStrategy())
-                        + item.getScore(ScoreStrategyEnum.ACCOUNT_PRE_DISTRIBUTE_STRATEGY.getStrategy())
-                        + item.getScore(ScoreStrategyEnum.PUBLISH_TIMES_STRATEGY.getStrategy())
-                        + item.getScore(ScoreStrategyEnum.FLOW_CTL_DECREASE_STRATEGY.getStrategy());
+                score = item.getScore(ScoreStrategyEnum.SIMILARITY.getName())
+                        + item.getScore(ScoreStrategyEnum.CATEGORY.getName())
+                        + item.getScore(ScoreStrategyEnum.ACCOUNT_PRE_DISTRIBUTE.getName())
+                        + item.getScore(ScoreStrategyEnum.PUBLISH_TIMES.getName())
+                        + item.getScore(ScoreStrategyEnum.FLOW_CTL_DECREASE.getName());
             }
             c.setScore(score);
             item.setScore(score);

+ 11 - 11
long-article-recommend-service/src/main/java/com/tzld/longarticle/recommend/server/service/rank/strategy/RankV9Strategy.java

@@ -53,20 +53,20 @@ public class RankV9Strategy implements RankStrategy {
             item.setScoreMap(scoreMap.get(c.getId()));
             double score;
             if (contentPools[0].equals(item.getContent().getContentPoolType())) {
-                score = item.getScore(ScoreStrategyEnum.HIS_FISSION_AVG_READ_RATE_RATE_STRATEGY.getStrategy());
+                score = item.getScore(ScoreStrategyEnum.HIS_FISSION_AVG_READ_RATE_RATE.getName());
             } else if (contentPools[1].equals(item.getContent().getContentPoolType())) {
-                score = item.getScore(ScoreStrategyEnum.SIMILARITY_STRATEGY.getStrategy())
-                        + item.getScore(ScoreStrategyEnum.CATEGORY_STRATEGY.getStrategy())
-                        + item.getScore(ScoreStrategyEnum.FLOW_CTL_DECREASE_STRATEGY.getStrategy());
-                if (item.getScore(ScoreStrategyEnum.PUBLISH_TIMES_STRATEGY.getStrategy()) >= 0) {
-                    score += item.getScore(ScoreStrategyEnum.VIEW_COUNT_RATE_STRATEGY.getStrategy());
+                score = item.getScore(ScoreStrategyEnum.SIMILARITY.getName())
+                        + item.getScore(ScoreStrategyEnum.CATEGORY.getName())
+                        + item.getScore(ScoreStrategyEnum.FLOW_CTL_DECREASE.getName());
+                if (item.getScore(ScoreStrategyEnum.PUBLISH_TIMES.getName()) >= 0) {
+                    score += item.getScore(ScoreStrategyEnum.VIEW_COUNT_RATE.getName());
                 }
             } else {
-                score = item.getScore(ScoreStrategyEnum.SIMILARITY_STRATEGY.getStrategy())
-                        + item.getScore(ScoreStrategyEnum.CATEGORY_STRATEGY.getStrategy())
-                        + item.getScore(ScoreStrategyEnum.ACCOUNT_PRE_DISTRIBUTE_STRATEGY.getStrategy())
-                        + item.getScore(ScoreStrategyEnum.PUBLISH_TIMES_STRATEGY.getStrategy())
-                        + item.getScore(ScoreStrategyEnum.FLOW_CTL_DECREASE_STRATEGY.getStrategy());
+                score = item.getScore(ScoreStrategyEnum.SIMILARITY.getName())
+                        + item.getScore(ScoreStrategyEnum.CATEGORY.getName())
+                        + item.getScore(ScoreStrategyEnum.ACCOUNT_PRE_DISTRIBUTE.getName())
+                        + item.getScore(ScoreStrategyEnum.PUBLISH_TIMES.getName())
+                        + item.getScore(ScoreStrategyEnum.FLOW_CTL_DECREASE.getName());
             }
             c.setScore(score);
             item.setScore(score);

+ 18 - 18
long-article-recommend-service/src/main/java/com/tzld/longarticle/recommend/server/service/score/ScoreService.java

@@ -92,16 +92,16 @@ public class ScoreService implements ApplicationContextAware {
     private List<ScoreStrategy> getScoreStrategy(ScoreParam param) {
         List<ScoreStrategy> strategies = new ArrayList<>();
         if (!similarityStopStrategies.contains(param.getStrategy())) {
-            strategies.add(strategyMap.get(ScoreStrategyEnum.SIMILARITY_STRATEGY.getStrategy()));
+            strategies.add(strategyMap.get(ScoreStrategyEnum.SIMILARITY.getName()));
         }
         if (StringUtils.equals(param.getStrategy(), RankStrategyEnum.late_Strategy.getStrategy())) {
-            strategies.add(strategyMap.get(ScoreStrategyEnum.CATEGORY_STRATEGY.getStrategy()));
-            strategies.add(strategyMap.get(ScoreStrategyEnum.ACCOUNT_PRE_DISTRIBUTE_STRATEGY.getStrategy()));
-            strategies.add(strategyMap.get(ScoreStrategyEnum.PUBLISH_TIMES_STRATEGY.getStrategy()));
-            strategies.add(strategyMap.get(ScoreStrategyEnum.FLOW_CTL_DECREASE_STRATEGY.getStrategy()));
+            strategies.add(strategyMap.get(ScoreStrategyEnum.CATEGORY.getName()));
+            strategies.add(strategyMap.get(ScoreStrategyEnum.ACCOUNT_PRE_DISTRIBUTE.getName()));
+            strategies.add(strategyMap.get(ScoreStrategyEnum.PUBLISH_TIMES.getName()));
+            strategies.add(strategyMap.get(ScoreStrategyEnum.FLOW_CTL_DECREASE.getName()));
             return strategies;
         }
-        strategies.add(strategyMap.get(ScoreStrategyEnum.VIEW_COUNT_STRATEGY.getStrategy()));
+        strategies.add(strategyMap.get(ScoreStrategyEnum.VIEW_COUNT.getName()));
         if (StringUtils.equals(param.getStrategy(), RankStrategyEnum.ArticleRankV3.getStrategy())
                 || StringUtils.equals(param.getStrategy(), RankStrategyEnum.ArticleRankV4.getStrategy())
                 || StringUtils.equals(param.getStrategy(), RankStrategyEnum.ArticleRankV5.getStrategy())
@@ -113,18 +113,18 @@ public class ScoreService implements ApplicationContextAware {
                 || StringUtils.equals(param.getStrategy(), RankStrategyEnum.ArticleRankV12.getStrategy())
                 || StringUtils.equals(param.getStrategy(), RankStrategyEnum.ArticleRankV13.getStrategy())
                 || StringUtils.equals(param.getStrategy(), RankStrategyEnum.ArticleRankV14.getStrategy())) {
-            strategies.add(strategyMap.get(ScoreStrategyEnum.CATEGORY_STRATEGY.getStrategy()));
-            strategies.add(strategyMap.get(ScoreStrategyEnum.ACCOUNT_PRE_DISTRIBUTE_STRATEGY.getStrategy()));
-            strategies.add(strategyMap.get(ScoreStrategyEnum.FLOW_CTL_DECREASE_STRATEGY.getStrategy()));
-            strategies.add(strategyMap.get(ScoreStrategyEnum.VIEW_COUNT_RATE_STRATEGY.getStrategy()));
-            strategies.add(strategyMap.get(ScoreStrategyEnum.VIEW_COUNT_RATE_CORRELATION_STRATEGY.getStrategy()));
-            strategies.add(strategyMap.get(ScoreStrategyEnum.PUBLISH_TIMES_STRATEGY.getStrategy()));
-//            strategies.add(strategyMap.get(ScoreStrategyEnum.HIS_FISSION_FANS_RATE_RATE_STRATEGY.getStrategy()));
-//            strategies.add(strategyMap.get(ScoreStrategyEnum.HIS_FISSION_FANS_SUM_RATE_STRATEGY.getStrategy()));
-            strategies.add(strategyMap.get(ScoreStrategyEnum.HIS_FISSION_AVG_READ_RATE_RATE_STRATEGY.getStrategy()));
-            strategies.add(strategyMap.get(ScoreStrategyEnum.HIS_FISSION_AVG_READ_RATE_CORRELATION_RATE_STRATEGY.getStrategy()));
-            strategies.add(strategyMap.get(ScoreStrategyEnum.HIS_FISSION_AVG_READ_SUM_RATE_STRATEGY.getStrategy()));
-            strategies.add(strategyMap.get(ScoreStrategyEnum.HIS_FISSION_DE_WEIGHT_AVG_READ_SUM_RATE_STRATEGY.getStrategy()));
+            strategies.add(strategyMap.get(ScoreStrategyEnum.CATEGORY.getName()));
+            strategies.add(strategyMap.get(ScoreStrategyEnum.ACCOUNT_PRE_DISTRIBUTE.getName()));
+            strategies.add(strategyMap.get(ScoreStrategyEnum.FLOW_CTL_DECREASE.getName()));
+            strategies.add(strategyMap.get(ScoreStrategyEnum.VIEW_COUNT_RATE.getName()));
+            strategies.add(strategyMap.get(ScoreStrategyEnum.VIEW_COUNT_RATE_CORRELATION.getName()));
+            strategies.add(strategyMap.get(ScoreStrategyEnum.PUBLISH_TIMES.getName()));
+//            strategies.add(strategyMap.get(ScoreStrategyEnum.HIS_FISSION_FANS_RATE_RATE.getName()));
+//            strategies.add(strategyMap.get(ScoreStrategyEnum.HIS_FISSION_FANS_SUM_RATE.getName()));
+            strategies.add(strategyMap.get(ScoreStrategyEnum.HIS_FISSION_AVG_READ_RATE_RATE.getName()));
+            strategies.add(strategyMap.get(ScoreStrategyEnum.HIS_FISSION_AVG_READ_RATE_CORRELATION_RATE.getName()));
+            strategies.add(strategyMap.get(ScoreStrategyEnum.HIS_FISSION_AVG_READ_SUM_RATE.getName()));
+            strategies.add(strategyMap.get(ScoreStrategyEnum.HIS_FISSION_DE_WEIGHT_AVG_READ_SUM_RATE.getName()));
         }
 
         return strategies;