huangpingkang 1 rok pred
rodič
commit
cb8e396090

+ 13 - 148
job-adq/src/main/java/cn/com/ctop/job/adq/data/entity/AdqAdvertiserReportDaily.java

@@ -1,5 +1,9 @@
 package cn.com.ctop.job.adq.data.entity;
 
+import lombok.AllArgsConstructor;
+import lombok.Data;
+import lombok.NoArgsConstructor;
+
 import java.math.BigDecimal;
 
 
@@ -9,6 +13,9 @@ import java.math.BigDecimal;
  * @author ruoyi
  * @date 2025-03-06
  */
+@Data
+@AllArgsConstructor
+@NoArgsConstructor
 public class AdqAdvertiserReportDaily {
     private static final long serialVersionUID = 1L;
 
@@ -94,153 +101,11 @@ public class AdqAdvertiserReportDaily {
      */
     private Long firstPayCount;
 
-    public Long getAdvertiserId() {
-        return advertiserId;
-    }
-
-    public void setAdvertiserId(Long advertiserId) {
-        this.advertiserId = advertiserId;
-    }
-
-    public Long getStatTimeDay() {
-        return statTimeDay;
-    }
-
-    public void setStatTimeDay(Long statTimeDay) {
-        this.statTimeDay = statTimeDay;
-    }
-
-    public BigDecimal getCost() {
-        return cost;
-    }
-
-    public void setCost(BigDecimal cost) {
-        this.cost = cost;
-    }
-
-    public Long getViewCount() {
-        return viewCount;
-    }
-
-    public void setViewCount(Long viewCount) {
-        this.viewCount = viewCount;
-    }
+    private Long adMonetizationAmount;//广告变现金额。
+    private Long appAdPayingUsers;//广告变现人数
+    private Long incomePvPla;//广告变现次数
+    private Long incomeVal1;//激活首日广告变现金额
+    private Long adPayingUsersD1;//激活首日广告变现人数
+    private Long incomePv1dPla;//注册首日广告变现次数
 
-    public Long getValidClickCount() {
-        return validClickCount;
-    }
-
-    public void setValidClickCount(Long validClickCount) {
-        this.validClickCount = validClickCount;
-    }
-
-    public Long getConversionsCount() {
-        return conversionsCount;
-    }
-
-    public void setConversionsCount(Long conversionsCount) {
-        this.conversionsCount = conversionsCount;
-    }
-
-    public Long getDeepConversionsCount() {
-        return deepConversionsCount;
-    }
-
-    public void setDeepConversionsCount(Long deepConversionsCount) {
-        this.deepConversionsCount = deepConversionsCount;
-    }
-
-    public Long getActivatedCount() {
-        return activatedCount;
-    }
-
-    public void setActivatedCount(Long activatedCount) {
-        this.activatedCount = activatedCount;
-    }
-
-    public Long getRegPv() {
-        return regPv;
-    }
-
-    public void setRegPv(Long regPv) {
-        this.regPv = regPv;
-    }
-
-    public Long getRetentionCount() {
-        return retentionCount;
-    }
-
-    public void setRetentionCount(Long retentionCount) {
-        this.retentionCount = retentionCount;
-    }
-
-    public Long getVideoOuterPlayCount() {
-        return videoOuterPlayCount;
-    }
-
-    public void setVideoOuterPlayCount(Long videoOuterPlayCount) {
-        this.videoOuterPlayCount = videoOuterPlayCount;
-    }
-
-    public Long getVideoOuterPlay100Count() {
-        return videoOuterPlay100Count;
-    }
-
-    public void setVideoOuterPlay100Count(Long videoOuterPlay100Count) {
-        this.videoOuterPlay100Count = videoOuterPlay100Count;
-    }
-
-    public Long getKeyBehaviorConversionsCount() {
-        return keyBehaviorConversionsCount;
-    }
-
-    public void setKeyBehaviorConversionsCount(Long keyBehaviorConversionsCount) {
-        this.keyBehaviorConversionsCount = keyBehaviorConversionsCount;
-    }
-
-    public Long getPurchasePv() {
-        return purchasePv;
-    }
-
-    public void setPurchasePv(Long purchasePv) {
-        this.purchasePv = purchasePv;
-    }
-
-    public BigDecimal getPurchaseAmount() {
-        return purchaseAmount;
-    }
-
-    public void setPurchaseAmount(BigDecimal purchaseAmount) {
-        this.purchaseAmount = purchaseAmount;
-    }
-
-    public Long getFirstPayCount() {
-        return firstPayCount;
-    }
-
-    public void setFirstPayCount(Long firstPayCount) {
-        this.firstPayCount = firstPayCount;
-    }
-
-    @Override
-    public String toString() {
-        return "AdqAdvertiserReportDaily{" +
-                "advertiserId=" + advertiserId +
-                ", statTimeDay=" + statTimeDay +
-                ", cost=" + cost +
-                ", viewCount=" + viewCount +
-                ", validClickCount=" + validClickCount +
-                ", conversionsCount=" + conversionsCount +
-                ", deepConversionsCount=" + deepConversionsCount +
-                ", activatedCount=" + activatedCount +
-                ", regPv=" + regPv +
-                ", retentionCount=" + retentionCount +
-                ", videoOuterPlayCount=" + videoOuterPlayCount +
-                ", videoOuterPlay100Count=" + videoOuterPlay100Count +
-                ", keyBehaviorConversionsCount=" + keyBehaviorConversionsCount +
-                ", purchasePv=" + purchasePv +
-                ", purchaseAmount=" + purchaseAmount +
-                ", firstPayCount=" + firstPayCount +
-                '}';
-    }
 }

+ 13 - 158
job-adq/src/main/java/cn/com/ctop/job/adq/data/entity/AdqAdvertiserReportHour.java

@@ -1,5 +1,9 @@
 package cn.com.ctop.job.adq.data.entity;
 
+import lombok.AllArgsConstructor;
+import lombok.Data;
+import lombok.NoArgsConstructor;
+
 import java.math.BigDecimal;
 
 
@@ -9,6 +13,9 @@ import java.math.BigDecimal;
  * @author ruoyi
  * @date 2025-03-06
  */
+@Data
+@AllArgsConstructor
+@NoArgsConstructor
 public class AdqAdvertiserReportHour {
     private static final long serialVersionUID = 1L;
 
@@ -98,163 +105,11 @@ public class AdqAdvertiserReportHour {
      */
     private Long firstPayCount;
 
-    public Long getAdvertiserId() {
-        return advertiserId;
-    }
-
-    public void setAdvertiserId(Long advertiserId) {
-        this.advertiserId = advertiserId;
-    }
-
-    public Long getStatTimeDay() {
-        return statTimeDay;
-    }
-
-    public void setStatTimeDay(Long statTimeDay) {
-        this.statTimeDay = statTimeDay;
-    }
-
-    public Long getHour() {
-        return hour;
-    }
-
-    public void setHour(Long hour) {
-        this.hour = hour;
-    }
-
-    public BigDecimal getCost() {
-        return cost;
-    }
-
-    public void setCost(BigDecimal cost) {
-        this.cost = cost;
-    }
-
-    public Long getViewCount() {
-        return viewCount;
-    }
-
-    public void setViewCount(Long viewCount) {
-        this.viewCount = viewCount;
-    }
-
-    public Long getValidClickCount() {
-        return validClickCount;
-    }
-
-    public void setValidClickCount(Long validClickCount) {
-        this.validClickCount = validClickCount;
-    }
-
-    public Long getConversionsCount() {
-        return conversionsCount;
-    }
-
-    public void setConversionsCount(Long conversionsCount) {
-        this.conversionsCount = conversionsCount;
-    }
-
-    public Long getDeepConversionsCount() {
-        return deepConversionsCount;
-    }
-
-    public void setDeepConversionsCount(Long deepConversionsCount) {
-        this.deepConversionsCount = deepConversionsCount;
-    }
-
-    public Long getActivatedCount() {
-        return activatedCount;
-    }
-
-    public void setActivatedCount(Long activatedCount) {
-        this.activatedCount = activatedCount;
-    }
-
-    public Long getRegPv() {
-        return regPv;
-    }
-
-    public void setRegPv(Long regPv) {
-        this.regPv = regPv;
-    }
-
-    public Long getRetentionCount() {
-        return retentionCount;
-    }
-
-    public void setRetentionCount(Long retentionCount) {
-        this.retentionCount = retentionCount;
-    }
-
-    public Long getVideoOuterPlayCount() {
-        return videoOuterPlayCount;
-    }
-
-    public void setVideoOuterPlayCount(Long videoOuterPlayCount) {
-        this.videoOuterPlayCount = videoOuterPlayCount;
-    }
-
-    public Long getVideoOuterPlay100Count() {
-        return videoOuterPlay100Count;
-    }
-
-    public void setVideoOuterPlay100Count(Long videoOuterPlay100Count) {
-        this.videoOuterPlay100Count = videoOuterPlay100Count;
-    }
-
-    public Long getKeyBehaviorConversionsCount() {
-        return keyBehaviorConversionsCount;
-    }
-
-    public void setKeyBehaviorConversionsCount(Long keyBehaviorConversionsCount) {
-        this.keyBehaviorConversionsCount = keyBehaviorConversionsCount;
-    }
-
-    public Long getPurchasePv() {
-        return purchasePv;
-    }
-
-    public void setPurchasePv(Long purchasePv) {
-        this.purchasePv = purchasePv;
-    }
-
-    public BigDecimal getPurchaseAmount() {
-        return purchaseAmount;
-    }
-
-    public void setPurchaseAmount(BigDecimal purchaseAmount) {
-        this.purchaseAmount = purchaseAmount;
-    }
-
-    public Long getFirstPayCount() {
-        return firstPayCount;
-    }
-
-    public void setFirstPayCount(Long firstPayCount) {
-        this.firstPayCount = firstPayCount;
-    }
+    private Long adMonetizationAmount;//广告变现金额。
+    private Long appAdPayingUsers;//广告变现人数
+    private Long incomePvPla;//广告变现次数
+    private Long incomeVal1;//激活首日广告变现金额
+    private Long adPayingUsersD1;//激活首日广告变现人数
+    private Long incomePv1dPla;//注册首日广告变现次数
 
-    @Override
-    public String
-    toString() {
-        return "AdqAccountReportHour{" +
-                "advertiserId=" + advertiserId +
-                ", statTimeDay=" + statTimeDay +
-                ", hour=" + hour +
-                ", cost=" + cost +
-                ", viewCount=" + viewCount +
-                ", validClickCount=" + validClickCount +
-                ", conversionsCount=" + conversionsCount +
-                ", deepConversionsCount=" + deepConversionsCount +
-                ", activatedCount=" + activatedCount +
-                ", regPv=" + regPv +
-                ", retentionCount=" + retentionCount +
-                ", videoOuterPlayCount=" + videoOuterPlayCount +
-                ", videoOuterPlay100Count=" + videoOuterPlay100Count +
-                ", keyBehaviorConversionsCount=" + keyBehaviorConversionsCount +
-                ", purchasePv=" + purchasePv +
-                ", purchaseAmount=" + purchaseAmount +
-                ", firstPayCount=" + firstPayCount +
-                '}';
-    }
 }

+ 6 - 1
job-adq/src/main/java/cn/com/ctop/job/adq/data/entity/AdqAssetReportDaily.java

@@ -30,6 +30,11 @@ public class AdqAssetReportDaily {
     private Long purchasePv; // 付费次数
     private BigDecimal purchaseAmount; // 付费金额
     private Long firstPayCount; // 首次付费人数
-
+    private Long adMonetizationAmount;//广告变现金额。
+    private Long appAdPayingUsers;//广告变现人数
+    private Long incomePvPla;//广告变现次数
+    private Long incomeVal1;//激活首日广告变现金额
+    private Long adPayingUsersD1;//激活首日广告变现人数
+    private Long incomePv1dPla;//注册首日广告变现次数
 }
 

+ 13 - 185
job-adq/src/main/java/cn/com/ctop/job/adq/data/entity/AdqCreativeReportDaily.java

@@ -1,5 +1,9 @@
 package cn.com.ctop.job.adq.data.entity;
 
+import lombok.AllArgsConstructor;
+import lombok.Data;
+import lombok.NoArgsConstructor;
+
 import java.math.BigDecimal;
 
 
@@ -9,6 +13,9 @@ import java.math.BigDecimal;
  * @author ruoyi
  * @date 2025-03-06
  */
+@Data
+@AllArgsConstructor
+@NoArgsConstructor
 public class AdqCreativeReportDaily {
     private static final long serialVersionUID = 1L;
 
@@ -109,189 +116,10 @@ public class AdqCreativeReportDaily {
      */
     private Long firstPayCount;
 
-    public Long getAdvertiserId() {
-        return advertiserId;
-    }
-
-    public void setAdvertiserId(Long advertiserId) {
-        this.advertiserId = advertiserId;
-    }
-
-    public Long getAdgroupId() {
-        return adgroupId;
-    }
-
-    public void setAdgroupId(Long adgroupId) {
-        this.adgroupId = adgroupId;
-    }
-
-    public String getAdgroupName() {
-        return adgroupName;
-    }
-
-    public void setAdgroupName(String adgroupName) {
-        this.adgroupName = adgroupName;
-    }
-
-    public Long getDynamicCreativeId() {
-        return dynamicCreativeId;
-    }
-
-    public void setDynamicCreativeId(Long dynamicCreativeId) {
-        this.dynamicCreativeId = dynamicCreativeId;
-    }
-
-    public String getDynamicCreativeName() {
-        return dynamicCreativeName;
-    }
-
-    public void setDynamicCreativeName(String dynamicCreativeName) {
-        this.dynamicCreativeName = dynamicCreativeName;
-    }
-
-    public Long getStatTimeDay() {
-        return statTimeDay;
-    }
-
-    public void setStatTimeDay(Long statTimeDay) {
-        this.statTimeDay = statTimeDay;
-    }
-
-    public BigDecimal getCost() {
-        return cost;
-    }
-
-    public void setCost(BigDecimal cost) {
-        this.cost = cost;
-    }
-
-    public Long getViewCount() {
-        return viewCount;
-    }
-
-    public void setViewCount(Long viewCount) {
-        this.viewCount = viewCount;
-    }
-
-    public Long getValidClickCount() {
-        return validClickCount;
-    }
-
-    public void setValidClickCount(Long validClickCount) {
-        this.validClickCount = validClickCount;
-    }
-
-    public Long getConversionsCount() {
-        return conversionsCount;
-    }
-
-    public void setConversionsCount(Long conversionsCount) {
-        this.conversionsCount = conversionsCount;
-    }
-
-    public Long getDeepConversionsCount() {
-        return deepConversionsCount;
-    }
-
-    public void setDeepConversionsCount(Long deepConversionsCount) {
-        this.deepConversionsCount = deepConversionsCount;
-    }
-
-    public Long getActivatedCount() {
-        return activatedCount;
-    }
-
-    public void setActivatedCount(Long activatedCount) {
-        this.activatedCount = activatedCount;
-    }
-
-    public Long getRegPv() {
-        return regPv;
-    }
-
-    public void setRegPv(Long regPv) {
-        this.regPv = regPv;
-    }
-
-    public Long getRetentionCount() {
-        return retentionCount;
-    }
-
-    public void setRetentionCount(Long retentionCount) {
-        this.retentionCount = retentionCount;
-    }
-
-    public Long getVideoOuterPlayCount() {
-        return videoOuterPlayCount;
-    }
-
-    public void setVideoOuterPlayCount(Long videoOuterPlayCount) {
-        this.videoOuterPlayCount = videoOuterPlayCount;
-    }
-
-    public Long getVideoOuterPlay100Count() {
-        return videoOuterPlay100Count;
-    }
-
-    public void setVideoOuterPlay100Count(Long videoOuterPlay100Count) {
-        this.videoOuterPlay100Count = videoOuterPlay100Count;
-    }
-
-    public Long getKeyBehaviorConversionsCount() {
-        return keyBehaviorConversionsCount;
-    }
-
-    public void setKeyBehaviorConversionsCount(Long keyBehaviorConversionsCount) {
-        this.keyBehaviorConversionsCount = keyBehaviorConversionsCount;
-    }
-
-    public Long getPurchasePv() {
-        return purchasePv;
-    }
-
-    public void setPurchasePv(Long purchasePv) {
-        this.purchasePv = purchasePv;
-    }
-
-    public BigDecimal getPurchaseAmount() {
-        return purchaseAmount;
-    }
-
-    public void setPurchaseAmount(BigDecimal purchaseAmount) {
-        this.purchaseAmount = purchaseAmount;
-    }
-
-    public Long getFirstPayCount() {
-        return firstPayCount;
-    }
-
-    public void setFirstPayCount(Long firstPayCount) {
-        this.firstPayCount = firstPayCount;
-    }
-
-    @Override
-    public String toString() {
-        return "AdqCreativeReportDaily{" +
-                "advertiserId=" + advertiserId +
-                ", adgroupId=" + adgroupId +
-                ", adgroupName='" + adgroupName + '\'' +
-                ", dynamicCreativeId=" + dynamicCreativeId +
-                ", dynamicCreativeName='" + dynamicCreativeName + '\'' +
-                ", statTimeDay=" + statTimeDay +
-                ", cost=" + cost +
-                ", viewCount=" + viewCount +
-                ", validClickCount=" + validClickCount +
-                ", conversionsCount=" + conversionsCount +
-                ", deepConversionsCount=" + deepConversionsCount +
-                ", activatedCount=" + activatedCount +
-                ", regPv=" + regPv +
-                ", retentionCount=" + retentionCount +
-                ", videoOuterPlayCount=" + videoOuterPlayCount +
-                ", videoOuterPlay100Count=" + videoOuterPlay100Count +
-                ", keyBehaviorConversionsCount=" + keyBehaviorConversionsCount +
-                ", purchasePv=" + purchasePv +
-                ", purchaseAmount=" + purchaseAmount +
-                ", firstPayCount=" + firstPayCount +
-                '}';
-    }
+    private Long adMonetizationAmount;//广告变现金额。
+    private Long appAdPayingUsers;//广告变现人数
+    private Long incomePvPla;//广告变现次数
+    private Long incomeVal1;//激活首日广告变现金额
+    private Long adPayingUsersD1;//激活首日广告变现人数
+    private Long incomePv1dPla;//注册首日广告变现次数
 }

+ 12 - 195
job-adq/src/main/java/cn/com/ctop/job/adq/data/entity/AdqCreativeReportHour.java

@@ -2,6 +2,9 @@ package cn.com.ctop.job.adq.data.entity;
 
 import java.math.BigDecimal;
 
+import lombok.AllArgsConstructor;
+import lombok.Data;
+import lombok.NoArgsConstructor;
 import org.apache.commons.lang3.builder.ToStringBuilder;
 import org.apache.commons.lang3.builder.ToStringStyle;
 
@@ -12,6 +15,9 @@ import org.apache.commons.lang3.builder.ToStringStyle;
  * @author ruoyi
  * @date 2025-03-06
  */
+@Data
+@AllArgsConstructor
+@NoArgsConstructor
 public class AdqCreativeReportHour {
     private static final long serialVersionUID = 1L;
 
@@ -116,199 +122,10 @@ public class AdqCreativeReportHour {
      */
     private Long firstPayCount;
 
-    public void setAdvertiserId(Long advertiserId) {
-        this.advertiserId = advertiserId;
-    }
-
-    public Long getAdvertiserId() {
-        return advertiserId;
-    }
-
-    public void setAdgroupId(Long adgroupId) {
-        this.adgroupId = adgroupId;
-    }
-
-    public Long getAdgroupId() {
-        return adgroupId;
-    }
-
-    public void setDynamicCreativeId(Long dynamicCreativeId) {
-        this.dynamicCreativeId = dynamicCreativeId;
-    }
-
-    public Long getDynamicCreativeId() {
-        return dynamicCreativeId;
-    }
-
-    public void setDynamicCreativeName(String dynamicCreativeName) {
-        this.dynamicCreativeName = dynamicCreativeName;
-    }
-
-    public String getDynamicCreativeName() {
-        return dynamicCreativeName;
-    }
-
-    public void setStatTimeDay(Long statTimeDay) {
-        this.statTimeDay = statTimeDay;
-    }
-
-    public Long getStatTimeDay() {
-        return statTimeDay;
-    }
-
-    public void setHour(Long hour) {
-        this.hour = hour;
-    }
-
-    public Long getHour() {
-        return hour;
-    }
-
-    public void setCost(BigDecimal cost) {
-        this.cost = cost;
-    }
-
-    public BigDecimal getCost() {
-        return cost;
-    }
-
-    public void setViewCount(Long viewCount) {
-        this.viewCount = viewCount;
-    }
-
-    public Long getViewCount() {
-        return viewCount;
-    }
-
-    public void setValidClickCount(Long validClickCount) {
-        this.validClickCount = validClickCount;
-    }
-
-    public Long getValidClickCount() {
-        return validClickCount;
-    }
-
-    public void setConversionsCount(Long conversionsCount) {
-        this.conversionsCount = conversionsCount;
-    }
-
-    public Long getConversionsCount() {
-        return conversionsCount;
-    }
-
-    public void setDeepConversionsCount(Long deepConversionsCount) {
-        this.deepConversionsCount = deepConversionsCount;
-    }
-
-    public Long getDeepConversionsCount() {
-        return deepConversionsCount;
-    }
-
-    public void setActivatedCount(Long activatedCount) {
-        this.activatedCount = activatedCount;
-    }
-
-    public Long getActivatedCount() {
-        return activatedCount;
-    }
-
-    public void setRegPv(Long regPv) {
-        this.regPv = regPv;
-    }
-
-    public Long getRegPv() {
-        return regPv;
-    }
-
-    public void setRetentionCount(Long retentionCount) {
-        this.retentionCount = retentionCount;
-    }
-
-    public Long getRetentionCount() {
-        return retentionCount;
-    }
-
-    public void setVideoOuterPlayCount(Long videoOuterPlayCount) {
-        this.videoOuterPlayCount = videoOuterPlayCount;
-    }
-
-    public Long getVideoOuterPlayCount() {
-        return videoOuterPlayCount;
-    }
-
-    public void setVideoOuterPlay100Count(Long videoOuterPlay100Count) {
-        this.videoOuterPlay100Count = videoOuterPlay100Count;
-    }
-
-    public Long getVideoOuterPlay100Count() {
-        return videoOuterPlay100Count;
-    }
-
-    public void setKeyBehaviorConversionsCount(Long keyBehaviorConversionsCount) {
-        this.keyBehaviorConversionsCount = keyBehaviorConversionsCount;
-    }
-
-    public Long getKeyBehaviorConversionsCount() {
-        return keyBehaviorConversionsCount;
-    }
-
-    public void setPurchasePv(Long purchasePv) {
-        this.purchasePv = purchasePv;
-    }
-
-    public Long getPurchasePv() {
-        return purchasePv;
-    }
-
-    public void setPurchaseAmount(BigDecimal purchaseAmount) {
-        this.purchaseAmount = purchaseAmount;
-    }
-
-    public BigDecimal getPurchaseAmount() {
-        return purchaseAmount;
-    }
-
-    public void setFirstPayCount(Long firstPayCount) {
-        this.firstPayCount = firstPayCount;
-    }
-
-    public Long getFirstPayCount() {
-        return firstPayCount;
-    }
-
-    public String getAdgroupName() {
-        return adgroupName;
-    }
-
-    public void setAdgroupName(String adgroupName) {
-        this.adgroupName = adgroupName;
-    }
-
-    @Override
-    public String
-    toString() {
-        return "AdqCreativeReportHour{" +
-                "advertiserId=" + advertiserId +
-                ", adgroupId=" + adgroupId +
-                ", adgroupName='" + adgroupName + '\'' +
-                ", dynamicCreativeId=" + dynamicCreativeId +
-                ", dynamicCreativeName='" + dynamicCreativeName + '\'' +
-                ", statTimeDay=" + statTimeDay +
-                ", hour=" + hour +
-                ", cost=" + cost +
-                ", viewCount=" + viewCount +
-                ", validClickCount=" + validClickCount +
-                ", conversionsCount=" + conversionsCount +
-                ", deepConversionsCount=" + deepConversionsCount +
-                ", activatedCount=" + activatedCount +
-                ", regPv=" + regPv +
-                ", retentionCount=" + retentionCount +
-                ", videoOuterPlayCount=" + videoOuterPlayCount +
-                ", videoOuterPlay100Count=" + videoOuterPlay100Count +
-                ", keyBehaviorConversionsCount=" + keyBehaviorConversionsCount +
-                ", purchasePv=" + purchasePv +
-                ", purchaseAmount=" + purchaseAmount +
-                ", firstPayCount=" + firstPayCount +
-                '}';
-    }
+    private Long adMonetizationAmount;//广告变现金额。
+    private Long appAdPayingUsers;//广告变现人数
+    private Long incomePvPla;//广告变现次数
+    private Long incomeVal1;//激活首日广告变现金额
+    private Long adPayingUsersD1;//激活首日广告变现人数
+    private Long incomePv1dPla;//注册首日广告变现次数
 }

+ 28 - 6
job-adq/src/main/java/cn/com/ctop/job/adq/data/mapper/xml/AdqAccountReportMapper.xml

@@ -21,12 +21,17 @@
         key_behavior_conversions_count,
         purchase_pv,
         purchase_amount,
-        first_pay_count
+        first_pay_count,
+        ad_monetization_amount,
+        app_ad_paying_users,
+        income_pv_pla,
+        income_val_1,
+        ad_paying_users_d1,
+        income_pv_1d_pla
         )
         values
         <foreach collection="adds" item="item" separator=",">
             (
-
             #{item.advertiserId},
             #{item.statTimeDay},
             #{item.hour},
@@ -43,7 +48,13 @@
             #{item.keyBehaviorConversionsCount},
             #{item.purchasePv},
             #{item.purchaseAmount},
-            #{item.firstPayCount}
+            #{item.firstPayCount},
+            #{item.adMonetizationAmount},
+            #{item.appAdPayingUsers},
+            #{item.incomePvPla},
+            #{item.incomeVal1},
+            #{item.adPayingUsersD1},
+            #{item.incomePv1dPla}
             )
         </foreach>
     </insert>
@@ -64,12 +75,17 @@
         key_behavior_conversions_count,
         purchase_pv,
         purchase_amount,
-        first_pay_count
+        first_pay_count,
+        ad_monetization_amount,
+        app_ad_paying_users,
+        income_pv_pla,
+        income_val_1,
+        ad_paying_users_d1,
+        income_pv_1d_pla
         )
         values
         <foreach collection="adds" item="item" separator=",">
             (
-
             #{item.advertiserId},
             #{item.statTimeDay},
             #{item.cost},
@@ -85,7 +101,13 @@
             #{item.keyBehaviorConversionsCount},
             #{item.purchasePv},
             #{item.purchaseAmount},
-            #{item.firstPayCount}
+            #{item.firstPayCount},
+            #{item.adMonetizationAmount},
+            #{item.appAdPayingUsers},
+            #{item.incomePvPla},
+            #{item.incomeVal1},
+            #{item.adPayingUsersD1},
+            #{item.incomePv1dPla}
             )
         </foreach>
     </insert>

+ 14 - 2
job-adq/src/main/java/cn/com/ctop/job/adq/data/mapper/xml/AdqAssetReportMapper.xml

@@ -23,7 +23,13 @@
         key_behavior_conversions_count,
         purchase_pv,
         purchase_amount,
-        first_pay_count
+        first_pay_count,
+        ad_monetization_amount,
+        app_ad_paying_users,
+        income_pv_pla,
+        income_val_1,
+        ad_paying_users_d1,
+        income_pv_1d_pla
         ) VALUES
         <foreach collection="list" item="item" separator=",">
             (
@@ -46,7 +52,13 @@
             #{item.keyBehaviorConversionsCount},
             #{item.purchasePv},
             #{item.purchaseAmount},
-            #{item.firstPayCount}
+            #{item.firstPayCount},
+            #{item.adMonetizationAmount},
+            #{item.appAdPayingUsers},
+            #{item.incomePvPla},
+            #{item.incomeVal1},
+            #{item.adPayingUsersD1},
+            #{item.incomePv1dPla}
             )
         </foreach>
     </insert>

+ 28 - 4
job-adq/src/main/java/cn/com/ctop/job/adq/data/mapper/xml/AdqCreativeReportMapper.xml

@@ -25,7 +25,13 @@
         key_behavior_conversions_count,
         purchase_pv,
         purchase_amount,
-        first_pay_count
+        first_pay_count,
+        ad_monetization_amount,
+        app_ad_paying_users,
+        income_pv_pla,
+        income_val_1,
+        ad_paying_users_d1,
+        income_pv_1d_pla
         )
         values
         <foreach collection="adds" item="item" separator=",">
