Merge branch 'wyp/0905' of Server/long-article-recommend into master

long-article-recommend-service/src/main/java/com/tzld/longarticle/recommend/server/common/enums/RankStrategyEnum.java

@@ -15,6 +15,7 @@ public enum RankStrategyEnum {
     ArticleRankV8("ArticleRankV8", "ArticleRankV8", "rankV8Strategy"),
     ArticleRankV9("ArticleRankV9", "ArticleRankV9", "rankV9Strategy"),
     ArticleRankV10("ArticleRankV10", "ArticleRankV10", "rankV10Strategy"),
+    ArticleRankV11("ArticleRankV11", "ArticleRankV11", "rankV9Strategy"),
 
     default_strategy("ArticleRankV1", "默认策略", "defaultRankStrategy"),
     ;

long-article-recommend-service/src/main/java/com/tzld/longarticle/recommend/server/service/recall/RecallService.java

@@ -300,28 +300,28 @@ public class RecallService implements ApplicationContextAware {
                     || CollectionUtils.isEmpty(article.getArticleDetailInfoList())) {
                 continue;
             }
-            int sumFission = 0;
+            int sumFission0 = 0;
             Date minDate = article.getArticleDetailInfoList().stream().map(ArticleDetailInfo::getRecallDt).min(Date::compareTo).orElse(new Date());
             for (ArticleDetailInfo articleDetailInfo : article.getArticleDetailInfoList()) {
                 if (articleDetailInfo.getRecallDt().equals(minDate) && Objects.nonNull(articleDetailInfo.getFission0())) {
-                    sumFission += articleDetailInfo.getFission0();
+                    sumFission0 += articleDetailInfo.getFission0();
                 }
             }
-            if (sumFission == 0) {
+            if (sumFission0 == 0) {
                 continue;
             }
-            article.setT0FissionSum(sumFission);
+            article.setT0FissionSum(sumFission0);
             if (article.getFans() > 0) {
-                article.setT0FissionByFans(sumFission * 1.0 / article.getFans());
+                article.setT0FissionByFans(sumFission0 * 1.0 / article.getFans());
                 fansSum += (int) article.getFans();
                 t0FissionByFansSum += article.getT0FissionByFans();
             }
             if (Objects.nonNull(article.getAvgViewCount()) && article.getAvgViewCount() > 0) {
-                article.setT0FissionByReadAvg(sumFission * 1.0 / article.getAvgViewCount());
+                article.setT0FissionByReadAvg(sumFission0 * 1.0 / (article.getAvgViewCount() + 500));
                 avgReadCountSum += article.getAvgViewCount();
                 t0FissionByReadAvgSum += article.getT0FissionByReadAvg();
             }
-            fissionSum += sumFission;
+            fissionSum += sumFission0;
             firstLevelSize++;
         }
         if (firstLevelSize > 0) {

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

@@ -98,7 +98,8 @@ public class ScoreService implements ApplicationContextAware {
                 || StringUtils.equals(param.getStrategy(), RankStrategyEnum.ArticleRankV7.getStrategy())
                 || StringUtils.equals(param.getStrategy(), RankStrategyEnum.ArticleRankV8.getStrategy())
                 || StringUtils.equals(param.getStrategy(), RankStrategyEnum.ArticleRankV9.getStrategy())
-                || StringUtils.equals(param.getStrategy(), RankStrategyEnum.ArticleRankV10.getStrategy())) {
+                || StringUtils.equals(param.getStrategy(), RankStrategyEnum.ArticleRankV10.getStrategy())
+                || StringUtils.equals(param.getStrategy(), RankStrategyEnum.ArticleRankV11.getStrategy())) {
             strategies.add(strategyMap.get(CategoryStrategy.class.getSimpleName()));
             strategies.add(strategyMap.get(AccountPreDistributeStrategy.class.getSimpleName()));
             strategies.add(strategyMap.get(FlowCtlDecreaseStrategy.class.getSimpleName()));