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

ad-engine-commons/src/main/java/com/tzld/piaoquan/ad/engine/commons/param/RecommendRequestParam.java

@@ -22,7 +22,6 @@ public class RecommendRequestParam {
     private String pqtId;
     private List<Map<String, String>> adAbExpArr;
     private String adAbGroup;
-    private Long ts;
 
     private StatisticsLogParam statisticsLog;
 }

ad-engine-commons/src/main/java/com/tzld/piaoquan/ad/engine/commons/score/model/PAIModelV1.java

@@ -42,7 +42,8 @@ public class PAIModelV1 {
     private static final String[] sparseUserStrFeatures = {
             "brand", "region", "city", "cate1", "cate2", "user_cid_click_list", "user_cid_conver_list",
             "user_vid_return_tags_2h", "user_vid_return_tags_1d", "user_vid_return_tags_3d", "user_vid_return_tags_7d",
-            "user_vid_return_tags_14d", "root_source_scene", "root_source_channel", "title_split"
+            "user_vid_return_tags_14d", "root_source_scene", "root_source_channel", "title_split", "user_vid_share_tags_1d",
+            "user_vid_share_tags_14d"
     };
 
     private static final String[] sparseUserLongFeatures = {

ad-engine-commons/src/main/java/com/tzld/piaoquan/ad/engine/commons/util/DateUtils.java

@@ -46,7 +46,7 @@ public final class DateUtils {
     }
 
     public static int getHourQuarter(long timestamp) {
-        Instant instant = Instant.ofEpochMilli(timestamp);
+        Instant instant = Instant.ofEpochSecond(timestamp);
         ZonedDateTime zonedDateTime = instant.atZone(ZoneId.systemDefault());
         int hour = zonedDateTime.getHour();
         int minute = zonedDateTime.getMinute();

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

@@ -57,14 +57,18 @@ public class RankStrategyBy688 extends RankStrategyBasic {
         this.initSparseFeatureNames();
     }
 
-    private static final List<String> notHasChannelScenes = new ArrayList<String>() {{
-
-        add("longArticles");
-        add("fwhhzdyy");
-        add("gzhhzdx");
-        add("WeCom");
-        add("video");
-        add("xcxImport");
+    private static final List<String> hasChannelScenes = new ArrayList<String>() {{
+        add("DaiTou");
+        add("GzhTouLiu");
+        add("daitou");
+        add("dyyjs");
+        add("dyyqw");
+        add("fwhdyy");
+        add("gzhhz");
+        add("gzhhzzx");
+        add("shequn");
+        add("touliu");
+        add("xcxdt");
     }};
 
     @Override
@@ -107,9 +111,12 @@ 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<>());
 
-        userFeatureMap.put("brand", request.getMachineInfo().getBrand().toUpperCase());
-        userFeatureMap.put("region", request.getRegion());
-        userFeatureMap.put("city", request.getCity());
+        userFeatureMap.put("brand", scoreParam.getRequestContext().getMachineinfoBrand().equalsIgnoreCase("-1") ?
+                "" : scoreParam.getRequestContext().getMachineinfoBrand().toUpperCase());
+        userFeatureMap.put("region", Objects.equals(scoreParam.getRequestContext().getRegion(), "-1") ?
+                "" : scoreParam.getRequestContext().getRegion());
+        userFeatureMap.put("city", Objects.equals(scoreParam.getRequestContext().getCity(), "-1") ?
+                "" : scoreParam.getRequestContext().getCity());
         userFeatureMap.put("vid", String.valueOf(request.getVideoId()));
         userFeatureMap.put("cate1", d3Feature.get("merge_first_level_cate"));
         userFeatureMap.put("cate2", d3Feature.get("merge_second_level_cate"));
@@ -119,6 +126,8 @@ 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));
 
         if (request.getAppType() != null) {
             userFeatureMap.put("apptype", String.valueOf(request.getAppType()));
@@ -138,7 +147,7 @@ public class RankStrategyBy688 extends RankStrategyBasic {
         if (StringUtils.isNotEmpty(rootSourceId)) {
             String rootSourceScene = rootSourceId.split("_")[0];
             userFeatureMap.put("root_source_scene", rootSourceScene);
-            if (!notHasChannelScenes.contains(rootSourceScene) && rootSourceId.split("_").length > 1) {
+            if (hasChannelScenes.contains(rootSourceScene) && rootSourceId.split("_").length > 1) {
                 String rootSourceChannel = rootSourceId.split("_")[1];
                 userFeatureMap.put("root_source_channel", rootSourceChannel);
             }
@@ -736,6 +745,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");
         }};
     }