@@ -51,7 +57,13 @@
             #{item.keyBehaviorConversionsCount},
             #{item.purchasePv},
             #{item.purchaseAmount},
-            #{item.firstPayCount}
+            #{item.firstPayCount},
+            #{item.adMonetizationAmount},
+            #{item.appAdPayingUsers},
+            #{item.incomePvPla},
+            #{item.incomeVal1},
+            #{item.adPayingUsersD1},
+            #{item.incomePv1dPla}
             )
         </foreach>
     </insert>
@@ -76,7 +88,13 @@
         key_behavior_conversions_count,
         purchase_pv,
         purchase_amount,
-        first_pay_count
+        first_pay_count,
+        ad_monetization_amount,
+        app_ad_paying_users,
+        income_pv_pla,
+        income_val_1,
+        ad_paying_users_d1,
+        income_pv_1d_pla
         )
         values
         <foreach collection="adds" item="item" separator=",">
@@ -100,7 +118,13 @@
             #{item.keyBehaviorConversionsCount},
             #{item.purchasePv},
             #{item.purchaseAmount},
-            #{item.firstPayCount}
+            #{item.firstPayCount},
+            #{item.adMonetizationAmount},
+            #{item.appAdPayingUsers},
+            #{item.incomePvPla},
+            #{item.incomeVal1},
+            #{item.adPayingUsersD1},
+            #{item.incomePv1dPla}
             )
         </foreach>
 

