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/Video.java

@@ -42,7 +42,7 @@ public class Video {
     public Map<Long, RankVideoInfo> rankVideoInfoMap = new LinkedHashMap<>();
 
     // 处理后，传给模型的特征
-    public Map<String, String> allFeatureMap = new HashMap<>();
+    public Map<String, Float> allFeatureMap = new HashMap<>();
     // 原始特征
     public Map<String, Map<String, String>> metaFeatureMap = new HashMap<>();
 

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

@@ -100,6 +100,9 @@ public class RecommendService {
     @ApolloJsonValue("${testing.risk.city:[]}")
     private Set<String> testingRiskCity;
 
+    @ApolloJsonValue("${log.upload.field.switch:{}}")
+    private Map<String, String> logUploadFieldSwitch;
+
     public static final String channelGroupPrefix = "alg_recsys_user_channel_group";
     /**
      * wx_user_info 表信息
@@ -262,9 +265,14 @@ public class RecommendService {
                 map.put("scoreStr", String.valueOf(v.getScoreStr()));
                 map.put("score", String.valueOf(v.getScore()));
                 map.put("scoresMap", JSONUtils.toJson(v.getScoresMap()));
-                map.put("allFeatureMap", JSONUtils.toJson(v.getAllFeatureMap()));
                 map.put("metaFeatureMap", JSONUtils.toJson(v.getMetaFeatureMap()));
 
+                if (MapUtils.isNotEmpty(logUploadFieldSwitch) && StringUtils.equals("1", logUploadFieldSwitch.getOrDefault("allFeatureMap", "0"))) {
+                    map.put("allFeatureMap", JSONUtils.toJson(Collections.emptyMap()));
+                } else {
+                    map.put("allFeatureMap", JSONUtils.toJson(v.getAllFeatureMap()));
+                }
+
                 map.put("pushFromRank", JSONUtils.toJson(v.getPushFromRank()));
                 map.put("pushFromRankVideo", JSONUtils.toJson(v.getPushFromRankVideo()));
                 map.put("abExpCode", JSONUtils.toJson(param.getAbExpCodes()));
@@ -287,7 +295,9 @@ public class RecommendService {
                 map.put("rootSessionId", request.getRootSessionId());
 
                 JSONObject extJson = new JSONObject();
-                extJson.put("rankVideoInfoMap", v.getRankVideoInfoMap());
+                if (MapUtils.isEmpty(logUploadFieldSwitch) || StringUtils.equals("1", logUploadFieldSwitch.get("ext"))) {
+                    extJson.put("rankVideoInfoMap", v.getRankVideoInfoMap());
+                }
                 map.put("ext", JSONUtils.toJson(extJson));
 
                 return map;

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

@@ -226,7 +226,7 @@ public class RankStrategy4RegionMergeModelV568 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)) {