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

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

@@ -16,5 +16,4 @@ public class RankVideoInfo {
 
     private Map<String, Double> scoresMap = new HashMap<>();
 
-    public Map<String, Float> allFeatureMap = new HashMap<>();
 }

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

@@ -223,6 +223,7 @@ public class RankStrategy4RegionMergeModelV536 extends RankStrategy4RegionMergeM
             video.setScore(score);
             video.setSortScore(score);
             video.setScoresMap(item.getScoresMap());
+            video.setAllFeatureMap(item.getAllFeatureMap());
 
             String mergeCate2 = ExtractVideoMergeCate.parseMergeCate2(String.valueOf(item.getVideoId()), videoBaseInfoMap);
             if (StringUtils.isNotBlank(mergeCate2)) {
@@ -253,7 +254,6 @@ 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());
-                video.getRankVideoInfoMap().get(video.getVideoId()).setAllFeatureMap(item.getAllFeatureMap());
             }
             result.add(video);
         }

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

@@ -223,6 +223,7 @@ public class RankStrategy4RegionMergeModelV562 extends RankStrategy4RegionMergeM
             video.setScore(score);
             video.setSortScore(score);
             video.setScoresMap(item.getScoresMap());
+            video.setAllFeatureMap(item.getAllFeatureMap());
 
             String mergeCate2 = ExtractVideoMergeCate.parseMergeCate2(String.valueOf(item.getVideoId()), videoBaseInfoMap);
             if (StringUtils.isNotBlank(mergeCate2)) {
@@ -253,7 +254,6 @@ 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());
-                video.getRankVideoInfoMap().get(video.getVideoId()).setAllFeatureMap(item.getAllFeatureMap());
             }
             result.add(video);
         }

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

@@ -198,6 +198,7 @@ public class RankStrategy4RegionMergeModelV563 extends RankStrategy4RegionMergeM
             video.setScore(score);
             video.setSortScore(score);
             video.setScoresMap(item.getScoresMap());
+            video.setAllFeatureMap(item.getAllFeatureMap());
 
             String mergeCate2 = ExtractVideoMergeCate.parseMergeCate2(String.valueOf(item.getVideoId()), videoBaseInfoMap);
             if (StringUtils.isNotBlank(mergeCate2)) {
@@ -228,7 +229,6 @@ 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());
-                video.getRankVideoInfoMap().get(video.getVideoId()).setAllFeatureMap(item.getAllFeatureMap());
             }
             result.add(video);
         }

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

@@ -161,7 +161,7 @@ public class RankStrategy4RegionMergeModelV564 extends RankStrategy4RegionMergeM
             video.setScore(score);
             video.setSortScore(score);
             video.setScoresMap(item.getScoresMap());
-            // video.setAllFeatureMap(item.getAllFeatureMap());
+            video.setAllFeatureMap(item.getAllFeatureMap());
 
             String mergeCate2 = ExtractVideoMergeCate.parseMergeCate2(String.valueOf(item.getVideoId()), videoBaseInfoMap);
             if (StringUtils.isNotBlank(mergeCate2)) {
@@ -192,7 +192,6 @@ 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());
-                video.getRankVideoInfoMap().get(video.getVideoId()).setAllFeatureMap(item.getAllFeatureMap());
             }
             result.add(video);
         }

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

@@ -158,7 +158,7 @@ public class RankStrategy4RegionMergeModelV565 extends RankStrategy4RegionMergeM
             video.setScore(score);
             video.setSortScore(score);
             video.setScoresMap(item.getScoresMap());
-            // video.setAllFeatureMap(item.getAllFeatureMap());
+            video.setAllFeatureMap(item.getAllFeatureMap());
 
             String mergeCate2 = ExtractVideoMergeCate.parseMergeCate2(String.valueOf(item.getVideoId()), videoBaseInfoMap);
             if (StringUtils.isNotBlank(mergeCate2)) {
@@ -189,7 +189,6 @@ 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());
-                video.getRankVideoInfoMap().get(video.getVideoId()).setAllFeatureMap(item.getAllFeatureMap());
             }
             result.add(video);
         }

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

@@ -223,6 +223,7 @@ public class RankStrategy4RegionMergeModelV566 extends RankStrategy4RegionMergeM
             video.setScore(score);
             video.setSortScore(score);
             video.setScoresMap(item.getScoresMap());
