add cross feature

ad-engine-commons/src/main/java/com/tzld/piaoquan/ad/engine/commons/base/AdItemFeature.java

@@ -45,25 +45,49 @@ public class AdItemFeature {
 
     // adid 计划维度统计信息
     // 当天统计量信息
+    @Setter
+    @NotNull
     private AdActionFeature day1_cnt_features = new AdActionFeature();
     // 3天内统计量
+    @Setter
+    @NotNull
     private AdActionFeature day3_cnt_features = new AdActionFeature();
     // 7天内统计量
+    @Setter
+    @NotNull
     private AdActionFeature day7_cnt_features = new AdActionFeature();
     // 3个月统计量
+    @Setter
+    @NotNull
     private AdActionFeature month3_cnt_features = new AdActionFeature();
 
 
     // 创意维度统计信息
+    @Setter
+    @NotNull
     private AdActionFeature creative_1day_cnt_features = new AdActionFeature();
+    @Setter
+    @NotNull
     private AdActionFeature creative_3day_cnt_features = new AdActionFeature();
+    @Setter
+    @NotNull
     private AdActionFeature creative_7day_cnt_features = new AdActionFeature();
+    @Setter
+    @NotNull
     private AdActionFeature creative_3month_cnt_features = new AdActionFeature();
 
     // 广告主维度统计信息
+    @Setter
+    @NotNull
     private AdActionFeature advertiser_1day_cnt_features = new AdActionFeature();
+    @Setter
+    @NotNull
     private AdActionFeature advertiser_3day_cnt_features = new AdActionFeature();
+    @Setter
+    @NotNull
     private AdActionFeature advertiser_7day_cnt_features = new AdActionFeature();
+    @Setter
+    @NotNull
     private AdActionFeature advertiser_3month_cnt_features = new AdActionFeature();
 
 

ad-engine-commons/src/main/java/com/tzld/piaoquan/ad/engine/commons/base/AdRequestContext.java

@@ -22,10 +22,6 @@ public class AdRequestContext {
     private String region="-1";
     private String city="-1";
 
-    // video信息
-//    private String headVideoId;
-//    private String PageSource;
-
     // position 信息
     private String ownAdPositionId;
 

ad-engine-commons/src/main/java/com/tzld/piaoquan/ad/engine/commons/base/AdRequestContextBytesFeature.java

@@ -18,13 +18,6 @@ public class AdRequestContextBytesFeature {
     private final byte[] region;
     private final byte[] city;
 
-    // position 等信息
-    // private final byte[] headVideoId;
-    // private final byte[] pageSource;
-
-    // position 信息
-    // private final byte[] ownAdPositionId;
-
 
     public AdRequestContextBytesFeature(AdRequestContext requestContext) {
         apptype = requestContext.getApptype().getBytes();

ad-engine-commons/src/main/java/com/tzld/piaoquan/ad/engine/commons/base/UserAdFeature.java

@@ -21,6 +21,8 @@ public class UserAdFeature {
     private String machineinfo_system = "0";
     private String machineinfo_wechatversion = "0";
     private String machineinfo_platform = "0";
+    private String machineinfo_sdkversion = "0";
+
 
 
     // 当天统计量信息

ad-engine-service/src/main/java/com/tzld/piaoquan/ad/engine/service/score/convert/FeatureConvert.java

@@ -13,90 +13,27 @@ public class FeatureConvert {
     public static UserAdFeatureProto convertToProto(UserAdFeature userAdFeature) {
         UserAdFeatureProto.Builder builder = UserAdFeatureProto.newBuilder();
         builder.setMid(userAdFeature.getMid());
-        builder.setGender(userAdFeature.getGender());
-        builder.setUserType(userAdFeature.getUser_type());
-        builder.setGmtCreate(userAdFeature.getGmt_create());
-        builder.setTags(userAdFeature.getTags());
-        builder.setCategoryName(userAdFeature.getCategory_name());
-        builder.setIsvip(userAdFeature.getIsvip());
-        builder.setIsreward(userAdFeature.getIsreward());
-        builder.setIsad(userAdFeature.getIsad());
-        builder.setIsgood(userAdFeature.getIsgood());
-        builder.setFirstUpDatetime(userAdFeature.getFirst_up_datetime());
-        builder.setLastUpDatetime(userAdFeature.getLast_up_datetime());
-        builder.setNextToLastUpDatetime(userAdFeature.getNext_to_last_up_datetime());
-        builder.setVideos(userAdFeature.getVideos());
-        builder.setIdols(userAdFeature.getIdols());
-        builder.setFans(userAdFeature.getFans());
-        builder.setPlayCount(userAdFeature.getPlay_count());
-        builder.setPlayCountTotal(userAdFeature.getPlay_count_total());
-        builder.setTotalReward(userAdFeature.getTotal_reward());
-        builder.setCurrentdayReward(userAdFeature.getCurrentday_reward());
-        builder.setRewardPerson(userAdFeature.getReward_person());
-        builder.setTotalRewardTimes(userAdFeature.getTotal_reward_times());
-        builder.setRewardVideos(userAdFeature.getReward_videos());
-        builder.setTotalPrice(userAdFeature.getTotal_price());
-        builder.setCurrentdayPrice(userAdFeature.getCurrentday_price());
-        builder.setTotalPriceTimes(userAdFeature.getTotal_price_times());
-        builder.setTotalPricePerson(userAdFeature.getTotal_price_person());
-        builder.setTotalPriceVideos(userAdFeature.getTotal_price_videos());
-        builder.setCgrainUserType(userAdFeature.getCgrain_user_type());
-        builder.setIdentityTagname(userAdFeature.getIdentity_tagname());
-        builder.setOperationTags(userAdFeature.getOperation_tags());
-        builder.setIdentityTagId(userAdFeature.getIdentity_tag_id());
-        builder.setIdentityCreateTime(userAdFeature.getIdentity_create_time());
-        builder.setCountry(userAdFeature.getCountry());
-        builder.setProvince(userAdFeature.getProvince());
-        builder.setCity(userAdFeature.getCity());
 
         builder.setDay1CntFeatures(convertToProto(userAdFeature.getDay1_cnt_features()));
         builder.setDay3CntFeatures(convertToProto(userAdFeature.getDay3_cnt_features()));
         builder.setDay7CntFeatures(convertToProto(userAdFeature.getDay7_cnt_features()));
         builder.setMonth3CntFeatures(convertToProto(userAdFeature.getMonth3_cnt_features()));
 
+        //TODO
+
         return builder.build();
     }
 
-    public static UserAdFeature convertToJava(UserAdFeatureProto userAdFeatureProto){
-            UserAdFeature userAdFeature = new UserAdFeature();
-            userAdFeature.setMid(userAdFeatureProto.getMid());
-            userAdFeature.setGender(userAdFeatureProto.getGender());
-            userAdFeature.setUser_type(userAdFeatureProto.getUserType());
-            userAdFeature.setGmt_create(userAdFeatureProto.getGmtCreate());
-            userAdFeature.setTags(userAdFeatureProto.getTags());
-            userAdFeature.setCategory_name(userAdFeatureProto.getCategoryName());
-            userAdFeature.setIsvip(userAdFeatureProto.getIsvip());
-            userAdFeature.setIsreward(userAdFeatureProto.getIsreward());
-            userAdFeature.setIsad(userAdFeatureProto.getIsad());
-            userAdFeature.setIsgood(userAdFeatureProto.getIsgood());
-            userAdFeature.setFirst_up_datetime(userAdFeatureProto.getFirstUpDatetime());
-            userAdFeature.setLast_up_datetime(userAdFeatureProto.getLastUpDatetime());
-            userAdFeature.setNext_to_last_up_datetime(userAdFeatureProto.getNextToLastUpDatetime());
-            userAdFeature.setVideos(userAdFeatureProto.getVideos());
-            userAdFeature.setIdols(userAdFeatureProto.getIdols());
-            userAdFeature.setFans(userAdFeatureProto.getFans());
-            userAdFeature.setPlay_count(userAdFeatureProto.getPlayCount());
-            userAdFeature.setPlay_count_total(userAdFeatureProto.getPlayCountTotal());
-            userAdFeature.setTotal_reward(userAdFeatureProto.getTotalReward());
-            userAdFeature.setCurrentday_reward(userAdFeatureProto.getCurrentdayReward());
-            userAdFeature.setReward_person(userAdFeatureProto.getRewardPerson());
-            userAdFeature.setTotal_price_times(userAdFeatureProto.getTotalRewardTimes());
-            userAdFeature.setReward_videos(userAdFeatureProto.getRewardVideos());
-            userAdFeature.setTotal_price(userAdFeatureProto.getTotalPrice());
-            userAdFeature.setCurrentday_price(userAdFeatureProto.getCurrentdayPrice());
-            userAdFeature.setTotal_price_times(userAdFeatureProto.getTotalPriceTimes());
-            userAdFeature.setTotal_price_person(userAdFeatureProto.getTotalPricePerson());
-            userAdFeature.setTotal_price_videos(userAdFeatureProto.getTotalPriceVideos());
-            userAdFeature.setCgrain_user_type(userAdFeatureProto.getCgrainUserType());
-            userAdFeature.setIdentity_tagname(userAdFeatureProto.getIdentityTagname());
-            userAdFeature.setOperation_tags(userAdFeatureProto.getOperationTags());
-            userAdFeature.setIdentity_tag_id(userAdFeatureProto.getIdentityTagId());
-            userAdFeature.setIdentity_create_time(userAdFeatureProto.getIdentityCreateTime());
-            userAdFeature.setDay1_cnt_features(convertToJava(userAdFeatureProto.getDay1CntFeatures()));
-            userAdFeature.setDay3_cnt_features(convertToJava(userAdFeatureProto.getDay3CntFeatures()));
-            userAdFeature.setDay7_cnt_features(convertToJava(userAdFeatureProto.getDay7CntFeatures()));
-            userAdFeature.setMonth3_cnt_features(convertToJava(userAdFeatureProto.getMonth3CntFeatures()));
-            return userAdFeature;
+    public static UserAdFeature convertToJava(UserAdFeatureProto userAdFeatureProto) {
+        UserAdFeature userAdFeature = new UserAdFeature();
+        userAdFeature.setMid(userAdFeatureProto.getMid());
+
+        userAdFeature.setDay1_cnt_features(convertToJava(userAdFeatureProto.getDay1CntFeatures()));
+        userAdFeature.setDay3_cnt_features(convertToJava(userAdFeatureProto.getDay3CntFeatures()));
+        userAdFeature.setDay7_cnt_features(convertToJava(userAdFeatureProto.getDay7CntFeatures()));
+        userAdFeature.setMonth3_cnt_features(convertToJava(userAdFeatureProto.getMonth3CntFeatures()));
+        // TODO
+        return userAdFeature;
     }
 
     public static AdActionFeatureProto convertToProto(AdActionFeature adActionFeature) {
@@ -108,6 +45,7 @@ public class FeatureConvert {
         builder.setCvr(adActionFeature.getCvr());
         return builder.build();
     }
+
     public static AdActionFeature convertToJava(AdActionFeatureProto adActionFeatureProto) {
         AdActionFeature adActionFeature = new AdActionFeature();
         adActionFeature.setAdView(adActionFeatureProto.getAdView());
@@ -127,13 +65,13 @@ public class FeatureConvert {
         adItemFeature.setCampaignId(adItemFeatureProto.getCampaignId());
         adItemFeature.setCampaignCode(adItemFeatureProto.getCampaignCode());
         adItemFeature.setCreativeId(adItemFeatureProto.getCreativeId());
-        adItemFeature.setDay1_cnt_features(convertToJava(adItemFeatureProto.getDay1CntFeatures()));
-        adItemFeature.setDay3_cnt_features(convertToJava(adItemFeatureProto.getDay3CntFeatures()));
-        adItemFeature.setDay7_cnt_features(convertToJava(adItemFeatureProto.getDay7CntFeatures()));
-        adItemFeature.setMonth3_cnt_features(convertToJava(adItemFeatureProto.getMonth3CntFeatures()));
+        //TODO
+
         return adItemFeature;
+
     }
 
+
     public static AdItemFeatureProto convertToProto(AdItemFeature adItemFeature) {
         AdItemFeatureProto.Builder builder = AdItemFeatureProto.newBuilder();
         builder.setAdId(adItemFeature.getAdId());
@@ -148,6 +86,9 @@ public class FeatureConvert {
         builder.setDay3CntFeatures(convertToProto(adItemFeature.getDay3_cnt_features()));
         builder.setDay7CntFeatures(convertToProto(adItemFeature.getDay7_cnt_features()));
         builder.setMonth3CntFeatures(convertToProto(adItemFeature.getMonth3_cnt_features()));
+        //TODO
+
+
         return builder.build();
     }
 }