无限流发表

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

@@ -6,12 +6,12 @@ import java.util.Objects;
 
 @Getter
 public enum PushTypeEnum {
-    manual_push(1, "手动推送"),
-    auto_group_publish(2, "自动群发"),
-    auto_publish(3, "自动发表"),
-    robopost(4, "自动发布"),
-    batch_group_publish(5, "分组群发"),
-    trigger_push(6, "触发推送"),
+    MANUAL_PUSH(1, "手动推送"),
+    AUTO_GROUP_PUBLISH(2, "自动群发"),
+    AUTO_PUBLISH(3, "自动发表"),
+    ROBOPOST(4, "自动发布"),
+    BATCH_GROUP_PUBLISH(5, "分组群发"),
+    TRIGGER_PUSH(6, "触发推送"),
 
     other(999, "其他"),
     ;

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

@@ -20,9 +20,9 @@ public enum RankStrategyEnum {
     ArticleRankV13("ArticleRankV13", "ArticleRankV13", "rankV13Strategy"),
     ArticleRankV14("ArticleRankV14", "ArticleRankV14", "rankV14Strategy"),
 
-    infinite_Strategy("ArticleRankInfinite", "无限发表", "infiniteRankStrategy"),
-    late_Strategy("ArticleRankLate", "晚间策略", "lateRankStrategy"),
-    default_strategy("ArticleRankV1", "默认策略", "defaultRankStrategy"),
+    INFINITE_STRATEGY("ArticleRankInfinite", "无限发表", "infiniteRankStrategy"),
+    LATE_STRATEGY("ArticleRankLate", "晚间策略", "lateRankStrategy"),
+    DEFAULT_STRATEGY("ArticleRankV1", "默认策略", "defaultRankStrategy"),
     ;
 
     private final String strategy;
@@ -41,6 +41,6 @@ public enum RankStrategyEnum {
                 return statusEnum;
             }
         }
-        return default_strategy;
+        return DEFAULT_STRATEGY;
     }
 }

long-article-recommend-service/src/main/java/com/tzld/longarticle/recommend/server/model/param/RecommendParam.java

@@ -1,5 +1,6 @@
 package com.tzld.longarticle.recommend.server.model.param;
 
+import com.tzld.longarticle.recommend.server.common.enums.ArticleTypeEnum;
 import lombok.Getter;
 import lombok.NoArgsConstructor;
 import lombok.Setter;
@@ -20,7 +21,8 @@ public class RecommendParam {
     private String strategy;
     private Integer publishNum;
     private String planId;
-    private String type = "9";
+    // 默认为群发 ArticleTypeEnum.QUNFA.getVal()
+    private String type = ArticleTypeEnum.QUNFA.getVal();
     // true 不记录日志
     private boolean excludeLog = false;
     private String scene;

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

@@ -93,8 +93,8 @@ public class RecommendService {
     }
 
     private void setStrategy(RecommendRequest request, RecommendParam param) {
-        if (Objects.equals(request.getPushType(), PushTypeEnum.auto_publish.getVal())) {
-            param.setStrategy(RankStrategyEnum.infinite_Strategy.getStrategy());
+        if (Objects.equals(request.getPushType(), PushTypeEnum.AUTO_PUBLISH.getVal())) {
+            param.setStrategy(RankStrategyEnum.INFINITE_STRATEGY.getStrategy());
             param.setType(ArticleTypeEnum.WUXIANLIU.getVal());
             return;
         }
@@ -103,9 +103,8 @@ public class RecommendService {
             param.setStrategy(strategyConfig);
         }
         if (DateUtils.getCurrentHour() >= 19 && !request.isParamStrategy()) {
-            Integer pushType = aigcBaseMapper.getPublishPlanPushType(request.getPlanId());
-            if (Objects.equals(2, pushType)) {
-                param.setStrategy(RankStrategyEnum.late_Strategy.getStrategy());
+            if (Objects.equals(request.getPushType(), PushTypeEnum.AUTO_GROUP_PUBLISH.getVal())) {
+                param.setStrategy(RankStrategyEnum.LATE_STRATEGY.getStrategy());
             }
         }
     }

long-article-recommend-service/src/main/java/com/tzld/longarticle/recommend/server/service/filter/FilterService.java

@@ -96,7 +96,7 @@ public class FilterService {
         if (param.getScene().equals(FWH_COLD_START)) {
             strategies.add(ServiceBeanFactory.getBean(HistoryTitleForFwhColdStartStrategy.class));
         } else {
-            if (Objects.equals(param.getStrategy(), RankStrategyEnum.infinite_Strategy.getStrategy())) {
+            if (Objects.equals(param.getStrategy(), RankStrategyEnum.INFINITE_STRATEGY.getStrategy())) {
                 strategies.add(ServiceBeanFactory.getBean(InfiniteHisTitleStrategy.class));
             } else {
                 strategies.add(ServiceBeanFactory.getBean(HistoryTitleStrategy.class));

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

@@ -94,8 +94,8 @@ public class ScoreService implements ApplicationContextAware {
         if (!similarityStopStrategies.contains(param.getStrategy())) {
             strategies.add(strategyMap.get(ScoreStrategyEnum.SIMILARITY.value()));
         }
-        if (StringUtils.equals(param.getStrategy(), RankStrategyEnum.late_Strategy.getStrategy())
-                || StringUtils.equals(param.getStrategy(), RankStrategyEnum.infinite_Strategy.getStrategy())) {
+        if (StringUtils.equals(param.getStrategy(), RankStrategyEnum.LATE_STRATEGY.getStrategy())
+                || StringUtils.equals(param.getStrategy(), RankStrategyEnum.INFINITE_STRATEGY.getStrategy())) {
             strategies.add(strategyMap.get(ScoreStrategyEnum.CATEGORY.value()));
             strategies.add(strategyMap.get(ScoreStrategyEnum.ACCOUNT_PRE_DISTRIBUTE.value()));
             strategies.add(strategyMap.get(ScoreStrategyEnum.PUBLISH_TIMES.value()));