Merge branch 'feature_20260306_zhaohaipeng_add_recall_videos' of algorithm/recommend-server into master

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

@@ -40,7 +40,6 @@ public abstract class RankService {
         if (2 == param.getRecommendType()) {
             tagDuplicateVideos(param);
             List<Video> rovRecallRank = mergeAndRankRovRecall(param);
-            this.addPushFromVideoRank(rovRecallRank);
             return new RankResult(rovRecallRank);
         }
 
@@ -93,11 +92,8 @@ public abstract class RankService {
 
         List<Video> douHotFlowPoolRank = extractAndSort(param, DouHotFlowPoolRecallStrategy.PUSH_FROM);
 
-        this.addPushFromVideoRank(rovRecallRank);
-
         removeDuplicate(param, rovRecallRank, flowPoolRank, douHotFlowPoolRank);
 
-
         // 融合排序
         return mergeAndSort(param, rovRecallRank, flowPoolRank, douHotFlowPoolRank);
     }
@@ -269,7 +265,7 @@ public abstract class RankService {
         return false;
     }
 
-    private void addPushFromVideoRank(List<Video> rankVideo) {
+    protected void addPushFromVideoRank(List<Video> rankVideo) {
         try {
             Map<String, List<Long>> pushFromVideoRank = new HashMap<>();
             for (Video video : rankVideo) {

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

@@ -79,6 +79,9 @@ public class RankStrategy4RegionMergeModelV536 extends RankStrategy4RegionMergeM
         //-------------------return1 cate2 str------------------
         RecallUtils.extractRecall(mergeWeight.getOrDefault("return1Cate2Str", 5.0).intValue(), param, Return1Cate2StrRecallStrategy.PUSH_FORM, setVideo, rovRecallRank);
 
+        // 记录召回源中的视频
+        this.addPushFromVideoRank(rovRecallRank);
+
         //-------------------排-------------------
         //-------------------序-------------------
         //-------------------逻-------------------

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

@@ -79,6 +79,9 @@ public class RankStrategy4RegionMergeModelV562 extends RankStrategy4RegionMergeM
         //-------------------return1 cate2 str------------------
         RecallUtils.extractRecall(mergeWeight.getOrDefault("return1Cate2Str", 5.0).intValue(), param, Return1Cate2StrRecallStrategy.PUSH_FORM, setVideo, rovRecallRank);
 
+        // 记录召回源中的视频
+        this.addPushFromVideoRank(rovRecallRank);
+
         //-------------------排-------------------
         //-------------------序-------------------
         //-------------------逻-------------------

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

@@ -79,6 +79,9 @@ public class RankStrategy4RegionMergeModelV563 extends RankStrategy4RegionMergeM
         //-------------------return1 cate2 str------------------
         RecallUtils.extractRecall(mergeWeight.getOrDefault("return1Cate2Str", 5.0).intValue(), param, Return1Cate2StrRecallStrategy.PUSH_FORM, setVideo, rovRecallRank);
 
+        // 记录召回源中的视频
+        this.addPushFromVideoRank(rovRecallRank);
+
         //-------------------排-------------------
         //-------------------序-------------------
         //-------------------逻-------------------

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

@@ -79,6 +79,9 @@ public class RankStrategy4RegionMergeModelV564 extends RankStrategy4RegionMergeM
         //-------------------return1 cate2 str------------------
         RecallUtils.extractRecall(mergeWeight.getOrDefault("return1Cate2Str", 5.0).intValue(), param, Return1Cate2StrRecallStrategy.PUSH_FORM, setVideo, rovRecallRank);
 
+        // 记录召回源中的视频
+        this.addPushFromVideoRank(rovRecallRank);
+
         //-------------------排-------------------
         //-------------------序-------------------
         //-------------------逻-------------------

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

@@ -79,6 +79,9 @@ public class RankStrategy4RegionMergeModelV565 extends RankStrategy4RegionMergeM
         //-------------------return1 cate2 str------------------
         RecallUtils.extractRecall(mergeWeight.getOrDefault("return1Cate2Str", 5.0).intValue(), param, Return1Cate2StrRecallStrategy.PUSH_FORM, setVideo, rovRecallRank);
 
+        // 记录召回源中的视频
+        this.addPushFromVideoRank(rovRecallRank);
+
         //-------------------排-------------------
         //-------------------序-------------------
         //-------------------逻-------------------

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

@@ -79,6 +79,9 @@ public class RankStrategy4RegionMergeModelV566 extends RankStrategy4RegionMergeM
         //-------------------return1 cate2 str------------------
         RecallUtils.extractRecall(mergeWeight.getOrDefault("return1Cate2Str", 5.0).intValue(), param, Return1Cate2StrRecallStrategy.PUSH_FORM, setVideo, rovRecallRank);
 
+        // 记录召回源中的视频
+        this.addPushFromVideoRank(rovRecallRank);
+
         //-------------------排-------------------
         //-------------------序-------------------
         //-------------------逻-------------------

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

@@ -79,6 +79,9 @@ public class RankStrategy4RegionMergeModelV567 extends RankStrategy4RegionMergeM
         //-------------------return1 cate2 str------------------
         RecallUtils.extractRecall(mergeWeight.getOrDefault("return1Cate2Str", 5.0).intValue(), param, Return1Cate2StrRecallStrategy.PUSH_FORM, setVideo, rovRecallRank);
 
+        // 记录召回源中的视频
+        this.addPushFromVideoRank(rovRecallRank);
+
         //-------------------排-------------------
         //-------------------序-------------------
         //-------------------逻-------------------

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

@@ -82,6 +82,9 @@ public class RankStrategy4RegionMergeModelV568 extends RankStrategy4RegionMergeM
         //-------------------priori premium rovn------------------
         RecallUtils.extractRecall(mergeWeight.getOrDefault("prioriPremiumRovn", 0.0).intValue(), param, PrioriPremiumRovnRecallStrategy.PUSH_FORM, setVideo, rovRecallRank);
 
+        // 记录召回源中的视频
+        this.addPushFromVideoRank(rovRecallRank);
+
         //-------------------排-------------------
         //-------------------序-------------------
         //-------------------逻-------------------

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

@@ -79,6 +79,9 @@ public class RankStrategy4RegionMergeModelV569 extends RankStrategy4RegionMergeM
         //-------------------return1 cate2 str------------------
         RecallUtils.extractRecall(mergeWeight.getOrDefault("return1Cate2Str", 5.0).intValue(), param, Return1Cate2StrRecallStrategy.PUSH_FORM, setVideo, rovRecallRank);
 
+        // 记录召回源中的视频
+        this.addPushFromVideoRank(rovRecallRank);
+
         //-------------------排-------------------
         //-------------------序-------------------
         //-------------------逻-------------------

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

@@ -79,6 +79,9 @@ public class RankStrategy4RegionMergeModelV839 extends RankStrategy4RegionMergeM
         //-------------------return1 cate2 str------------------
         RecallUtils.extractRecall(mergeWeight.getOrDefault("return1Cate2Str", 5.0).intValue(), param, Return1Cate2StrRecallStrategy.PUSH_FORM, setVideo, rovRecallRank);
 
+        // 记录召回源中的视频
+        this.addPushFromVideoRank(rovRecallRank);
+
         //-------------------排-------------------
         //-------------------序-------------------
         //-------------------逻-------------------

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

@@ -40,6 +40,9 @@ public class RankStrategy4RelevantModelV1 extends RankStrategy4RegionMergeModelB
         // return uv
         RecallUtils.extractRecall(apolloParams.getOrDefault("returnUv", 100d).intValue(), param, HotReturnUvRecallStrategy.PUSH_FROM, setVideo, rovRecallRank);
 
+        // 记录召回源中的视频
+        this.addPushFromVideoRank(rovRecallRank);
+
         // ------------------- 排序 -------------------
         Map<String, String> rtFeatureDumpsMap = dumpsRtFeature(param.getUserRTShareList());