Merge remote-tracking branch 'origin/feature_20240516_supeng_supply_ab_v2' into pre-master

recommend-server-service/src/main/java/com/tzld/piaoquan/recommend/server/service/flowpool/FlowPoolConstants.java

@@ -10,7 +10,6 @@ public class FlowPoolConstants {
 
     public static final String PUSH_FORM = "flow_pool";
     public static final String QUICK_PUSH_FORM = "quick_flow_pool";
-    public static final String SUPPLY_PUSH_FORM = "supply_flow_pool";
 
     public static final String KEY_WITH_LEVEL_FORMAT = "flow:pool:level:item:%s:%s";
     public static final String KEY_WITH_LEVEL_SUPPLY_FORMAT = "flow:pool:level:item:supply:%s:%s";

recommend-server-service/src/main/java/com/tzld/piaoquan/recommend/server/service/rank/RankService.java

@@ -194,7 +194,6 @@ public class RankService {
                 Collections.sort(rovRecallRank, Comparator.comparingDouble(o -> -o.getSortScore()));
             }
         } else {
-            rovRecallRank.addAll(extractAndSort(param, RegionRealtimeRecallStrategyV1.PUSH_FORM));
             rovRecallRank.addAll(extractAndSort(param, SimHotVideoRecallStrategy.PUSH_FORM));
             rovRecallRank.addAll(extractAndSort(param, ReturnVideoRecallStrategy.PUSH_FORM));
             removeDuplicate(rovRecallRank);
@@ -293,14 +292,7 @@ public class RankService {
         if (CollectionUtils.isNotEmpty(quickFlowPoolVideos)) {
             return quickFlowPoolVideos;
         } else {
-//            return extractAndSort(param, FlowPoolConstants.PUSH_FORM);
-            //供给流量池 新增pushForm；由于供给流量池占比小，先判断 正常流量池
-            List<Video> flowPoolVideos = extractAndSort(param, FlowPoolConstants.PUSH_FORM);
-            if (CollectionUtils.isNotEmpty(quickFlowPoolVideos)) {
-                return flowPoolVideos;
-            } else {
-                return extractAndSort(param, FlowPoolConstants.SUPPLY_PUSH_FORM);
-            }
+            return extractAndSort(param, FlowPoolConstants.PUSH_FORM);
         }
     }
 

recommend-server-service/src/main/java/com/tzld/piaoquan/recommend/server/service/recall/RecallService.java

@@ -180,7 +180,6 @@ public class RecallService implements ApplicationContextAware {
                 strategies.add(strategyMap.get(TitleTagRecallStrategyV1.class.getSimpleName()));
                 strategies.addAll(getRegionRecallStrategy(param));
             default:
-                strategies.add(strategyMap.get(RegionRealtimeRecallStrategyV1.class.getSimpleName()));
                 strategies.addAll(getRegionRecallStrategy(param));
         }
         // 命中用户黑名单不走流量池
@@ -326,7 +325,6 @@ public class RecallService implements ApplicationContextAware {
             default:
                 strategies.add(strategyMap.get(SimHotVideoRecallStrategy.class.getSimpleName()));
                 strategies.add(strategyMap.get(ReturnVideoRecallStrategy.class.getSimpleName()));
-                strategies.add(strategyMap.get(FestivalRecallStrategyV1.class.getSimpleName()));
                 break;
         }
 

recommend-server-service/src/main/java/com/tzld/piaoquan/recommend/server/service/recall/strategy/FlowPoolWithLevelSupplyRecallStrategy.java

@@ -93,6 +93,6 @@ public class FlowPoolWithLevelSupplyRecallStrategy extends AbstractFlowPoolWithL
 
     @Override
     public String pushFrom() {
-        return FlowPoolConstants.SUPPLY_PUSH_FORM;
+        return FlowPoolConstants.PUSH_FORM;
     }
 }