Pārlūkot izejas kodu

修改快手计划报表实体类

songyinghao 4 gadi atpakaļ
vecāks
revīzija
fb77e6a874

+ 0 - 19
jeecg-boot-module-activiti/src/main/resources/static/activiti/editor-app/libs/es5-shim-15.3.4.5/LICENSE

@@ -1,19 +0,0 @@
-
-Copyright 2009, 2010 Kristopher Michael Kowal. All rights reserved.
-Permission is hereby granted, free of charge, to any person obtaining a copy
-of this software and associated documentation files (the "Software"), to
-deal in the Software without restriction, including without limitation the
-rights to use, copy, modify, merge, publish, distribute, sublicense, and/or
-sell copies of the Software, and to permit persons to whom the Software is
-furnished to do so, subject to the following conditions:
-
-The above copyright notice and this permission notice shall be included in
-all copies or substantial portions of the Software.
-
-THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
-AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
-LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
-FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS
-IN THE SOFTWARE.

+ 0 - 20
jeecg-boot-module-activiti/src/main/resources/static/activiti/editor-app/libs/json3_3.2.6/LICENSE

@@ -1,20 +0,0 @@
-Copyright (c) 2012-2013 Kit Cambridge.
-http://kitcambridge.be/
-
-Permission is hereby granted, free of charge, to any person obtaining a copy of
-this software and associated documentation files (the "Software"), to deal in
-the Software without restriction, including without limitation the rights to
-use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies
-of the Software, and to permit persons to whom the Software is furnished to do
-so, subject to the following conditions:
-
-The above copyright notice and this permission notice shall be included in all
-copies or substantial portions of the Software.
-
-THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
-AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
-LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
-OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
-SOFTWARE.

+ 4 - 4
jeecg-boot-module-system/src/main/resources/application-wps.yml

@@ -56,9 +56,9 @@ spring:
   autoconfigure:
     exclude: com.alibaba.druid.spring.boot.autoconfigure.DruidDataSourceAutoConfigure
   datasource:
-    url: jdbc:mysql://139.186.27.96:3306/jeecg-boot?characterEncoding=UTF-8&useUnicode=true&useSSL=false
+    url: jdbc:mysql://139.186.27.96:4000/jeecg-boot?characterEncoding=UTF-8&useUnicode=true&useSSL=false
     username: hcst
-    password: test@20190531
+    password: hcst@2020
     driver-class-name: com.mysql.jdbc.Driver
     druid:
       stat-view-servlet:
@@ -96,9 +96,9 @@ spring:
         connectionProperties: druid.stat.mergeSql\=true;druid.stat.slowSqlMillis\=5000
       datasource:
         master:
-          url: jdbc:mysql://139.186.27.96:3306/jeecg-boot?characterEncoding=UTF-8&useUnicode=true&useSSL=false
+          url: jdbc:mysql://139.186.27.96:4000/jeecg-boot?characterEncoding=UTF-8&useUnicode=true&useSSL=false
           username: hcst
-          password: test@20190531
+          password: hcst@2020
           driver-class-name: com.mysql.jdbc.Driver
   #redis 配置
   redis:

+ 6 - 5
jeecg-boot-module-system/src/test/java/org/jeecg/SampleTest.java

@@ -22,6 +22,7 @@ import cn.com.ctop.toutiao.modules.material.service.IByteDanceAdvertiserDataServ
 import cn.com.ctop.toutiao.modules.report.service.IBytedanceFundDailyService;
 import cn.com.ctop.toutiao.modules.report.service.IReportService;
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
+import com.xxl.job.core.context.XxlJobHelper;
 import lombok.extern.slf4j.Slf4j;
 import org.jeecg.common.util.DateUtils;
 import org.junit.Test;
@@ -141,11 +142,11 @@ public class SampleTest {
     }
 
     @Test
-    public void loadBytedancePlanData() {
-        CtopOauthToken token = tokenService.getTokenByAccountId(100198696723L);
-//        advertiserDataService.getAdvertiserPlan(token, "", null, null);
-        Date getDate = DateUtils.addDay(new Date(), 0);
-        reportService.getAdvertiserReport(token, getDate, getDate, CtopAdConstant.BYTEDANCE_REPORT_TYPE_HOURLY);
+    public void loadKuaishouPlanData() {
+        Date getDate = DateUtils.addDay(new Date(), -1);
+        //1:查询当日数据
+        List<CtopOauthToken> tokens = tokenService.selectKuaiShouToken();
+        tokens.forEach(token -> kuaishouInterfaceService.getAdvertiserCampaignReportDaily(token, getDate, getDate));
     }
 
     @Autowired

+ 1 - 0
module-kuaishou/src/main/java/cn/com/ctop/kuaishou/modules/batch/service/impl/KuaishouInterfaceServiceImpl.java

@@ -353,6 +353,7 @@ public class KuaishouInterfaceServiceImpl implements IKuaishouInterfaceService {
 
         String result = HttpUtils.httpPostRequest(url, param, headers);
         JSONObject resultJson = JSONObject.parseObject(result);
+        System.out.println(resultJson);
         Integer code = resultJson.getInteger("code");
         String message = resultJson.getString("message");
         if (null == code || code != 0) {

+ 13 - 2
module-kuaishou/src/main/java/cn/com/ctop/kuaishou/modules/report/entity/KuaishouReportDailyCampaign.java

@@ -34,9 +34,9 @@ public class KuaishouReportDailyCampaign implements Serializable {
     @JsonProperty
     private Long bclick;
     @JsonProperty("photo_share")
-    private Long share;
+    private Long photoShare;
     @JsonProperty("photo_comment")
-    private Long comment;
+    private Long photoComment;
     @JsonProperty
     private Long photoLike;
     @JsonProperty
@@ -64,6 +64,10 @@ public class KuaishouReportDailyCampaign implements Serializable {
     @JsonProperty("impression_1k_cost")
     @TableField("impression_1k_cost")
     private BigDecimal impression1kCost;
+
+    @JsonProperty("play_3s_ratio")
+    @TableField("play_3s_ratio")
+    private BigDecimal play3sRatio;
     @JsonProperty
     private BigDecimal photoClickCost;
     @JsonProperty
@@ -82,6 +86,11 @@ public class KuaishouReportDailyCampaign implements Serializable {
     private Long eventRegister;
     @JsonProperty
     private BigDecimal eventRegisterCost;
+    private BigDecimal eventRegisterRatio;
+    private BigDecimal eventCreditGrantLandingRatio;
+    private BigDecimal eventNextDayStayCost;
+    private Long eventNextDayStay;
+    private BigDecimal eventNextDayStayRatio;
     @JsonProperty
     private Long eventJinJianApp;
     @JsonProperty
@@ -114,6 +123,8 @@ public class KuaishouReportDailyCampaign implements Serializable {
     private Long eventCreditGrantLandingPage;
     @JsonProperty
     private BigDecimal eventCreditGrantLandingPageCost;
+    private Integer status;
+    private String campaignName;
     @JsonProperty
     private Date createTime;
     @JsonProperty

+ 1 - 1
module-kuaishou/src/main/java/cn/com/ctop/kuaishou/modules/report/mapper/xml/KuaishouReportDailyCampaignMapper.xml

@@ -168,7 +168,7 @@
         values
         <foreach collection="records" item="record" separator=",">
             (
-            #{record.accountId}},
+            #{record.accountId},
             #{record.campaignId},
             #{record.status},
             #{record.campaignName},