+ 2 - 0
job-adq/src/main/java/cn/com/ctop/job/adq/data/service/impl/AdqAccountReportServiceImpl.java

@@ -48,6 +48,7 @@ public class AdqAccountReportServiceImpl implements IAdqAccountReportService {
             date_range.put("start_date", startDate);
             date_range.put("end_date", endDate);
             paramsMap.put("date_range", date_range);
+            paramsMap.put("time_line", "REPORTING_TIME");
             JSONArray group_by = new JSONArray();
             group_by.add("date");
             group_by.add("hour");
@@ -118,6 +119,7 @@ public class AdqAccountReportServiceImpl implements IAdqAccountReportService {
             date_range.put("start_date", startDate);
             date_range.put("end_date", endDate);
             paramsMap.put("date_range", date_range);
+            paramsMap.put("time_line", "REPORTING_TIME");
             JSONArray group_by = new JSONArray();
             group_by.add("date");
             paramsMap.put("group_by", group_by);

+ 5 - 1
job-adq/src/main/java/cn/com/ctop/job/adq/data/service/impl/AdqAssetReportServiceImpl.java

@@ -39,8 +39,10 @@ public class AdqAssetReportServiceImpl implements IAdqAssetReportService {
             paramsMap.put("account_id", advertiserId);
             paramsMap.put("level", "REPORT_LEVEL_MARKETING_ASSET");
             paramsMap.put("date_range", new JSONObject().fluentPut("start_date", startDate).fluentPut("end_date", endDate));
+            paramsMap.put("time_line", "REPORTING_TIME");
             paramsMap.put("group_by", new JSONArray(Arrays.asList("date", "adgroup_id", "marketing_target_type", "marketing_asset_id")));
-            paramsMap.put("fields", new JSONArray(Arrays.asList("date", "account_id", "adgroup_id", "adgroup_name", "marketing_target_type", "marketing_asset_id", "cost", "view_count", "valid_click_count", "conversions_count", "deep_conversions_count", "activated_count", "reg_pv", "retention_count", "video_outer_play_count", "video_outer_play100_count", "key_behavior_conversions_count", "purchase_pv", "purchase_amount", "first_pay_count")));
+            paramsMap.put("fields", new JSONArray(Arrays.asList("date", "account_id", "adgroup_id", "adgroup_name", "marketing_target_type", "marketing_asset_id", "cost", "view_count", "valid_click_count", "conversions_count", "deep_conversions_count", "activated_count", "reg_pv", "retention_count", "video_outer_play_count", "video_outer_play100_count", "key_behavior_conversions_count", "purchase_pv", "purchase_amount", "first_pay_count",
+                    "ad_monetization_amount","app_ad_paying_users","income_pv_pla","income_val_1","ad_paying_users_d1","income_pv_1d_pla")));
             List<AdqAssetReportDaily> dailies = new ArrayList<>();
             HashMap<String, Set<String>> assetIdsMap = new HashMap<>();
             String s = HttpUtils.httpGet("https://api.e.qq.com/v3.0/daily_reports/get", paramsMap, null);
@@ -59,9 +61,11 @@ public class AdqAssetReportServiceImpl implements IAdqAssetReportService {
                         if (!Check.isNull(list)) {
                             for (int i = 0; i < list.size(); i++) {
                                 JSONObject dataJson = list.getJSONObject(i);
+                                System.out.println("dataJson: " + dataJson);
                                 AdqAssetReportDaily report = JSONObject.parseObject(dataJson.toJSONString(), AdqAssetReportDaily.class);
                                 report.setAdvertiserId(advertiserId);
                                 report.setStatTimeDay(Integer.valueOf(dataJson.getString("date").replace("-", "")));
+                                System.out.println("report: " + report);
                                 dailies.add(report);
 
                                 Long marketingAssetId = report.getMarketingAssetId();

+ 2 - 0
job-adq/src/main/java/cn/com/ctop/job/adq/data/service/impl/AdqCreativeCreativeReportServiceImpl.java

@@ -48,6 +48,7 @@ public class AdqCreativeCreativeReportServiceImpl implements IAdqCreativeReportS
             date_range.put("start_date", startDate);
             date_range.put("end_date", endDate);
             paramsMap.put("date_range", date_range);
+            paramsMap.put("time_line", "REPORTING_TIME");
             JSONArray group_by = new JSONArray();
             group_by.add("hour");
             group_by.add("adgroup_id");
@@ -124,6 +125,7 @@ public class AdqCreativeCreativeReportServiceImpl implements IAdqCreativeReportS
             date_range.put("start_date", startDate);
             date_range.put("end_date", endDate);
             paramsMap.put("date_range", date_range);
+            paramsMap.put("time_line", "REPORTING_TIME");
             JSONArray group_by = new JSONArray();
             group_by.add("adgroup_id");
             group_by.add("dynamic_creative_id");

+ 4 - 0
job-adq/src/main/java/cn/com/ctop/job/adq/data/service/impl/AdqRetryReportServiceImpl.java

@@ -49,6 +49,7 @@ public class AdqRetryReportServiceImpl implements IAdqRetryReportService {
         date_range.put("start_date", startDate);
         date_range.put("end_date", endDate);
         paramsMap.put("date_range", date_range);
+        paramsMap.put("time_line", "REPORTING_TIME");
         JSONArray group_by = new JSONArray();
         group_by.add("hour");
         group_by.add("adgroup_id");
@@ -113,6 +114,7 @@ public class AdqRetryReportServiceImpl implements IAdqRetryReportService {
             date_range.put("start_date", startDate);
             date_range.put("end_date", endDate);
             paramsMap.put("date_range", date_range);
+            paramsMap.put("time_line", "REPORTING_TIME");
             JSONArray group_by = new JSONArray();
             group_by.add("adgroup_id");
             group_by.add("dynamic_creative_id");
@@ -178,6 +180,7 @@ public class AdqRetryReportServiceImpl implements IAdqRetryReportService {
             date_range.put("start_date", startDate);
             date_range.put("end_date", endDate);
             paramsMap.put("date_range", date_range);
+            paramsMap.put("time_line", "REPORTING_TIME");
             JSONArray group_by = new JSONArray();
             group_by.add("date");
             group_by.add("hour");
@@ -242,6 +245,7 @@ public class AdqRetryReportServiceImpl implements IAdqRetryReportService {
             date_range.put("start_date", startDate);
             date_range.put("end_date", endDate);
             paramsMap.put("date_range", date_range);
+            paramsMap.put("time_line", "REPORTING_TIME");
             JSONArray group_by = new JSONArray();
             group_by.add("date");
             paramsMap.put("group_by", group_by);

+ 24 - 0
job-adq/src/main/java/cn/com/ctop/job/adq/data/utils/FieldsConfig.java

@@ -25,6 +25,12 @@ public class FieldsConfig {
         fields.add("purchase_pv");
         fields.add("purchase_amount");
         fields.add("first_pay_count");
+        fields.add("ad_monetization_amount"); //广告变现金额。
+        fields.add("app_ad_paying_users"); //广告变现人数
+        fields.add("income_pv_pla"); //广告变现次数
+        fields.add("income_val_1"); //激活首日广告变现金额
+        fields.add("ad_paying_users_d1"); //激活首日广告变现人数
+        fields.add("income_pv_1d_pla"); //注册首日广告变现次数
         return fields;
     }
 
@@ -47,6 +53,12 @@ public class FieldsConfig {
         fields.add("purchase_pv");
         fields.add("purchase_amount");
         fields.add("first_pay_count");
+        fields.add("ad_monetization_amount"); //广告变现金额。
+        fields.add("app_ad_paying_users"); //广告变现人数
+        fields.add("income_pv_pla"); //广告变现次数
+        fields.add("income_val_1"); //激活首日广告变现金额
+        fields.add("ad_paying_users_d1"); //激活首日广告变现人数
+        fields.add("income_pv_1d_pla"); //注册首日广告变现次数
         return fields;
     }
 
@@ -73,6 +85,12 @@ public class FieldsConfig {
         fields.add("purchase_pv");
         fields.add("purchase_amount");
         fields.add("first_pay_count");
+        fields.add("ad_monetization_amount"); //广告变现金额。
+        fields.add("app_ad_paying_users"); //广告变现人数
+        fields.add("income_pv_pla"); //广告变现次数
+        fields.add("income_val_1"); //激活首日广告变现金额
+        fields.add("ad_paying_users_d1"); //激活首日广告变现人数
+        fields.add("income_pv_1d_pla"); //注册首日广告变现次数
         return fields;
 
     }
@@ -100,6 +118,12 @@ public class FieldsConfig {
         fields.add("purchase_pv");
         fields.add("purchase_amount");
         fields.add("first_pay_count");
+        fields.add("ad_monetization_amount"); //广告变现金额。
+        fields.add("app_ad_paying_users"); //广告变现人数
+        fields.add("income_pv_pla"); //广告变现次数
+        fields.add("income_val_1"); //激活首日广告变现金额
+        fields.add("ad_paying_users_d1"); //激活首日广告变现人数
+        fields.add("income_pv_1d_pla"); //注册首日广告变现次数
         return fields;
 
     }

+ 2 - 2
job-adq/src/main/resources/application.yml

@@ -80,8 +80,8 @@ spring:
         connectionProperties: druid.stat.mergeSql\=true;druid.stat.slowSqlMillis\=5000
       datasource:
         master:
-          url: jdbc:mysql://172.16.0.117:3390/media_api?characterEncoding=UTF-8&useUnicode=true&useSSL=false
-         # url: jdbc:mysql://8.147.135.80:3390/media_api?characterEncoding=UTF-8&useUnicode=true&useSSL=false
+          #url: jdbc:mysql://172.16.0.117:3390/media_api?characterEncoding=UTF-8&useUnicode=true&useSSL=false
+          url: jdbc:mysql://8.147.135.80:3390/media_api?characterEncoding=UTF-8&useUnicode=true&useSSL=false
           username: data
           password: hr@2025..
           driver-class-name: com.mysql.jdbc.Driver