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

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

@@ -10,6 +10,7 @@ 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

@@ -293,7 +293,14 @@ public class RankService {
         if (CollectionUtils.isNotEmpty(quickFlowPoolVideos)) {
             return quickFlowPoolVideos;
         } else {
-            return extractAndSort(param, FlowPoolConstants.PUSH_FORM);
+//            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);
+            }
         }
     }
 

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.PUSH_FORM;
+        return FlowPoolConstants.SUPPLY_PUSH_FORM;
     }
 }