Merge branch 'dev_v1.0'

ad-engine-commons/src/main/java/com/tzld/piaoquan/ad/engine/commons/enums/VlogAdFeatureGroup.java

@@ -21,6 +21,10 @@ public enum VlogAdFeatureGroup {
     ADVERID,
     CAMPAIGIN,
 
+    //City
+    CREATIVE_AND_CITY,
+    ADVERID_AND_CITY,
+
 
     USER_1DAY_EXP,
     USER_1DAY_CLICK,

ad-engine-commons/src/main/java/com/tzld/piaoquan/ad/engine/commons/score/feature/VlogAdCtrLRFeatureExtractor.java

@@ -135,22 +135,22 @@ public class VlogAdCtrLRFeatureExtractor extends LRBytesFeatureExtractorBase {
         makeFea(VlogAdFeatureGroup.ADVERID_1DAY_CVR, item.getAdvertiser_day1_cnt_features().get("cvr"));
 
         // 3day features
-        makeFea(VlogAdFeatureGroup.ADVERID_3DAY_EXP, item.getCreative_day3_cnt_features().get("view"));
-        makeFea(VlogAdFeatureGroup.ADVERID_3DAY_CLICK, item.getCreative_day3_cnt_features().get("click"));
-        makeFea(VlogAdFeatureGroup.ADVERID_3DAY_CTR, item.getCreative_day3_cnt_features().get("ctr"));
-        makeFea(VlogAdFeatureGroup.ADVERID_3DAY_CVR, item.getCreative_day3_cnt_features().get("cvr"));
+        makeFea(VlogAdFeatureGroup.ADVERID_3DAY_EXP, item.getAdvertiser_day3_cnt_features().get("view"));
+        makeFea(VlogAdFeatureGroup.ADVERID_3DAY_CLICK, item.getAdvertiser_day3_cnt_features().get("click"));
+        makeFea(VlogAdFeatureGroup.ADVERID_3DAY_CTR, item.getAdvertiser_day3_cnt_features().get("ctr"));
+        makeFea(VlogAdFeatureGroup.ADVERID_3DAY_CVR, item.getAdvertiser_day3_cnt_features().get("cvr"));
 
         // 7day features
-        makeFea(VlogAdFeatureGroup.ADVERID_7DAY_EXP, item.getCreative_day7_cnt_features().get("view"));
-        makeFea(VlogAdFeatureGroup.ADVERID_7DAY_CLICK, item.getCreative_day7_cnt_features().get("click"));
-        makeFea(VlogAdFeatureGroup.ADVERID_7DAY_CTR, item.getCreative_day7_cnt_features().get("ctr"));
-        makeFea(VlogAdFeatureGroup.ADVERID_7DAY_CVR, item.getCreative_day7_cnt_features().get("cvr"));
+        makeFea(VlogAdFeatureGroup.ADVERID_7DAY_EXP, item.getAdvertiser_day7_cnt_features().get("view"));
+        makeFea(VlogAdFeatureGroup.ADVERID_7DAY_CLICK, item.getAdvertiser_day7_cnt_features().get("click"));
+        makeFea(VlogAdFeatureGroup.ADVERID_7DAY_CTR, item.getAdvertiser_day7_cnt_features().get("ctr"));
+        makeFea(VlogAdFeatureGroup.ADVERID_7DAY_CVR, item.getAdvertiser_day7_cnt_features().get("cvr"));
 
         // 3month features
-        makeFea(VlogAdFeatureGroup.ADVERID_3MONTH_EXP, item.getCreative_month3_cnt_features().get("view"));
-        makeFea(VlogAdFeatureGroup.ADVERID_3MONTH_CLICK, item.getCreative_month3_cnt_features().get("click"));
-        makeFea(VlogAdFeatureGroup.ADVERID_3MONTH_CTR, item.getCreative_month3_cnt_features().get("ctr"));
-        makeFea(VlogAdFeatureGroup.ADVERID_3MONTH_CVR, item.getCreative_month3_cnt_features().get("cvr"));
+        makeFea(VlogAdFeatureGroup.ADVERID_3MONTH_EXP, item.getAdvertiser_month3_cnt_features().get("view"));
+        makeFea(VlogAdFeatureGroup.ADVERID_3MONTH_CLICK, item.getAdvertiser_month3_cnt_features().get("click"));
+        makeFea(VlogAdFeatureGroup.ADVERID_3MONTH_CTR, item.getAdvertiser_month3_cnt_features().get("ctr"));
+        makeFea(VlogAdFeatureGroup.ADVERID_3MONTH_CVR, item.getAdvertiser_month3_cnt_features().get("cvr"));
 
 
     }
@@ -162,6 +162,11 @@ public class VlogAdCtrLRFeatureExtractor extends LRBytesFeatureExtractorBase {
         makeFea(VlogAdFeatureGroup.ADVERID_AND_HOUR, itemBytesFeature.getAdvertiserId(), requestContextByte.getHour());
         makeFea(VlogAdFeatureGroup.CREATIVE_AND_REGION, itemBytesFeature.getCreative(), requestContextByte.getRegion());
         makeFea(VlogAdFeatureGroup.ADVERID_AND_REGION, itemBytesFeature.getAdvertiserId(), requestContextByte.getRegion());
+
+        //add city feature
+        makeFea(VlogAdFeatureGroup.CREATIVE_AND_CITY, itemBytesFeature.getCreative(), requestContextByte.getCity());
+        makeFea(VlogAdFeatureGroup.ADVERID_AND_CITY, itemBytesFeature.getAdvertiserId(), requestContextByte.getCity());
+
         makeFea(VlogAdFeatureGroup.CREATIVE_AND_MACHINEINFO_MODEL, itemBytesFeature.getCreative(), requestContextByte.getMachineinfo_model());
         makeFea(VlogAdFeatureGroup.ADVERID_AND_MACHINEINFO_MODEL, itemBytesFeature.getAdvertiserId(), requestContextByte.getMachineinfo_model());
         makeFea(VlogAdFeatureGroup.CREATIVE_AND_MACHINEINFO_BRAND, itemBytesFeature.getCreative(), requestContextByte.getMachineinfo_brand());