+            video.setAllFeatureMap(item.getAllFeatureMap());
 
             String mergeCate2 = ExtractVideoMergeCate.parseMergeCate2(String.valueOf(item.getVideoId()), videoBaseInfoMap);
             if (StringUtils.isNotBlank(mergeCate2)) {
@@ -253,7 +254,6 @@ 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());
-                video.getRankVideoInfoMap().get(video.getVideoId()).setAllFeatureMap(item.getAllFeatureMap());
             }
             result.add(video);
         }

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

@@ -158,7 +158,7 @@ public class RankStrategy4RegionMergeModelV567 extends RankStrategy4RegionMergeM
             video.setScore(score);
             video.setSortScore(score);
             video.setScoresMap(item.getScoresMap());
-            // video.setAllFeatureMap(item.getAllFeatureMap());
+            video.setAllFeatureMap(item.getAllFeatureMap());
 
             String mergeCate2 = ExtractVideoMergeCate.parseMergeCate2(String.valueOf(item.getVideoId()), videoBaseInfoMap);
             if (StringUtils.isNotBlank(mergeCate2)) {
@@ -189,7 +189,6 @@ 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());
-                video.getRankVideoInfoMap().get(video.getVideoId()).setAllFeatureMap(item.getAllFeatureMap());
             }
             result.add(video);
         }

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

@@ -227,6 +227,7 @@ public class RankStrategy4RegionMergeModelV568 extends RankStrategy4RegionMergeM
             video.setSortScore(score);
             video.setScoresMap(item.getScoresMap());
             video.setAllFeatureMap(item.getAllFeatureMap());
+            video.setAllFeatureMap(item.getAllFeatureMap());
 
             String mergeCate2 = ExtractVideoMergeCate.parseMergeCate2(String.valueOf(item.getVideoId()), videoBaseInfoMap);
             if (StringUtils.isNotBlank(mergeCate2)) {
@@ -257,7 +258,6 @@ 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());
-                video.getRankVideoInfoMap().get(video.getVideoId()).setAllFeatureMap(item.getAllFeatureMap());
             }
             result.add(video);
         }

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

@@ -222,6 +222,7 @@ public class RankStrategy4RegionMergeModelV569 extends RankStrategy4RegionMergeM
             video.setScore(score);
             video.setSortScore(score);
             video.setScoresMap(item.getScoresMap());
+            video.setAllFeatureMap(item.getAllFeatureMap());
 
             String mergeCate2 = ExtractVideoMergeCate.parseMergeCate2(String.valueOf(item.getVideoId()), videoBaseInfoMap);
             if (StringUtils.isNotBlank(mergeCate2)) {
@@ -252,7 +253,6 @@ 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());
-                video.getRankVideoInfoMap().get(video.getVideoId()).setAllFeatureMap(item.getAllFeatureMap());
             }
             result.add(video);
         }

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

@@ -200,6 +200,7 @@ public class RankStrategy4RegionMergeModelV839 extends RankStrategy4RegionMergeM
             video.setScore(score);
             video.setSortScore(score);
             video.setScoresMap(item.getScoresMap());
+            video.setAllFeatureMap(item.getAllFeatureMap());
 
             String mergeCate2 = ExtractVideoMergeCate.parseMergeCate2(String.valueOf(item.getVideoId()), videoBaseInfoMap);
             if (StringUtils.isNotBlank(mergeCate2)) {
@@ -230,7 +231,6 @@ 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());
-                video.getRankVideoInfoMap().get(video.getVideoId()).setAllFeatureMap(item.getAllFeatureMap());
             }
             result.add(video);
         }

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

@@ -104,6 +104,8 @@ public class RankStrategy4RelevantModelV1 extends RankStrategy4RegionMergeModelB
             video.setScore(score);
             video.setSortScore(score);
             video.setScoresMap(item.getScoresMap());
+            video.setAllFeatureMap(item.getAllFeatureMap());
+
             if (MapUtils.isNotEmpty(videoBaseInfoMap) && MapUtils.isNotEmpty(videoBaseInfoMap.get(item.getVideoId() + ""))) {
                 video.getMetaFeatureMap().putAll(videoBaseInfoMap.get(item.getVideoId() + ""));
             }
@@ -116,7 +118,6 @@ 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());
-                video.getRankVideoInfoMap().get(video.getVideoId()).setAllFeatureMap(item.getAllFeatureMap());
             }
             result.add(video);
         }