Merge branch 'dev-xym-add-feature' into pre-master

# Conflicts:
#	ad-engine-service/src/main/java/com/tzld/piaoquan/ad/engine/service/score/strategy/RankStrategyBy688.java

ad-engine-service/src/main/java/com/tzld/piaoquan/ad/engine/service/score/strategy/RankStrategyBy688.java

@@ -117,6 +117,10 @@ public class RankStrategyBy688 extends RankStrategyBasic {
         Map<String, String> e1Feature = userFeature.getOrDefault("alg_mid_feature_return_tags", new HashMap<>());
         Map<String, String> e2Feature = userFeature.getOrDefault("alg_mid_feature_share_tags", new HashMap<>());
 
+        Map<String, String> g1Feature = userFeature.getOrDefault("mid_click_video_cate", new HashMap<>());
+        Map<String, String> g2Feature = userFeature.getOrDefault("mid_share_video_cate", new HashMap<>());
+
+
         userFeatureMap.put("brand", scoreParam.getRequestContext().getMachineinfoBrand().equalsIgnoreCase("-1") ?
                 "" : scoreParam.getRequestContext().getMachineinfoBrand().toUpperCase());
         userFeatureMap.put("region", Objects.equals(scoreParam.getRequestContext().getRegion(), "-1") ?
@@ -132,6 +136,12 @@ public class RankStrategyBy688 extends RankStrategyBasic {
         userFeatureMap.put("user_vid_return_tags_7d", e1Feature.getOrDefault("tags_7d", null));
         userFeatureMap.put("user_vid_return_tags_14d", e1Feature.getOrDefault("tags_14d", null));
         userFeatureMap.put("title_split", d3Feature.getOrDefault("title_split", null));
+        userFeatureMap.put("user_vid_share_tags_1d", e2Feature.getOrDefault("tags_1d", null));
+        userFeatureMap.put("user_vid_share_tags_14d", e2Feature.getOrDefault("tags_14d", null));
+        userFeatureMap.put("user_vid_play_cate1_14d", g1Feature.getOrDefault("user_vid_play_cate1_14d", null));
+        userFeatureMap.put("user_vid_play_cate2_14d", g1Feature.getOrDefault("user_vid_play_cate2_14d", null));
+        userFeatureMap.put("user_vid_share_cate1_14d", g2Feature.getOrDefault("user_vid_share_cate1_14d", null));
+        userFeatureMap.put("user_vid_share_cate2_14d", g2Feature.getOrDefault("user_vid_share_cate2_14d", null));
 
         if (request.getAppType() != null) {
             userFeatureMap.put("apptype", String.valueOf(request.getAppType()));
@@ -370,6 +380,19 @@ public class RankStrategyBy688 extends RankStrategyBasic {
             String cpa = b1Feature.get("cpa");
             cidFeatureMap.put("cpa", cpa);
         }
+        if(StringUtils.isNotBlank(b1Feature.get("creative_type"))){
+            cidFeatureMap.put("creative_type", b1Feature.get("creative_type"));
+        }
+        if(StringUtils.isNotBlank(b1Feature.get("creative_hook_embedding"))){
+            cidFeatureMap.put("creative_hook_embedding", b1Feature.get("creative_hook_embedding"));
+        }
+        if(StringUtils.isNotBlank(b1Feature.get("creative_why_embedding"))){
+            cidFeatureMap.put("creative_why_embedding", b1Feature.get("creative_why_embedding"));
+        }
+        if(StringUtils.isNotBlank(b1Feature.get("creative_type"))){
+            cidFeatureMap.put("creative_type", b1Feature.get("creative_type"));
+        }
+
     }
 
     private void handleB2ToB5AndB8ToB9Feature(Map<String, Map<String, String>> c1Feature, Map<String, Map<String, String>> adVerFeature, Map<String, String> cidFeatureMap) {
@@ -749,6 +772,8 @@ public class RankStrategyBy688 extends RankStrategyBasic {
             add("is_first_layer");
             add("title_split");
             add("profession");
+            add("user_vid_share_tags_1d");
+            add("user_vid_share_tags_14d");
         }};
     }