ss

recommend-feature-client/src/main/java/com/tzld/piaoquan/recommend/feature/domain/video/base/UserActionFeature.java

@@ -32,7 +32,7 @@ public class UserActionFeature {
         if (key == null) {
             this.exp_cnt = 0.0;
         } else {
-            String formateKey = key.toString().replace("\\N", "-1");
+            String formateKey = key.toString().replace("\\N", "0");
             this.exp_cnt = ceilLog(Double.valueOf(formateKey));
         }
     }
@@ -41,7 +41,7 @@ public class UserActionFeature {
         if (key == null) {
             this.click_cnt = 0.0;
         } else {
-            String formateKey = key.toString().replace("\\N", "-1");
+            String formateKey = key.toString().replace("\\N", "0");
             this.click_cnt = ceilLog(Double.valueOf(formateKey));
         }
     }
@@ -50,7 +50,7 @@ public class UserActionFeature {
         if (key == null) {
             this.share_cnt = 0.0;
         } else {
-            String formateKey = key.toString().replace("\\N", "-1");
+            String formateKey = key.toString().replace("\\N", "0");
             this.share_cnt = ceilLog(Double.valueOf(formateKey));
         }
     }
@@ -59,7 +59,7 @@ public class UserActionFeature {
         if (key == null) {
             this.return_cnt = 0.0;
         } else {
-            String formateKey = key.toString().replace("\\N", "-1");
+            String formateKey = key.toString().replace("\\N", "0");
             this.return_cnt = ceilLog(Double.valueOf(formateKey));
         }
     }
@@ -68,7 +68,7 @@ public class UserActionFeature {
         if (key == null) {
             this.ctr = 0.0;
         } else {
-            String formateKey = key.toString().replace("\\N", "-1");
+            String formateKey = key.toString().replace("\\N", "0");
             this.ctr = bucketRatioFeature(Double.valueOf(formateKey));
         }
     }
@@ -77,7 +77,7 @@ public class UserActionFeature {
         if (key == null) {
             this.str = 0.0;
         } else {
-            String formateKey = key.toString().replace("\\N", "-1");
+            String formateKey = key.toString().replace("\\N", "0");
             this.str = bucketRatioFeature(Double.valueOf(formateKey));
         }
     }
@@ -86,7 +86,7 @@ public class UserActionFeature {
         if (key == null) {
             this.rov = 0.0;
         } else {
-            String formateKey = key.toString().replace("\\N", "-1");
+            String formateKey = key.toString().replace("\\N", "0");
             this.rov = bucketRatioFeature(Double.valueOf(formateKey));
         }
     }
@@ -95,7 +95,7 @@ public class UserActionFeature {
         if (key == null) {
             this.ros = 0.0;
         } else {
-            String formateKey = key.toString().replace("\\N", "-1");
+            String formateKey = key.toString().replace("\\N", "0");
             this.ros = bucketRatioFeature(Double.valueOf(formateKey));
         }
     }

recommend-feature-service/src/main/java/com/tzld/piaoquan/recommend/feature/service/FeatureConverter.java

@@ -4,9 +4,11 @@ import com.google.common.base.Strings;
 import com.tzld.piaoquan.recommend.feature.domain.video.base.ItemFeature;
 import com.tzld.piaoquan.recommend.feature.domain.video.base.UserActionFeature;
 import com.tzld.piaoquan.recommend.feature.domain.video.base.UserFeature;
+
 import com.tzld.piaoquan.recommend.feature.model.AdActionFeature;
 import com.tzld.piaoquan.recommend.feature.model.AdItemFeature;
 import com.tzld.piaoquan.recommend.feature.model.UserAdFeature;
