Merge branch 'dev-xym-add-category' of algorithm/ad-engine into master

ad-engine-commons/src/main/java/com/tzld/piaoquan/ad/engine/commons/dto/AdPlatformCreativeDTO.java

@@ -52,4 +52,6 @@ public class AdPlatformCreativeDTO {
     private String customer;
 
     private Long customerId;
+
+    private String categoryName;
 }

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

@@ -43,7 +43,7 @@ public class PAIModelV1 {
             "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_share_tags_1d",
             "user_vid_share_tags_14d", "user_vid_return_cate1_14d", "user_vid_return_cate2_14d", "user_vid_share_cate1_14d",
-            "user_vid_share_cate2_14d", "user_conver_ad_class", "user_layer_class"
+            "user_vid_share_cate2_14d", "user_conver_ad_class"
     };
 
     private static final String[] sparseUserLongFeatures = {
@@ -65,7 +65,7 @@ public class PAIModelV1 {
     };
 
     private static final String[] sparseAdStrFeatures = {
-            "profession"
+            "profession", "category_name"
     };
 
     private final String[] userFeatures = {

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

@@ -43,7 +43,7 @@ public class PAIModelV2 {
             "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_share_tags_1d",
             "user_vid_share_tags_14d", "user_vid_return_cate1_14d", "user_vid_return_cate2_14d", "user_vid_share_cate1_14d",
-            "user_vid_share_cate2_14d", "user_conver_ad_class", "user_layer_class"
+            "user_vid_share_cate2_14d", "user_conver_ad_class"
     };
 
     private static final String[] sparseUserLongFeatures = {
@@ -65,7 +65,7 @@ public class PAIModelV2 {
     };
 
     private static final String[] sparseAdStrFeatures = {
-            "profession"
+            "profession", "category_name"
     };
 
     private final String[] userFeatures = {

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

@@ -842,6 +842,7 @@ public abstract class RankStrategyBasic implements RankStrategy {
             reqFeature.put("adid", String.valueOf(adPlatformCreativeDTO.getAdId()));
             reqFeature.put("adverid", String.valueOf(adPlatformCreativeDTO.getAdVerId()));
             reqFeature.put("profession", adPlatformCreativeDTO.getProfession());
+            reqFeature.put("category_name", adPlatformCreativeDTO.getCategoryName());
         }
         adRankItem.getMetaFeatureMap().put("reqFeature", reqFeature);
         adRankItem.getMetaFeatureMap().put("sceneFeature", sceneFeatureMap);

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

@@ -145,8 +145,6 @@ public class RankStrategyBy683 extends RankStrategyBasic {
         userFeatureMap.put("user_vid_share_cate1_14d", g2Feature.getOrDefault("cate1_14d", null));
         userFeatureMap.put("user_vid_share_cate2_14d", g2Feature.getOrDefault("cate2_14d", null));
 
-        userFeatureMap.put("user_layer_class", reqFeature.getOrDefault("user_layer_class", null));
-
         Map<String, String> sceneFeatureMap = this.handleSceneFeature(ts);
         long time1 = System.currentTimeMillis();
 
@@ -202,6 +200,7 @@ public class RankStrategyBy683 extends RankStrategyBasic {
                     cidFeatureMap.put("adid", dto.getAdId() != null ? String.valueOf(dto.getAdId()) : "");
                     cidFeatureMap.put("adverid", dto.getAdVerId() != null ? dto.getAdVerId() : "");
                     cidFeatureMap.put("profession", dto.getProfession() != null ? dto.getProfession() : "");
+                    cidFeatureMap.put("category_name", dto.getCategoryName() != null ? dto.getCategoryName() : "");
                     //DNN模型没训练过的cid才不传入广告相关的稀疏特征
                     if (CollectionUtils.isNotEmpty(DnnCidDataHelper.getCidSetV2()) && !DnnCidDataHelper.getCidSetV2().contains(adRankItem.getAdId())) {
                         cidFeatureMap.put("cid", "");
@@ -842,7 +841,6 @@ public class RankStrategyBy683 extends RankStrategyBasic {
             add("user_vid_share_cate1_14d");
             add("user_vid_share_cate2_14d");
             add("user_has_conver_1y");
-            add("user_conver_ad_class");
             add("user_adverid_view_3d");
             add("user_adverid_click_3d");
             add("user_adverid_conver_3d");
@@ -861,7 +859,8 @@ public class RankStrategyBy683 extends RankStrategyBasic {
             add("user_skuid_view_30d");
             add("user_skuid_click_30d");
             add("user_skuid_conver_30d");
-            add("user_layer_class");
+            add("user_conver_ad_class");
+            add("category_name");
         }};
     }
 

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

@@ -145,8 +145,6 @@ public class RankStrategyBy688 extends RankStrategyBasic {
         userFeatureMap.put("user_vid_share_cate1_14d", g2Feature.getOrDefault("cate1_14d", null));
         userFeatureMap.put("user_vid_share_cate2_14d", g2Feature.getOrDefault("cate2_14d", null));
 
-        userFeatureMap.put("user_layer_class", reqFeature.getOrDefault("user_layer_class", null));
-
         Map<String, String> sceneFeatureMap = this.handleSceneFeature(ts);
         long time1 = System.currentTimeMillis();
 
@@ -202,6 +200,7 @@ public class RankStrategyBy688 extends RankStrategyBasic {
                     cidFeatureMap.put("adid", dto.getAdId() != null ? String.valueOf(dto.getAdId()) : "");
                     cidFeatureMap.put("adverid", dto.getAdVerId() != null ? dto.getAdVerId() : "");
                     cidFeatureMap.put("profession", dto.getProfession() != null ? dto.getProfession() : "");
+                    cidFeatureMap.put("category_name", dto.getCategoryName() != null ? dto.getCategoryName() : "");
                     //DNN模型没训练过的cid才不传入广告相关的稀疏特征
                     if (CollectionUtils.isNotEmpty(DnnCidDataHelper.getCidSet()) && !DnnCidDataHelper.getCidSet().contains(adRankItem.getAdId())) {
                         cidFeatureMap.put("cid", "");
@@ -852,7 +851,6 @@ public class RankStrategyBy688 extends RankStrategyBasic {
             add("user_vid_share_cate1_14d");
             add("user_vid_share_cate2_14d");
             add("user_has_conver_1y");
-            add("user_conver_ad_class");
             add("user_adverid_view_3d");
             add("user_adverid_click_3d");
             add("user_adverid_conver_3d");
@@ -871,7 +869,8 @@ public class RankStrategyBy688 extends RankStrategyBasic {
             add("user_skuid_view_30d");
             add("user_skuid_click_30d");
             add("user_skuid_conver_30d");
-            add("user_layer_class");
+            add("user_conver_ad_class");
+            add("category_name");
         }};
     }