Merge remote-tracking branch 'origin/package-data' into package-data

game-data/game-data-serve/src/main/java/com/zanxiang/game/data/serve/pojo/entity/AdsOrderAggregation.java

@@ -5,6 +5,8 @@ import lombok.Builder;
 import lombok.Data;
 import lombok.NoArgsConstructor;
 import org.nutz.dao.entity.annotation.Column;
+import org.nutz.dao.entity.annotation.PK;
+import org.nutz.dao.entity.annotation.Table;
 
 import java.io.Serializable;
 import java.math.BigDecimal;
@@ -22,6 +24,8 @@ import java.time.LocalDate;
 @NoArgsConstructor
 @AllArgsConstructor
 @Builder
+@Table(AdsOrderAggregation.TABLE_NAME)
+@PK({"dt", "accountId", "agentId"})
 public class AdsOrderAggregation implements Serializable {
     private static final long serialVersionUID = 1L;
     public static final String TABLE_NAME = "ads_order_aggregation";
@@ -29,19 +33,16 @@ public class AdsOrderAggregation implements Serializable {
     /**
      * 注册时间
      */
-    @Column
     private LocalDate dt;
 
     /**
      * 推广账号
      */
-    @Column
     private Long accountId;
 
     /**
      * 渠道ID
      */
-    @Column
     private Long agentId;
 
     /**

game-data/game-data-serve/src/main/java/com/zanxiang/game/data/serve/pojo/entity/AdsOrderDetail.java

@@ -5,6 +5,8 @@ import lombok.Builder;
 import lombok.Data;
 import lombok.NoArgsConstructor;
 import org.nutz.dao.entity.annotation.Column;
+import org.nutz.dao.entity.annotation.PK;
+import org.nutz.dao.entity.annotation.Table;
 
 import java.io.Serializable;
 import java.math.BigDecimal;
@@ -23,6 +25,8 @@ import java.time.LocalDateTime;
 @NoArgsConstructor
 @AllArgsConstructor
 @Builder
+@Table(AdsOrderDetail.TABLE_NAME)
+@PK({"day", "sourceSystem", "orderId"})
 public class AdsOrderDetail implements Serializable {
     private static final long serialVersionUID = 1L;
     public static final String TABLE_NAME = "ads_order_detail";
@@ -30,19 +34,16 @@ public class AdsOrderDetail implements Serializable {
     /**
      * 订单创建日期
      */
-    @Column
     private LocalDate day;
 
     /**
      * SDK来源
      */
-    @Column
     private String sourceSystem;
 
     /**
      * 订单号
      */
-    @Column
     private String orderId;
 
     /**

game-data/game-data-serve/src/main/java/com/zanxiang/game/data/serve/pojo/entity/AdsOverallSummary.java

@@ -5,6 +5,8 @@ import lombok.Builder;
 import lombok.Data;
 import lombok.NoArgsConstructor;
 import org.nutz.dao.entity.annotation.Column;
+import org.nutz.dao.entity.annotation.PK;
+import org.nutz.dao.entity.annotation.Table;
 
 import java.io.Serializable;
 import java.math.BigDecimal;
@@ -22,6 +24,8 @@ import java.time.LocalDate;
 @NoArgsConstructor
 @AllArgsConstructor
 @Builder
+@Table(AdsOverallSummary.TABLE_NAME)
+@PK({"dt", "agentId", "accountId"})
 public class AdsOverallSummary implements Serializable {
     private static final long serialVersionUID = 1L;
     public static final String TABLE_NAME = "ads_overall_summary";
@@ -29,19 +33,16 @@ public class AdsOverallSummary implements Serializable {
     /**
      * 日期（用户注册时间）
      */
-    @Column
     private LocalDate dt;
 
     /**
      * 渠道ID
      */
-    @Column
     private Long agentId;
 
     /**
      * 广告账号
      */
-    @Column
     private Long accountId;
 
     /**

game-data/game-data-serve/src/main/java/com/zanxiang/game/data/serve/pojo/entity/AdsPlayerRechargeRanking.java

@@ -5,6 +5,8 @@ import lombok.Builder;
 import lombok.Data;
 import lombok.NoArgsConstructor;
 import org.nutz.dao.entity.annotation.Column;
+import org.nutz.dao.entity.annotation.PK;
+import org.nutz.dao.entity.annotation.Table;
 
 import java.io.Serializable;
 import java.math.BigDecimal;
@@ -23,6 +25,8 @@ import java.time.LocalDateTime;
 @NoArgsConstructor
 @AllArgsConstructor
 @Builder
+@Table(AdsPlayerRechargeRanking.TABLE_NAME)
+@PK({"dt", "playerId"})
 public class AdsPlayerRechargeRanking implements Serializable {
     private static final long serialVersionUID = 1L;
     public static final String TABLE_NAME = "ads_player_recharge_ranking";
@@ -30,13 +34,11 @@ public class AdsPlayerRechargeRanking implements Serializable {
     /**
      * 日期（充值时间）
      */
-    @Column
     private LocalDate dt;
 
     /**
      * 玩家ID
      */
-    @Column
     private Long playerId;
 
     /**