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

.gitignore

@@ -53,4 +53,5 @@ logs/*
 xgboost
 recommend-server/logs
 LOG_PATH_IS_UNDEFINED
-datalog
+datalog
+word2vec.bin

recommend-server-service/src/main/java/com/tzld/piaoquan/recommend/server/model/RankVideoInfo.java

@@ -2,6 +2,9 @@ package com.tzld.piaoquan.recommend.server.model;
 
 import lombok.Data;
 
+import java.util.HashMap;
+import java.util.Map;
+
 @Data
 public class RankVideoInfo {
 
@@ -11,4 +14,5 @@ public class RankVideoInfo {
 
     private double score;
 
+    private Map<String, Double> scoresMap = new HashMap<>();
 }

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

@@ -252,6 +252,7 @@ public class RankStrategy4RegionMergeModelV536 extends RankStrategy4RegionMergeM
             }
             if (Objects.nonNull(video.getRankVideoInfoMap()) && video.getRankVideoInfoMap().containsKey(video.getVideoId())){
                 video.getRankVideoInfoMap().get(video.getVideoId()).setScore(score);
+                video.getRankVideoInfoMap().get(video.getVideoId()).setScoresMap(video.getScoresMap());
             }
             result.add(video);
         }

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

@@ -252,6 +252,7 @@ public class RankStrategy4RegionMergeModelV562 extends RankStrategy4RegionMergeM
             }
             if (Objects.nonNull(video.getRankVideoInfoMap()) && video.getRankVideoInfoMap().containsKey(video.getVideoId())){
                 video.getRankVideoInfoMap().get(video.getVideoId()).setScore(score);
+                video.getRankVideoInfoMap().get(video.getVideoId()).setScoresMap(video.getScoresMap());
             }
             result.add(video);
         }

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

@@ -227,6 +227,7 @@ public class RankStrategy4RegionMergeModelV563 extends RankStrategy4RegionMergeM
             }
             if (Objects.nonNull(video.getRankVideoInfoMap()) && video.getRankVideoInfoMap().containsKey(video.getVideoId())){
                 video.getRankVideoInfoMap().get(video.getVideoId()).setScore(score);
+                video.getRankVideoInfoMap().get(video.getVideoId()).setScoresMap(video.getScoresMap());
             }
             result.add(video);
         }

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

@@ -191,6 +191,7 @@ public class RankStrategy4RegionMergeModelV564 extends RankStrategy4RegionMergeM
             }
             if (Objects.nonNull(video.getRankVideoInfoMap()) && video.getRankVideoInfoMap().containsKey(video.getVideoId())){
                 video.getRankVideoInfoMap().get(video.getVideoId()).setScore(score);
+                video.getRankVideoInfoMap().get(video.getVideoId()).setScoresMap(video.getScoresMap());
             }
             result.add(video);
         }

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

@@ -188,6 +188,7 @@ public class RankStrategy4RegionMergeModelV565 extends RankStrategy4RegionMergeM
             }
             if (Objects.nonNull(video.getRankVideoInfoMap()) && video.getRankVideoInfoMap().containsKey(video.getVideoId())){
                 video.getRankVideoInfoMap().get(video.getVideoId()).setScore(score);
+                video.getRankVideoInfoMap().get(video.getVideoId()).setScoresMap(video.getScoresMap());
             }
             result.add(video);
         }

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

@@ -252,6 +252,7 @@ public class RankStrategy4RegionMergeModelV566 extends RankStrategy4RegionMergeM
             }
             if (Objects.nonNull(video.getRankVideoInfoMap()) && video.getRankVideoInfoMap().containsKey(video.getVideoId())){
                 video.getRankVideoInfoMap().get(video.getVideoId()).setScore(score);
+                video.getRankVideoInfoMap().get(video.getVideoId()).setScoresMap(video.getScoresMap());
             }
             result.add(video);
         }

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

@@ -188,6 +188,7 @@ public class RankStrategy4RegionMergeModelV567 extends RankStrategy4RegionMergeM
             }
             if (Objects.nonNull(video.getRankVideoInfoMap()) && video.getRankVideoInfoMap().containsKey(video.getVideoId())){
                 video.getRankVideoInfoMap().get(video.getVideoId()).setScore(score);
+                video.getRankVideoInfoMap().get(video.getVideoId()).setScoresMap(video.getScoresMap());
             }
             result.add(video);
         }

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

@@ -256,6 +256,7 @@ public class RankStrategy4RegionMergeModelV568 extends RankStrategy4RegionMergeM
             }
             if (Objects.nonNull(video.getRankVideoInfoMap()) && video.getRankVideoInfoMap().containsKey(video.getVideoId())){
                 video.getRankVideoInfoMap().get(video.getVideoId()).setScore(score);
+                video.getRankVideoInfoMap().get(video.getVideoId()).setScoresMap(video.getScoresMap());
             }
             result.add(video);
         }

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

@@ -251,6 +251,7 @@ public class RankStrategy4RegionMergeModelV569 extends RankStrategy4RegionMergeM
             }
             if (Objects.nonNull(video.getRankVideoInfoMap()) && video.getRankVideoInfoMap().containsKey(video.getVideoId())){
                 video.getRankVideoInfoMap().get(video.getVideoId()).setScore(score);
+                video.getRankVideoInfoMap().get(video.getVideoId()).setScoresMap(video.getScoresMap());
             }
             result.add(video);
         }

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

@@ -227,6 +227,7 @@ public class RankStrategy4RegionMergeModelV839 extends RankStrategy4RegionMergeM
             }
             if (Objects.nonNull(video.getRankVideoInfoMap()) && video.getRankVideoInfoMap().containsKey(video.getVideoId())){
                 video.getRankVideoInfoMap().get(video.getVideoId()).setScore(score);
+                video.getRankVideoInfoMap().get(video.getVideoId()).setScoresMap(video.getScoresMap());
             }
             result.add(video);
         }

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

@@ -115,6 +115,7 @@ public class RankStrategy4RelevantModelV1 extends RankStrategy4RegionMergeModelB
             }
             if (Objects.nonNull(video.getRankVideoInfoMap()) && video.getRankVideoInfoMap().containsKey(video.getVideoId())){
                 video.getRankVideoInfoMap().get(video.getVideoId()).setScore(score);
+                video.getRankVideoInfoMap().get(video.getVideoId()).setScoresMap(video.getScoresMap());
             }
             result.add(video);
         }