repair v2

recommend-feature-client/pom.xml

@@ -10,7 +10,7 @@
     <modelVersion>4.0.0</modelVersion>
 
     <artifactId>recommend-feature-client</artifactId>
-    <version>1.0.1</version>
+    <version>1.0.2</version>
 
     <dependencies>
         <dependency>

recommend-feature-client/src/main/java/com/tzld/piaoquan/recommend/feature/domain/ad/base/AdActionFeature.java

@@ -1,6 +1,5 @@
 package com.tzld.piaoquan.recommend.feature.domain.ad.base;
 
-import com.sun.istack.internal.NotNull;
 import lombok.Data;
 import lombok.Getter;
 

recommend-feature-client/src/main/java/com/tzld/piaoquan/recommend/feature/domain/ad/base/AdItemFeature.java

@@ -6,88 +6,67 @@ import lombok.Getter;
 import lombok.NoArgsConstructor;
 import lombok.Setter;
 
-import javax.validation.constraints.NotNull;
 
 @Getter
 @NoArgsConstructor
 public class AdItemFeature {
     @Setter
-    @NotNull
     private String adId = "0";
 
     @Setter
-    @NotNull
     private String adCode = "0";
 
     @Setter
-    @NotNull
     private String advertiserId = "0";
     @Setter
-    @NotNull
     private String advertiserCode = "0";
 
     @Setter
-    @NotNull
     private String campaignId = "0";
 
     @Setter
-    @NotNull
     private String campaignCode = "0";
 
     @Setter
-    @NotNull
     private String creativeId = "0";
 
     @Setter
-    @NotNull
     private String creativeCode = "0";
 
 
     // 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();
 
 

recommend-feature-service/pom.xml

@@ -91,7 +91,7 @@
         <dependency>
             <groupId>com.tzld.piaoquan</groupId>
             <artifactId>recommend-feature-client</artifactId>
-            <version>1.0.1</version>
+            <version>1.0.2</version>
         </dependency>
         <dependency>
             <groupId>com.google.protobuf</groupId>

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

@@ -1,7 +1,7 @@
 package com.tzld.piaoquan.recommend.feature.service;
 
 import com.google.common.reflect.TypeToken;
-import com.tzld.piaoquan.recommend.feature.model.AdItemFeature;
+import com.tzld.piaoquan.recommend.feature.domain.ad.base.AdItemFeature;
 import com.tzld.piaoquan.recommend.feature.model.common.Result;
 import com.tzld.piaoquan.recommend.feature.model.feature.*;
 import com.tzld.piaoquan.recommend.feature.util.CommonCollectionUtils;

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

@@ -5,9 +5,9 @@ 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.domain.ad.base.AdActionFeature;
+import com.tzld.piaoquan.recommend.feature.domain.ad.base.AdItemFeature;
+import com.tzld.piaoquan.recommend.feature.domain.ad.base.UserAdFeature;
 
 import com.tzld.piaoquan.recommend.feature.model.feature.*;
 

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

@@ -1,7 +1,7 @@
 package com.tzld.piaoquan.recommend.feature.service;
 
 import com.google.common.reflect.TypeToken;
-import com.tzld.piaoquan.recommend.feature.model.UserAdFeature;
+import com.tzld.piaoquan.recommend.feature.domain.ad.base.UserAdFeature;
 import com.tzld.piaoquan.recommend.feature.model.common.Result;
 import com.tzld.piaoquan.recommend.feature.model.feature.GetUserAdFeatureRequest;
 import com.tzld.piaoquan.recommend.feature.model.feature.GetUserAdFeatureResponse;