+
 import com.tzld.piaoquan.recommend.feature.model.feature.*;
 
 /**
@@ -90,47 +92,19 @@ public class FeatureConverter {
         UserAdFeatureProto.Builder builder = UserAdFeatureProto.newBuilder();
         if (userAdFeature == null) return builder.build();
         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()));
 
+        if (userAdFeature.getDay1_cnt_features() != null) {
+            builder.setDay1CntFeatures(convertToProto(userAdFeature.getDay1_cnt_features()));
+        }
+        if (userAdFeature.getDay3_cnt_features() != null) {
+            builder.setDay3CntFeatures(convertToProto(userAdFeature.getDay3_cnt_features()));
+        }
+        if (userAdFeature.getDay7_cnt_features() != null) {
+            builder.setDay7CntFeatures(convertToProto(userAdFeature.getDay7_cnt_features()));
+        }
+        if (userAdFeature.getMonth3_cnt_features() != null) {
+            builder.setMonth3CntFeatures(convertToProto(userAdFeature.getMonth3_cnt_features()));
+        }
         return builder.build();
     }
 
@@ -158,20 +132,43 @@ public class FeatureConverter {
         builder.setCampaignCode(adItemFeature.getCampaignCode());
         builder.setCreativeId(adItemFeature.getCreativeId());
         builder.setCreativeCode(adItemFeature.getCreativeCode());
-        builder.setDay1CntFeatures(convertToProto(adItemFeature.getDay1_cnt_features()));
-        builder.setDay3CntFeatures(convertToProto(adItemFeature.getDay3_cnt_features()));
-        builder.setDay7CntFeatures(convertToProto(adItemFeature.getDay7_cnt_features()));
-        builder.setMonth3CntFeatures(convertToProto(adItemFeature.getMonth3_cnt_features()));
-
-        builder.setCreative1DayCntFeatures(convertToProto(adItemFeature.getCreative_1day_cnt_features()));
-        builder.setCreative3DayCntFeatures(convertToProto(adItemFeature.getCreative_3day_cnt_features()));
-        builder.setCreative7DayCntFeatures(convertToProto(adItemFeature.getCreative_7day_cnt_features()));
-        builder.setCreative3MonthCntFeatures(convertToProto(adItemFeature.getCreative_3month_cnt_features()));
-
-        builder.setAdvertiser1DayCntFeatures(convertToProto(adItemFeature.getAdvertiser_1day_cnt_features()));
-        builder.setAdvertiser3DayCntFeatures(convertToProto(adItemFeature.getAdvertiser_3day_cnt_features()));
-        builder.setAdvertiser7DayCntFeatures(convertToProto(adItemFeature.getAdvertiser_7day_cnt_features()));
-        builder.setAdvertiser3MonthCntFeatures(convertToProto(adItemFeature.getAdvertiser_3month_cnt_features()));
+
+        if (adItemFeature.getDay1_cnt_features() != null) {
+            builder.setDay1CntFeatures(convertToProto(adItemFeature.getDay1_cnt_features()));
+        }
+        if (adItemFeature.getDay3_cnt_features() != null) {
+            builder.setDay3CntFeatures(convertToProto(adItemFeature.getDay3_cnt_features()));
+        }
+        if (adItemFeature.getDay7_cnt_features() != null) {
+            builder.setDay7CntFeatures(convertToProto(adItemFeature.getDay7_cnt_features()));
+        }
+        if (adItemFeature.getMonth3_cnt_features() != null) {
+            builder.setMonth3CntFeatures(convertToProto(adItemFeature.getMonth3_cnt_features()));
+        }
+        if (adItemFeature.getCreative_1day_cnt_features() != null) {
+            builder.setCreative1DayCntFeatures(convertToProto(adItemFeature.getCreative_1day_cnt_features()));
+        }
+        if (adItemFeature.getCreative_3day_cnt_features() != null) {
+            builder.setCreative3DayCntFeatures(convertToProto(adItemFeature.getCreative_3day_cnt_features()));
+        }
+        if (adItemFeature.getCreative_7day_cnt_features() != null) {
+            builder.setCreative7DayCntFeatures(convertToProto(adItemFeature.getCreative_7day_cnt_features()));
+        }
+        if (adItemFeature.getCreative_3month_cnt_features() != null) {
+            builder.setCreative3MonthCntFeatures(convertToProto(adItemFeature.getCreative_3month_cnt_features()));
+        }
+        if (adItemFeature.getAdvertiser_1day_cnt_features() != null) {
+            builder.setAdvertiser1DayCntFeatures(convertToProto(adItemFeature.getAdvertiser_1day_cnt_features()));
+        }
+        if (adItemFeature.getAdvertiser_3day_cnt_features() != null) {
+            builder.setAdvertiser3DayCntFeatures(convertToProto(adItemFeature.getAdvertiser_3day_cnt_features()));
+        }
+        if (adItemFeature.getAdvertiser_7day_cnt_features() != null) {
+            builder.setAdvertiser7DayCntFeatures(convertToProto(adItemFeature.getAdvertiser_7day_cnt_features()));
+        }
+        if (adItemFeature.getAdvertiser_3month_cnt_features() != null) {
+            builder.setAdvertiser3MonthCntFeatures(convertToProto(adItemFeature.getAdvertiser_3month_cnt_features()));
+        }
 
         return builder.build();
     }