소스 검색

Merge remote-tracking branch 'origin/master'

zhaoxian 4 년 전
부모
커밋
6a0d0df63c
39개의 변경된 파일1089개의 추가작업 그리고 975개의 파일을 삭제
  1. 0 19
      jeecg-boot-module-activiti/src/main/resources/static/activiti/editor-app/libs/es5-shim-15.3.4.5/LICENSE
  2. 0 20
      jeecg-boot-module-activiti/src/main/resources/static/activiti/editor-app/libs/json3_3.2.6/LICENSE
  3. 0 9
      jeecg-boot-module-system/pom.xml
  4. 0 18
      jeecg-boot-module-system/src/main/java/org/jeecg/config/WebSocketConfig.java
  5. 1 1
      jeecg-boot-module-system/src/main/resources/application-dev.yml
  6. 4 4
      jeecg-boot-module-system/src/main/resources/application-prod.yml
  7. 3 3
      jeecg-boot-module-system/src/main/resources/application-prod2.yml
  8. 4 4
      jeecg-boot-module-system/src/main/resources/application-wps.yml
  9. 18 22
      jeecg-boot-module-system/src/test/java/org/jeecg/SampleTest.java
  10. 4 4
      module-common/src/main/java/cn/com/ctop/common/module/mapper/xml/MaterialAscriptionMapper.xml
  11. 1 1
      module-job-bytedance/src/main/java/cn/com/ctop/job/bytedance/handler/BytedanceAdvertiserDailyReportLoadJob.java
  12. 1 1
      module-job-bytedance/src/main/resources/application-jiaoyang.yml
  13. 50 0
      module-job-kuaishou/src/main/java/cn/com/ctop/job/kuaishou/handler/DeleteKuaishouCommentJob.java
  14. 37 0
      module-job-kuaishou/src/main/java/cn/com/ctop/job/kuaishou/handler/KuaishouMatDailyReportJob.java
  15. 1 1
      module-job-kuaishou/src/main/resources/application-dev.yml
  16. 0 185
      module-job-kuaishou/src/main/resources/application-jiaoyang.yml
  17. 7 7
      module-job-kuaishou/src/main/resources/application-prod.yml
  18. 1 1
      module-job-kuaishou/src/main/resources/application-test.yml
  19. 2 0
      module-kuaishou/src/main/java/cn/com/ctop/kuaishou/modules/batch/mapper/KuaiShouReportDailyMaterialMapper.java
  20. 133 0
      module-kuaishou/src/main/java/cn/com/ctop/kuaishou/modules/batch/mapper/xml/KuaiShouReportDailyMaterialMapper.xml
  21. 4 0
      module-kuaishou/src/main/java/cn/com/ctop/kuaishou/modules/batch/service/IKuaiShouReportDailyMaterialService.java
  22. 66 0
      module-kuaishou/src/main/java/cn/com/ctop/kuaishou/modules/batch/service/impl/KuaiShouReportDailyMaterialServiceImpl.java
  23. 14 9
      module-kuaishou/src/main/java/cn/com/ctop/kuaishou/modules/batch/service/impl/KuaishouInterfaceServiceImpl.java
  24. 18 7
      module-kuaishou/src/main/java/cn/com/ctop/kuaishou/modules/report/entity/KuaishouReportDailyCampaign.java
  25. 0 2
      module-kuaishou/src/main/java/cn/com/ctop/kuaishou/modules/report/entity/KuaishouReportDailyCreative.java
  26. 4 0
      module-kuaishou/src/main/java/cn/com/ctop/kuaishou/modules/report/mapper/KuaishouReportDailyCampaignMapper.java
  27. 107 107
      module-kuaishou/src/main/java/cn/com/ctop/kuaishou/modules/report/mapper/xml/AccountReportMapper.xml
  28. 31 31
      module-kuaishou/src/main/java/cn/com/ctop/kuaishou/modules/report/mapper/xml/DailyReportMapper.xml
  29. 69 69
      module-kuaishou/src/main/java/cn/com/ctop/kuaishou/modules/report/mapper/xml/KuaiShouYiCheReportMapper.xml
  30. 204 230
      module-kuaishou/src/main/java/cn/com/ctop/kuaishou/modules/report/mapper/xml/KuaishouReportDailyAccountMapper.xml
  31. 36 36
      module-kuaishou/src/main/java/cn/com/ctop/kuaishou/modules/report/mapper/xml/KuaishouReportDailyAgentSumMapper.xml
  32. 123 1
      module-kuaishou/src/main/java/cn/com/ctop/kuaishou/modules/report/mapper/xml/KuaishouReportDailyCampaignMapper.xml
  33. 78 78
      module-kuaishou/src/main/java/cn/com/ctop/kuaishou/modules/report/mapper/xml/MaterialReportMapper.xml
  34. 3 0
      module-kuaishou/src/main/java/cn/com/ctop/kuaishou/modules/report/service/IKuaishouReportDailyCampaignService.java
  35. 9 0
      module-kuaishou/src/main/java/cn/com/ctop/kuaishou/modules/report/service/impl/KuaishouReportDailyCampaignServiceImpl.java
  36. 0 1
      module-oa/src/main/java/cn/com/ctop/oa/modules/controller/WechatNoListController.java
  37. 51 99
      module-toutiao/src/main/java/cn/com/ctop/toutiao/modules/report/mapper/xml/ByteDanceVideoReportDailyMapper.xml
  38. 2 2
      module-toutiao/src/main/resources/json_template/bytedance_filed_mapping.json
  39. 3 3
      module-toutiao/src/main/resources/json_template/bytedance_video_report_mapping.json

+ 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.

+ 0 - 9
jeecg-boot-module-system/pom.xml

@@ -46,11 +46,6 @@
             <artifactId>jeecg-boot-base-common</artifactId>
             <artifactId>jeecg-boot-base-common</artifactId>
             <version>2.0.2</version>
             <version>2.0.2</version>
         </dependency>
         </dependency>
-      <!--  <dependency>
-            <groupId>org.jeecgframework.boot</groupId>
-            <artifactId>jeecg-boot-module-activiti</artifactId>
-            <version>2.2.0</version>
-        </dependency>-->
         <dependency>
         <dependency>
             <groupId>cn.com.ctop</groupId>
             <groupId>cn.com.ctop</groupId>
             <artifactId>module-check</artifactId>
             <artifactId>module-check</artifactId>
@@ -63,10 +58,6 @@
             <version>1.15.6</version>
             <version>1.15.6</version>
         </dependency>
         </dependency>
         <dependency>
         <dependency>
-            <groupId>org.springframework.boot</groupId>
-            <artifactId>spring-boot-starter-websocket</artifactId>
-        </dependency>
-        <dependency>
             <groupId>org.slf4j</groupId>
             <groupId>org.slf4j</groupId>
             <artifactId>jcl-over-slf4j</artifactId>
             <artifactId>jcl-over-slf4j</artifactId>
         </dependency>
         </dependency>

+ 0 - 18
jeecg-boot-module-system/src/main/java/org/jeecg/config/WebSocketConfig.java

@@ -1,18 +0,0 @@
-package org.jeecg.config;
-
-import org.springframework.context.annotation.Bean;
-import org.springframework.context.annotation.Configuration;
-import org.springframework.web.socket.server.standard.ServerEndpointExporter;
-
-@Configuration
-public class WebSocketConfig {
-    /**
-     * 	注入ServerEndpointExporter,
-     * 	这个bean会自动注册使用了@ServerEndpoint注解声明的Websocket endpoint
-     */
-    @Bean
-    public ServerEndpointExporter serverEndpointExporter() {
-        return new ServerEndpointExporter();
-    }
-    
-}

+ 1 - 1
jeecg-boot-module-system/src/main/resources/application-dev.yml

@@ -135,7 +135,7 @@ spring:
         connectionProperties: druid.stat.mergeSql\=true;druid.stat.slowSqlMillis\=5000
         connectionProperties: druid.stat.mergeSql\=true;druid.stat.slowSqlMillis\=5000
       datasource:
       datasource:
         master:
         master:
-          url: jdbc:mysql://172.30.0.4:4000/jeecg-boot?characterEncoding=UTF-8&useUnicode=true&allowMultiQueries=true
+          url: jdbc:mysql://139.186.27.96:4000/jeecg-boot?characterEncoding=UTF-8&useUnicode=true&allowMultiQueries=true
           username: hcst
           username: hcst
           password: hcst@2020
           password: hcst@2020
           driver-class-name: com.mysql.jdbc.Driver
           driver-class-name: com.mysql.jdbc.Driver

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

@@ -67,14 +67,14 @@ spring:
   autoconfigure:
   autoconfigure:
     exclude: com.alibaba.druid.spring.boot.autoconfigure.DruidDataSourceAutoConfigure
     exclude: com.alibaba.druid.spring.boot.autoconfigure.DruidDataSourceAutoConfigure
   datasource:
   datasource:
-    url: jdbc:mysql://172.30.0.4:3306/jeecg-boot?characterEncoding=UTF-8&useUnicode=true&useSSL=false
+    url: jdbc:mysql://172.30.0.4:4000/jeecg-boot?characterEncoding=UTF-8&useUnicode=true
     username: hcst
     username: hcst
-    password: test@20190531
+    password: hcst@2020
     driver-class-name: com.mysql.jdbc.Driver
     driver-class-name: com.mysql.jdbc.Driver
     druid:
     druid:
       stat-view-servlet:
       stat-view-servlet:
         loginUsername: admin
         loginUsername: admin
-        loginPassword: hcst2016
+        loginPassword: hcst20161
         enabled: true
         enabled: true
       web-stat-filter:
       web-stat-filter:
         enabled: true
         enabled: true
@@ -106,7 +106,7 @@ spring:
         connectionProperties: druid.stat.mergeSql\=true;druid.stat.slowSqlMillis\=5000
         connectionProperties: druid.stat.mergeSql\=true;druid.stat.slowSqlMillis\=5000
       datasource:
       datasource:
         master:
         master:
-          url: jdbc:mysql://172.30.0.4:4000/jeecg-boot?characterEncoding=UTF-8&useUnicode=true&allowMultiQueries=true
+          url: jdbc:mysql://172.30.0.4:4000/jeecg-boot?characterEncoding=UTF-8&useUnicode=true
           username: hcst
           username: hcst
           password: hcst@2020
           password: hcst@2020
           driver-class-name: com.mysql.jdbc.Driver
           driver-class-name: com.mysql.jdbc.Driver

+ 3 - 3
jeecg-boot-module-system/src/main/resources/application-prod2.yml

@@ -93,14 +93,14 @@ spring:
         poolPreparedStatements: true
         poolPreparedStatements: true
         maxPoolPreparedStatementPerConnectionSize: 20
         maxPoolPreparedStatementPerConnectionSize: 20
         # 配置监控统计拦截的filters,去掉后监控界面sql无法统计,'wall'用于防火墙
         # 配置监控统计拦截的filters,去掉后监控界面sql无法统计,'wall'用于防火墙
-        filters: stat,slf4j
+        filters: stat,wall,slf4j
         # 通过connectProperties属性来打开mergeSql功能;慢SQL记录
         # 通过connectProperties属性来打开mergeSql功能;慢SQL记录
         connectionProperties: druid.stat.mergeSql\=true;druid.stat.slowSqlMillis\=5000
         connectionProperties: druid.stat.mergeSql\=true;druid.stat.slowSqlMillis\=5000
       datasource:
       datasource:
         master:
         master:
-          url: jdbc:mysql://172.30.0.4:3306/jeecg-boot?characterEncoding=UTF-8&useUnicode=true&useSSL=false
+          url: jdbc:mysql://172.30.0.4:4000/jeecg-boot?characterEncoding=UTF-8&useUnicode=true
           username: hcst
           username: hcst
-          password: test@20190531
+          password: hcst@2020
           driver-class-name: com.mysql.jdbc.Driver
           driver-class-name: com.mysql.jdbc.Driver
           # 多数据源配置
           # 多数据源配置
           #multi-datasource1:
           #multi-datasource1:

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

@@ -56,9 +56,9 @@ spring:
   autoconfigure:
   autoconfigure:
     exclude: com.alibaba.druid.spring.boot.autoconfigure.DruidDataSourceAutoConfigure
     exclude: com.alibaba.druid.spring.boot.autoconfigure.DruidDataSourceAutoConfigure
   datasource:
   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
     username: hcst
-    password: test@20190531
+    password: hcst@2020
     driver-class-name: com.mysql.jdbc.Driver
     driver-class-name: com.mysql.jdbc.Driver
     druid:
     druid:
       stat-view-servlet:
       stat-view-servlet:
@@ -96,9 +96,9 @@ spring:
         connectionProperties: druid.stat.mergeSql\=true;druid.stat.slowSqlMillis\=5000
         connectionProperties: druid.stat.mergeSql\=true;druid.stat.slowSqlMillis\=5000
       datasource:
       datasource:
         master:
         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
           username: hcst
-          password: test@20190531
+          password: hcst@2020
           driver-class-name: com.mysql.jdbc.Driver
           driver-class-name: com.mysql.jdbc.Driver
   #redis 配置
   #redis 配置
   redis:
   redis:

+ 18 - 22
jeecg-boot-module-system/src/test/java/org/jeecg/SampleTest.java

@@ -6,14 +6,12 @@ import cn.com.ctop.common.module.entity.CtopOauthToken;
 import cn.com.ctop.common.module.entity.UserAllocation;
 import cn.com.ctop.common.module.entity.UserAllocation;
 import cn.com.ctop.common.module.service.IBindAccountLoginService;
 import cn.com.ctop.common.module.service.IBindAccountLoginService;
 import cn.com.ctop.common.module.service.ICtopOauthTokenService;
 import cn.com.ctop.common.module.service.ICtopOauthTokenService;
-import cn.com.ctop.common.module.service.ISendMessageService;
 import cn.com.ctop.common.module.service.IUserAllocationService;
 import cn.com.ctop.common.module.service.IUserAllocationService;
 import cn.com.ctop.common.module.utils.CtopAdConstant;
 import cn.com.ctop.common.module.utils.CtopAdConstant;
 import cn.com.ctop.kuaishou.modules.batch.service.IKuaiShouDailyReportTaskService;
 import cn.com.ctop.kuaishou.modules.batch.service.IKuaiShouDailyReportTaskService;
 import cn.com.ctop.kuaishou.modules.batch.service.IKuaiShouHistoryReportTaskService;
 import cn.com.ctop.kuaishou.modules.batch.service.IKuaiShouHistoryReportTaskService;
 import cn.com.ctop.kuaishou.modules.batch.service.IKuaishouInterfaceService;
 import cn.com.ctop.kuaishou.modules.batch.service.IKuaishouInterfaceService;
 import cn.com.ctop.kuaishou.modules.graphql.service.IKuaishouWebInterfaceService;
 import cn.com.ctop.kuaishou.modules.graphql.service.IKuaishouWebInterfaceService;
-import cn.com.ctop.kuaishou.modules.report.mapper.KuaishouReportDailyAccountMapper;
 import cn.com.ctop.kuaishou.modules.report.service.IKuaishouCostGroupService;
 import cn.com.ctop.kuaishou.modules.report.service.IKuaishouCostGroupService;
 import cn.com.ctop.kuaishou.modules.report.service.IKuaishouReportDailyAgentService;
 import cn.com.ctop.kuaishou.modules.report.service.IKuaishouReportDailyAgentService;
 import cn.com.ctop.oa.modules.service.IWechatCheckinDataService;
 import cn.com.ctop.oa.modules.service.IWechatCheckinDataService;
@@ -57,11 +55,8 @@ public class SampleTest {
     private IByteDanceAdvertiserDataService advertiserDataService;
     private IByteDanceAdvertiserDataService advertiserDataService;
     @Autowired
     @Autowired
     private IKuaiShouHistoryReportTaskService kuaiShouHistoryReportTaskService;
     private IKuaiShouHistoryReportTaskService kuaiShouHistoryReportTaskService;
-
     @Autowired
     @Autowired
     private ICtopOauthTokenService tokenService;
     private ICtopOauthTokenService tokenService;
-    @Autowired
-    private KuaishouReportDailyAccountMapper reportDailyAccountMapper;
 
 
     @Test
     @Test
     public void loadBytedanceCreativeData() {
     public void loadBytedanceCreativeData() {
@@ -80,10 +75,7 @@ public class SampleTest {
 
 
     @Test
     @Test
     public void loadKuaishouCookie() {
     public void loadKuaishouCookie() {
-        reportDailyAccountMapper.loadAccountDailyReport(23212L, "D://report2//8206288_1.csv");
-
-
-       /* List<BindAccountLogin> list = bindAccountLoginService.getListByParams(CtopAdConstant.PLATFORM_TYPE_KUAISHOU_PY, 1);
+        List<BindAccountLogin> list = bindAccountLoginService.getListByParams(CtopAdConstant.PLATFORM_TYPE_KUAISHOU_PY, 1);
         if (list != null && !list.isEmpty()) {
         if (list != null && !list.isEmpty()) {
             int i = 0;
             int i = 0;
             for (BindAccountLogin login : list) {
             for (BindAccountLogin login : list) {
@@ -92,11 +84,10 @@ public class SampleTest {
                     i++;
                     i++;
                 }
                 }
             }
             }
-        }*/
+        }
     }
     }
 
 
     static ExecutorService executorService = null;
     static ExecutorService executorService = null;
-    //线程计数器/bytedance/bytedanceMaterialReport
     static CountDownLatch countDownLatch = null;
     static CountDownLatch countDownLatch = null;
 
 
     @Test
     @Test
@@ -143,11 +134,11 @@ public class SampleTest {
     }
     }
 
 
     @Test
     @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
     @Autowired
@@ -258,14 +249,19 @@ public class SampleTest {
         }
         }
     }
     }
 
 
-    @Autowired
-    private ISendMessageService sendMessageService;
-
     @Test
     @Test
-    public void testSendMessage() {
-        sendMessageService.sendMessage("c445fec9a80347aea54e8db66692ec03", "测试信息发送!");
+    public void loadKuaishouHourlyReportData(){
+        Date getDate = new Date();
+        SimpleDateFormat simpleDateFormat = new SimpleDateFormat("HH");
+        String hour = simpleDateFormat.format(getDate);
+        if ("00".equals(hour)) {
+            getDate = DateUtils.addDay(getDate, -1);
+        }
+        //1:查询当日数据
+        List<CtopOauthToken> tokens = tokenService.selectKuaiShouToken();
+        Date finalGetDate = getDate;
+        tokens.forEach(token -> kuaishouInterfaceService.getAdvertiserReportHourly(token, finalGetDate, finalGetDate));
     }
     }
-
     @Autowired
     @Autowired
     private IKuaishouInterfaceService kuaishouInterfaceService;
     private IKuaishouInterfaceService kuaishouInterfaceService;
 
 

+ 4 - 4
module-common/src/main/java/cn/com/ctop/common/module/mapper/xml/MaterialAscriptionMapper.xml

@@ -9,7 +9,7 @@
         then (select realname from sys_user where id = clip_id)
         then (select realname from sys_user where id = clip_id)
         else ""
         else ""
         end
         end
-        ) clipName, -- 剪辑人姓名
+        ) clipName, /*剪辑人姓名*/
 
 
         clip_id clipId,
         clip_id clipId,
         (case
         (case
@@ -17,7 +17,7 @@
         then (select realname from sys_user where id = shot_id)
         then (select realname from sys_user where id = shot_id)
         else ""
         else ""
         end
         end
-        ) shotName, -- 拍摄人姓名
+        ) shotName, /*拍摄人姓名*/
         shot_id shotId,
         shot_id shotId,
 
 
          (case
          (case
@@ -25,7 +25,7 @@
         then (select realname from sys_user where id = plan_id)
         then (select realname from sys_user where id = plan_id)
         else ""
         else ""
         end
         end
-        ) planName, -- 策划人姓名
+        ) planName, /*策划人姓名*/
         plan_id planId,
         plan_id planId,
 
 
          (case
          (case
@@ -33,7 +33,7 @@
         then (select realname from sys_user where id = plane_id)
         then (select realname from sys_user where id = plane_id)
         else ""
         else ""
         end
         end
-        ) planeName, -- 平面姓名
+        ) planeName, /*平面姓名*/
         plane_id planeId
         plane_id planeId
         from ctop_material_ascription
         from ctop_material_ascription
         where material_id = #{materialId}
         where material_id = #{materialId}

+ 1 - 1
module-job-bytedance/src/main/java/cn/com/ctop/job/bytedance/handler/BytedanceAdvertiserDailyReportLoadJob.java

@@ -30,7 +30,7 @@ public class BytedanceAdvertiserDailyReportLoadJob {
     static ExecutorService executorService = Executors.newFixedThreadPool(5);;
     static ExecutorService executorService = Executors.newFixedThreadPool(5);;
 
 
     @XxlJob("bytedanceAdvertiserDailyReport")
     @XxlJob("bytedanceAdvertiserDailyReport")
-    public void execute(String params) throws Exception {
+    public void execute() throws Exception {
         XxlJobHelper.log("头条广告主日报获取任务执行开始");
         XxlJobHelper.log("头条广告主日报获取任务执行开始");
         Date getDate = DateUtils.addDay(new Date(), -1);
         Date getDate = DateUtils.addDay(new Date(), -1);
         //1:查询当日数据
         //1:查询当日数据

+ 1 - 1
module-job-bytedance/src/main/resources/application-jiaoyang.yml

@@ -176,4 +176,4 @@ xxl:
       logpath: /data/applogs/xxl-job/jobhandler
       logpath: /data/applogs/xxl-job/jobhandler
       logretentiondays: 30
       logretentiondays: 30
     admin:
     admin:
-      addresses: 129.28.150.229:8090/xxl-job-admin/
+      addresses: http://129.28.150.229:8090/xxl-job-admin

+ 50 - 0
module-job-kuaishou/src/main/java/cn/com/ctop/job/kuaishou/handler/DeleteKuaishouCommentJob.java

@@ -0,0 +1,50 @@
+package cn.com.ctop.job.kuaishou.handler;
+
+import cn.com.ctop.common.module.entity.BindAccountLogin;
+import cn.com.ctop.common.module.service.IBindAccountLoginService;
+import cn.com.ctop.common.module.utils.CtopAdConstant;
+import cn.com.ctop.kuaishou.modules.graphql.service.IKuaishouWebInterfaceService;
+import com.xxl.job.core.context.XxlJobHelper;
+import com.xxl.job.core.handler.annotation.XxlJob;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Component;
+
+import java.util.HashMap;
+import java.util.List;
+import java.util.concurrent.CountDownLatch;
+import java.util.concurrent.ExecutorService;
+import java.util.concurrent.Executors;
+
+@Component
+public class DeleteKuaishouCommentJob {
+    @Autowired
+    private IBindAccountLoginService bindAccountLoginService;
+    @Autowired
+    private IKuaishouWebInterfaceService kuaishouWebInterfaceService;
+    static ExecutorService executorService = Executors.newFixedThreadPool(5);
+    static CountDownLatch countDownLatch = null;
+    @XxlJob("deleteKuaishouComment")
+    public void deleteKuaishouComment(){
+        Long start = System.currentTimeMillis();
+        List<BindAccountLogin> loginList = bindAccountLoginService.getListByParams(CtopAdConstant.PLATFORM_TYPE_KUAISHOU_PY, 1);
+        if (loginList != null && !loginList.isEmpty()) {
+            countDownLatch = new CountDownLatch(loginList.size());
+            loginList.forEach(login -> executorService.submit(() -> {
+                try {
+                    kuaishouWebInterfaceService.deleteAllComment(new HashMap<>(), login);
+                } catch (Exception e) {
+                    XxlJobHelper.log(e.getMessage(), e);
+                } finally {
+                    countDownLatch.countDown();
+                }
+            }));
+            try {
+                countDownLatch.await();
+            } catch (InterruptedException e) {
+                e.printStackTrace();
+            }
+            Long end = System.currentTimeMillis();
+            XxlJobHelper.log("快手删评论所用时长:{}毫秒", end - start);
+        }
+    }
+}

+ 37 - 0
module-job-kuaishou/src/main/java/cn/com/ctop/job/kuaishou/handler/KuaishouMatDailyReportJob.java

@@ -0,0 +1,37 @@
+package cn.com.ctop.job.kuaishou.handler;
+
+import cn.com.ctop.common.module.entity.CtopOauthToken;
+import cn.com.ctop.common.module.service.ICtopOauthTokenService;
+import cn.com.ctop.kuaishou.modules.batch.service.IKuaiShouReportDailyMaterialService;
+import com.xxl.job.core.context.XxlJobHelper;
+import com.xxl.job.core.handler.annotation.XxlJob;
+import org.jeecg.common.util.DateUtils;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Component;
+
+import java.util.List;
+import java.util.concurrent.ExecutorService;
+import java.util.concurrent.Executors;
+
+@Component
+public class KuaishouMatDailyReportJob {
+    @Autowired
+    private ICtopOauthTokenService tokenService;
+    @Autowired
+    private IKuaiShouReportDailyMaterialService kuaiShouReportDailyMaterialService;
+    static ExecutorService executorService = Executors.newFixedThreadPool(10);
+
+    @XxlJob("kuaishouMaterialReportByStateDate")
+    public void execute() throws Exception {
+        //增加接口的开始和结束日期
+        String endDate = DateUtils.getNowDate("yyyy-MM-dd");
+        String startDate = DateUtils.getAnotherDay("yyyy-MM-dd", endDate, -1);
+        //1:查询当日数据
+        List<CtopOauthToken> tokens = tokenService.selectKuaiShouToken();
+        tokens.forEach(token -> executorService.submit(() -> {
+            kuaiShouReportDailyMaterialService.getMaterialReportByAccountIdAndStatDate(token.getAccountId(),token.getAccessToken(),startDate,endDate,1);
+        }));
+        XxlJobHelper.log("快手物料数据同步完成");
+    }
+
+}

+ 1 - 1
module-job-kuaishou/src/main/resources/application-dev.yml

@@ -137,7 +137,7 @@ xxl:
   job:
   job:
     accessToken:
     accessToken:
     executor:
     executor:
-      appname: module-job-bytedance
+      appname: module-job-kuaishou
       port: 9998
       port: 9998
       ip:
       ip:
       logpath: /data/applogs/xxl-job/jobhandler
       logpath: /data/applogs/xxl-job/jobhandler

+ 0 - 185
module-job-kuaishou/src/main/resources/application-jiaoyang.yml

@@ -1,185 +0,0 @@
-management:
-  endpoints:
-    web:
-      exposure:
-        include: metrics,httptrace
-spring:
-  rabbitmq:
-    host: 39.106.184.70
-    port: 5672
-    username: guest
-    password: guest
-  servlet:
-    multipart:
-      max-file-size: -1
-      max-request-size: -1
-  mail:
-    host: smtp.163.com
-    username: jeecgos@163.com
-    password: ??
-    properties:
-      mail:
-        smtp:
-          auth: true
-          starttls:
-            enable: true
-            required: true
-  #json 时间戳统一转换
-  jackson:
-    date-format:   yyyy-MM-dd HH:mm:ss
-    time-zone:   GMT+8
-  aop:
-    proxy-target-class: true
-  #配置freemarker
-  freemarker:
-    # 设置模板后缀名
-    suffix: .ftl
-    # 设置文档类型
-    content-type: text/html
-    # 设置页面编码格式
-    charset: UTF-8
-    # 设置页面缓存
-    cache: false
-    prefer-file-system-access: false
-    # 设置ftl文件路径
-    template-loader-path:
-      - classpath:/templates
-  # 设置静态文件路径,js,css等
-  mvc:
-    static-path-pattern: /**
-  resource:
-    static-locations: classpath:/static/,classpath:/public/
-  autoconfigure:
-    exclude: com.alibaba.druid.spring.boot.autoconfigure.DruidDataSourceAutoConfigure
-  datasource:
-    url: jdbc:mysql://172.30.0.4:4000/jiaoyang?characterEncoding=UTF-8&useUnicode=true&useSSL=false
-    username: hcst
-    password: hcst@2020
-    driver-class-name: com.mysql.jdbc.Driver
-    druid:
-      stat-view-servlet:
-        loginUsername: admin
-        loginPassword: hcst2016
-        enabled: true
-      web-stat-filter:
-        enabled: true
-    #      remove-abandoned: false
-    dynamic:
-      druid: # 全局druid参数,绝大部分值和默认保持一致。(现已支持的参数如下,不清楚含义不要乱设置)
-        # 连接池的配置信息
-        # 初始化大小,最小,最大
-        connection-init-sql: set names utf8mb4
-        initial-size: 5
-        min-idle: 5
-        maxActive: 20
-        # 配置获取连接等待超时的时间
-        maxWait: 60000
-        # 配置间隔多久才进行一次检测,检测需要关闭的空闲连接,单位是毫秒
-        timeBetweenEvictionRunsMillis: 60000
-        # 配置一个连接在池中最小生存的时间,单位是毫秒
-        minEvictableIdleTimeMillis: 300000
-        validationQuery: SELECT 1 FROM DUAL
-        testWhileIdle: true
-        testOnBorrow: false
-        testOnReturn: false
-        # 打开PSCache,并且指定每个连接上PSCache的大小
-        poolPreparedStatements: true
-        maxPoolPreparedStatementPerConnectionSize: 20
-        # 配置监控统计拦截的filters,去掉后监控界面sql无法统计,'wall'用于防火墙
-        filters: stat,slf4j
-        # 通过connectProperties属性来打开mergeSql功能;慢SQL记录
-        connectionProperties: druid.stat.mergeSql\=true;druid.stat.slowSqlMillis\=5000
-      datasource:
-        master:
-          url: jdbc:mysql://172.30.0.4:4000/jeecg-boot?characterEncoding=UTF-8&useUnicode=true&useSSL=false
-          username: hcst
-          password: hcst@2020
-          driver-class-name: com.mysql.jdbc.Driver
-  #redis 配置
-  redis:
-    database: 0
-#    host: 172.30.0.17
-    host: 127.0.0.1
-    lettuce:
-      pool:
-        max-active: 8   #最大连接数据库连接数,设 0 为没有限制
-        max-idle: 8     #最大等待连接中的数量,设 0 为没有限制
-        max-wait: -1ms  #最大建立连接等待时间。如果超过此时间将接到异常。设为-1表示无限制。
-        min-idle: 0     #最小等待连接中的数量,设 0 为没有限制
-      shutdown-timeout: 100ms
-    password: foobared
-#    port: 6379
-#mybatis plus 设置
-mybatis-plus:
-  mapper-locations: classpath*:org/jeecg/modules/**/xml/*Mapper.xml,classpath*:cn/com/ctop/**/xml/*Mapper.xml
-  global-config:
-    # 关闭MP3.0自带的banner
-    banner: false
-    db-config:
-      #主键类型  0:"数据库ID自增",1:"该类型为未设置主键类型", 2:"用户输入ID",3:"全局唯一ID (数字类型唯一ID)", 4:"全局唯一ID UUID",5:"字符串全局唯一ID (idWorker 的字符串表示)";
-      id-type: 4
-      # 默认数据库表下划线命名
-      table-underline: true
-#jeecg专用配置
-jeecg:
-  elasticsearch:
-    cluster-nodes:
-    check-enabled: false
-  uploadType:
-  oss:
-    endpoint:
-    accessKey:
-    secretKey:
-    bucketName:
-    staticDomain:
-  sms:
-    accessKeyId:
-    accessKeySecret:
-  minio:
-    minio_url:
-    minio_name:
-    minio_pass:
-    bucketName:
-  ffmpeg:
-    bin: ffmpeg
-  path:
-    #文件上传根目录 设置
-    upload: /data/upload
-    #webapp文件路径
-    webapp: /data/webapp
-    video-upload: /data/upload/video/
-    image-upload: /data/upload/image/
-    chrome-driver: /usr/bin/chromedriver
-    csv-upload: /data/upload/csv/
-    bak-database-file: /data/data/bak/
-    report-history: /data/upload/report/history/
-    report-daily: /data/upload/report/daily/
-    kuaishou-agent-image: /data/upload/image/temp.png
-    kuaishou-account-captcha-image: /data/upload/image/captcha.png
-kuaishou:
-  group-control:
-    path: http://39.106.184.70
-    port: 4723
-logging:
-  level:
-    root: info
-  config: classpath:logback-prod.xml
-chrome:
-  script:
-    clean: sh /data/webapp/cleanProcess.sh
-oss:
-  replace:
-    replace-value: oss-cn-beijing-internal
-    replace-old-value: oss-cn-beijing
-    download: /data/file/video/
-xxl:
-  job:
-    accessToken:
-    executor:
-      appname: module-job-bytedance
-      port: 9998
-      ip:
-      logpath: /data/applogs/xxl-job/jobhandler
-      logretentiondays: 30
-    admin:
-      addresses: 129.28.150.229:8090/xxl-job-admin/

+ 7 - 7
module-job-kuaishou/src/main/resources/application-prod.yml

@@ -52,7 +52,7 @@ spring:
   autoconfigure:
   autoconfigure:
     exclude: com.alibaba.druid.spring.boot.autoconfigure.DruidDataSourceAutoConfigure
     exclude: com.alibaba.druid.spring.boot.autoconfigure.DruidDataSourceAutoConfigure
   datasource:
   datasource:
-    url: jdbc:mysql://172.30.0.4:4000/jeecg-boot?characterEncoding=UTF-8&useUnicode=true&useSSL=false
+    url: jdbc:mysql://172.30.0.4:4000/jiaoyang?characterEncoding=UTF-8&useUnicode=true&useSSL=false
     username: hcst
     username: hcst
     password: hcst@2020
     password: hcst@2020
     driver-class-name: com.mysql.jdbc.Driver
     driver-class-name: com.mysql.jdbc.Driver
@@ -91,15 +91,15 @@ spring:
         connectionProperties: druid.stat.mergeSql\=true;druid.stat.slowSqlMillis\=5000
         connectionProperties: druid.stat.mergeSql\=true;druid.stat.slowSqlMillis\=5000
       datasource:
       datasource:
         master:
         master:
-          url: jdbc:mysql://172.30.0.4:4000/jeecg-boot?characterEncoding=UTF-8&useUnicode=true&useSSL=false
+          url: jdbc:mysql://172.30.0.4:4000/jiaoyang?characterEncoding=UTF-8&useUnicode=true&useSSL=false
           username: hcst
           username: hcst
           password: hcst@2020
           password: hcst@2020
           driver-class-name: com.mysql.jdbc.Driver
           driver-class-name: com.mysql.jdbc.Driver
   #redis 配置
   #redis 配置
   redis:
   redis:
     database: 0
     database: 0
-#    host: 172.30.0.17
-    host: 127.0.0.1
+    host: 172.30.0.17
+#    host: 127.0.0.1
     lettuce:
     lettuce:
       pool:
       pool:
         max-active: 8   #最大连接数据库连接数,设 0 为没有限制
         max-active: 8   #最大连接数据库连接数,设 0 为没有限制
@@ -108,7 +108,7 @@ spring:
         min-idle: 0     #最小等待连接中的数量,设 0 为没有限制
         min-idle: 0     #最小等待连接中的数量,设 0 为没有限制
       shutdown-timeout: 100ms
       shutdown-timeout: 100ms
     password: foobared
     password: foobared
-#    port: 6379
+    port: 6379
 #mybatis plus 设置
 #mybatis plus 设置
 mybatis-plus:
 mybatis-plus:
   mapper-locations: classpath*:org/jeecg/modules/**/xml/*Mapper.xml,classpath*:cn/com/ctop/**/xml/*Mapper.xml
   mapper-locations: classpath*:org/jeecg/modules/**/xml/*Mapper.xml,classpath*:cn/com/ctop/**/xml/*Mapper.xml
@@ -167,7 +167,6 @@ logging:
 chrome:
 chrome:
   script:
   script:
     clean: sh /data/webapp/cleanProcess.sh
     clean: sh /data/webapp/cleanProcess.sh
-
 oss:
 oss:
   replace:
   replace:
     replace-value: oss-cn-beijing-internal
     replace-value: oss-cn-beijing-internal
@@ -177,10 +176,11 @@ xxl:
   job:
   job:
     accessToken:
     accessToken:
     executor:
     executor:
-      appname: module-job-bytedance
+      appname: module-job-kuaishou
       port: 9998
       port: 9998
       ip:
       ip:
       logpath: /data/applogs/xxl-job/jobhandler
       logpath: /data/applogs/xxl-job/jobhandler
       logretentiondays: 30
       logretentiondays: 30
     admin:
     admin:
+#      addresses: http://129.28.150.229:8090/xxl-job-admin
       addresses: http://139.186.29.76:8090/xxl-job-admin
       addresses: http://139.186.29.76:8090/xxl-job-admin

+ 1 - 1
module-job-kuaishou/src/main/resources/application-test.yml

@@ -155,7 +155,7 @@ xxl:
   job:
   job:
     accessToken:
     accessToken:
     executor:
     executor:
-      appname: module-job-bytedance
+      appname: module-job-kuaishou
       port: 9998
       port: 9998
       ip:
       ip:
       logpath: /data/applogs/xxl-job/jobhandler
       logpath: /data/applogs/xxl-job/jobhandler

+ 2 - 0
module-kuaishou/src/main/java/cn/com/ctop/kuaishou/modules/batch/mapper/KuaiShouReportDailyMaterialMapper.java

@@ -27,4 +27,6 @@ public interface KuaiShouReportDailyMaterialMapper extends BaseMapper<KuaiShouRe
     List<KuaiShouReportDailyMaterialVo> getPhotoListByDate(@Param("statDate") String statDate);
     List<KuaiShouReportDailyMaterialVo> getPhotoListByDate(@Param("statDate") String statDate);
 
 
     List<KuaiShouVideoGetVo> getVideoList(Map<String, Object> requestMap);
     List<KuaiShouVideoGetVo> getVideoList(Map<String, Object> requestMap);
+
+    void batchReplace(@Param("addList") List<KuaiShouReportDailyMaterial> addList);
 }
 }

+ 133 - 0
module-kuaishou/src/main/java/cn/com/ctop/kuaishou/modules/batch/mapper/xml/KuaiShouReportDailyMaterialMapper.xml

@@ -1,6 +1,139 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
 <!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
 <mapper namespace="cn.com.ctop.kuaishou.modules.batch.mapper.KuaiShouReportDailyMaterialMapper">
 <mapper namespace="cn.com.ctop.kuaishou.modules.batch.mapper.KuaiShouReportDailyMaterialMapper">
+    <insert id="batchReplace">
+        replace into ctop_kuaishou_report_daily_material(
+        account_id,
+        photo_id,
+        channel_type,
+        signature,
+        image_token,
+        cover_url,
+        photo_url,
+        creative_material_type_string,
+        ad_scene,
+        charge,
+        photo_show,
+        aclick,
+        bclick,
+        photo_share,
+        photo_comment,
+        photo_like,
+        follow,
+        cancel_follow,
+        report,
+        block,
+        negative,
+        download_started,
+        download_completed,
+        activation,
+        submit,
+        stat_date,
+        photo_click,
+        photo_click_ratio,
+        action_ratio,
+        impression_1k_cost,
+        photo_click_cost,
+        action_cost,
+        event_pay_first_day,
+        event_pay_purchase_amount_first_day,
+        event_pay_first_day_roi,
+        event_pay,
+        event_pay_purchase_amount,
+        event_pay_roi,
+        event_register,
+        event_register_cost,
+        event_register_ratio,
+        event_jin_jian_app,
+        event_jin_jian_app_cost,
+        event_credit_grant_app,
+        event_credit_grant_app_cost,
+        event_credit_grant_app_ratio,
+        event_order_paid,
+        event_order_paid_purchase_amount,
+        event_jin_jian_landing_page,
+        event_jin_jian_landing_page_cost,
+        event_credit_grant_landing_page,
+        event_credit_grant_landing_page_cost,
+        event_credit_grant_landing_ratio,
+        event_next_day_stay_cost,
+        event_next_day_stay_ratio,
+        form_action_ratio,
+        event_order_paid_cost,
+        event_next_day_stay,
+        form_cost,
+        form_count,
+        play_3s_ratio
+        )
+        values
+        <foreach collection="addList" item="material" separator=",">
+            (
+            #{material.accountId},
+            #{material.photoId},
+            #{material.channelType},
+            #{material.signature},
+            #{material.imageToken},
+            #{material.coverUrl},
+            #{material.photoUrl},
+            #{material.creativeMaterialTypeString},
+            #{material.adScene},
+            #{material.charge},
+            #{material.photoShow},
+            #{material.aclick},
+            #{material.bclick},
+            #{material.photoShare},
+            #{material.photoComment},
+            #{material.photoLike},
+            #{material.follow},
+            #{material.cancelFollow},
+            #{material.report},
+            #{material.block},
+            #{material.negative},
+            #{material.downloadStarted},
+            #{material.downloadCompleted},
+            #{material.activation},
+            #{material.submit},
+            #{material.statDate},
+            #{material.photoClick},
+            #{material.photoClickRatio},
+            #{material.actionRatio},
+            #{material.impression1kCost},
+            #{material.photoClickCost},
+            #{material.actionCost},
+            #{material.eventPayFirstDay},
+            #{material.eventPayPurchaseAmountFirstDay},
+            #{material.eventPayFirstDayRoi},
+            #{material.eventPay},
+            #{material.eventPayPurchaseAmount},
+            #{material.eventPayRoi},
+            #{material.eventRegister},
+            #{material.eventRegisterCost},
+            #{material.eventRegisterRatio},
+            #{material.eventJinJianApp},
+            #{material.eventJinJianAppCost},
+            #{material.eventCreditGrantApp},
+            #{material.eventCreditGrantAppCost},
+            #{material.eventCreditGrantAppRatio},
+            #{material.eventOrderPaid},
+            #{material.eventOrderPaidPurchaseAmount},
+            #{material.eventJinJianLandingPage},
+            #{material.eventJinJianLandingPageCost},
+            #{material.eventCreditGrantLandingPage},
+            #{material.eventCreditGrantLandingPageCost},
+            #{material.eventCreditGrantLandingRatio},
+            #{material.eventNextDayStayCost},
+            #{material.eventNextDayStayRatio},
+            #{material.formActionRatio},
+            #{material.eventOrderPaidCost},
+            #{material.eventNextDayStay},
+            #{material.formCost},
+            #{material.formCount},
+            #{material.play3sRatio}
+            )
+        </foreach>
+
+    </insert>
+
 
 
     <insert id="loadMaterialDailyReport">
     <insert id="loadMaterialDailyReport">
 		LOAD DATA local INFILE  #{localPath}
 		LOAD DATA local INFILE  #{localPath}

+ 4 - 0
module-kuaishou/src/main/java/cn/com/ctop/kuaishou/modules/batch/service/IKuaiShouReportDailyMaterialService.java

@@ -16,4 +16,8 @@ import java.util.Map;
 public interface IKuaiShouReportDailyMaterialService extends IService<KuaiShouReportDailyMaterial> {
 public interface IKuaiShouReportDailyMaterialService extends IService<KuaiShouReportDailyMaterial> {
 
 
     List<KuaiShouVideoGetVo> getVideoList(Map<String, Object> requestMap);
     List<KuaiShouVideoGetVo> getVideoList(Map<String, Object> requestMap);
+
+
+    void getMaterialReportByAccountIdAndStatDate(Long accountId, String token, String startDate, String endDate, Integer page);
+
 }
 }

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

@@ -1,13 +1,21 @@
 package cn.com.ctop.kuaishou.modules.batch.service.impl;
 package cn.com.ctop.kuaishou.modules.batch.service.impl;
 
 
+import cn.com.ctop.common.module.utils.Check;
+import cn.com.ctop.common.module.utils.HttpUtils;
 import cn.com.ctop.kuaishou.modules.batch.entity.vo.KuaiShouVideoGetVo;
 import cn.com.ctop.kuaishou.modules.batch.entity.vo.KuaiShouVideoGetVo;
 import cn.com.ctop.kuaishou.modules.batch.mapper.KuaiShouReportDailyMaterialMapper;
 import cn.com.ctop.kuaishou.modules.batch.mapper.KuaiShouReportDailyMaterialMapper;
 import cn.com.ctop.kuaishou.modules.batch.service.IKuaiShouReportDailyMaterialService;
 import cn.com.ctop.kuaishou.modules.batch.service.IKuaiShouReportDailyMaterialService;
 import cn.com.ctop.kuaishou.modules.report.entity.KuaiShouReportDailyMaterial;
 import cn.com.ctop.kuaishou.modules.report.entity.KuaiShouReportDailyMaterial;
+import cn.com.ctop.kuaishou.modules.report.entity.VideoGetvo;
+import com.alibaba.fastjson.JSONArray;
+import com.alibaba.fastjson.JSONObject;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import lombok.extern.slf4j.Slf4j;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 import org.springframework.stereotype.Service;
 
 
+import java.util.ArrayList;
+import java.util.HashMap;
 import java.util.List;
 import java.util.List;
 import java.util.Map;
 import java.util.Map;
 
 
@@ -18,6 +26,7 @@ import java.util.Map;
  * @version V1.0
  * @version V1.0
  * @date 2020-09-09
  * @date 2020-09-09
  */
  */
+@Slf4j
 @Service
 @Service
 public class KuaiShouReportDailyMaterialServiceImpl extends ServiceImpl<KuaiShouReportDailyMaterialMapper, KuaiShouReportDailyMaterial> implements IKuaiShouReportDailyMaterialService {
 public class KuaiShouReportDailyMaterialServiceImpl extends ServiceImpl<KuaiShouReportDailyMaterialMapper, KuaiShouReportDailyMaterial> implements IKuaiShouReportDailyMaterialService {
     @Autowired
     @Autowired
@@ -27,4 +36,61 @@ public class KuaiShouReportDailyMaterialServiceImpl extends ServiceImpl<KuaiShou
     public List<KuaiShouVideoGetVo> getVideoList(Map<String, Object> requestMap) {
     public List<KuaiShouVideoGetVo> getVideoList(Map<String, Object> requestMap) {
         return dailyMaterialMapper.getVideoList(requestMap);
         return dailyMaterialMapper.getVideoList(requestMap);
     }
     }
+
+    /**
+     * 获取素材数据
+     *
+     * @param accountId
+     * @param startDate
+     * @param endDate
+     */
+    @Override
+    public void getMaterialReportByAccountIdAndStatDate(Long accountId, String token, String startDate, String endDate, Integer page) {
+        String url = "https://ad.e.kuaishou.com/rest/openapi/v1/report/material_report";
+        Map<String, String> headers = new HashMap<>();
+        headers.put("Content-Type", "application/json");
+        headers.put("Access-Token", token);
+        Map<String, Object> param = new HashMap<>();
+        param.put("start_date", startDate);
+        param.put("end_date", endDate);
+        param.put("advertiser_id", accountId);
+        param.put("temporal_granularity", "DAILY");
+        param.put("view_type", 5);
+        param.put("page_size", 1000);
+        param.put("page", page);
+
+        String result = HttpUtils.httpPostRequest(url, param, headers);
+        JSONObject resultJson = JSONObject.parseObject(result);
+        if (Check.isNull(resultJson)) {
+            return;
+        }
+
+        Integer total_count = resultJson.getInteger("total_count");
+        if (total_count == 0) {
+            return;
+        }
+        JSONArray details = resultJson.getJSONArray("details");
+        if (Check.isNull(details)) {
+            return;
+        }
+
+        List<KuaiShouReportDailyMaterial> addList = new ArrayList<>();
+        long l1 = System.currentTimeMillis();
+        for (int i = 0; i < details.size(); i++) {
+            JSONObject detailJson = details.getJSONObject(i);
+            detailJson.put("photo_like", detailJson.getInteger("like"));
+            detailJson.put("photo_share", detailJson.getInteger("share"));
+            detailJson.put("photo_comment", detailJson.getInteger("comment"));
+            KuaiShouReportDailyMaterial material = JSONObject.toJavaObject(detailJson, KuaiShouReportDailyMaterial.class);
+            VideoGetvo videoGetvo = dailyMaterialMapper.getVideoGetByPhotoId(material.getPhotoId());
+            if (!Check.isNull(videoGetvo)) {
+                material.setChannelType(videoGetvo.getChannelType());
+                material.setSignature(videoGetvo.getSignature());
+            }
+            material.setAccountId(accountId);
+            addList.add(material);
+        }
+        dailyMaterialMapper.batchReplace(addList);
+        getMaterialReportByAccountIdAndStatDate(accountId, token, startDate, endDate, page + 1);
+    }
 }
 }

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

@@ -184,8 +184,6 @@ public class KuaishouInterfaceServiceImpl implements IKuaishouInterfaceService {
             kuaishouReportHourlyAccount.setUpdateTime(new Date());
             kuaishouReportHourlyAccount.setUpdateTime(new Date());
             hourlyAccountService.saveOrUpdate(kuaishouReportHourlyAccount);
             hourlyAccountService.saveOrUpdate(kuaishouReportHourlyAccount);
         }
         }
-
-
     }
     }
 
 
 
 
@@ -365,6 +363,7 @@ public class KuaishouInterfaceServiceImpl implements IKuaishouInterfaceService {
             return;
             return;
         }
         }
 
 
+        List<KuaishouReportDailyCampaign> campaigns = new ArrayList<>();
         for (int i = 0; i < details.size(); i++) {
         for (int i = 0; i < details.size(); i++) {
             var detailJson = details.getJSONObject(i);
             var detailJson = details.getJSONObject(i);
             var show = detailJson.getLong("show");
             var show = detailJson.getLong("show");
@@ -373,8 +372,10 @@ public class KuaishouInterfaceServiceImpl implements IKuaishouInterfaceService {
             detailJson.put("photo_like", like);
             detailJson.put("photo_like", like);
             var campaign = JSONObject.toJavaObject(detailJson, KuaishouReportDailyCampaign.class);
             var campaign = JSONObject.toJavaObject(detailJson, KuaishouReportDailyCampaign.class);
             campaign.setAccountId(token.getAccountId());
             campaign.setAccountId(token.getAccountId());
-            campaign.setId("" + campaign.getAccountId() + campaign.getCampaignId() + campaign.getStatDate());
-            dailyCampaignService.saveOrUpdate(campaign);
+            campaigns.add(campaign);
+        }
+        if (!campaigns.isEmpty()) {
+            dailyCampaignService.replaceBatch(campaigns);
         }
         }
         getCampaignDailyReportByPage(token, startDate, endDate, page + 1);
         getCampaignDailyReportByPage(token, startDate, endDate, page + 1);
     }
     }
@@ -402,7 +403,6 @@ public class KuaishouInterfaceServiceImpl implements IKuaishouInterfaceService {
             List<KuaishouReportDailyCampaign> details = kuaishouResult.getData().getDetails();
             List<KuaishouReportDailyCampaign> details = kuaishouResult.getData().getDetails();
             details.forEach((campaign) -> {
             details.forEach((campaign) -> {
                 campaign.setAccountId(advertiserId);
                 campaign.setAccountId(advertiserId);
-                campaign.setId("" + campaign.getAccountId() + campaign.getCampaignId() + campaign.getStatDate());
                 dailyCampaignService.saveOrUpdate(campaign);
                 dailyCampaignService.saveOrUpdate(campaign);
             });
             });
         } catch (Exception e) {
         } catch (Exception e) {
@@ -3041,13 +3041,18 @@ public class KuaishouInterfaceServiceImpl implements IKuaishouInterfaceService {
             if (!Check.isNull(resultJson)) {
             if (!Check.isNull(resultJson)) {
                 Integer code = resultJson.getInteger("code");
                 Integer code = resultJson.getInteger("code");
                 if (code == 0) {
                 if (code == 0) {
-                    JSONArray dataArr = resultJson.getJSONArray("data");
-                    if (!Check.isNull(dataArr)) {
+                    JSONObject dataDetailJson = resultJson.getJSONObject("data");
+                    if (!Check.isNull(dataDetailJson)) {
                         Map<String, Object> deleteMap = new HashMap<>();
                         Map<String, Object> deleteMap = new HashMap<>();
+
+                        JSONArray details = dataDetailJson.getJSONArray("details");
+                        if (Check.isNull(details)) {
+                            return;
+                        }
                         deleteMap.put("account_id", accountId);
                         deleteMap.put("account_id", accountId);
                         populationService.removeByMap(deleteMap);
                         populationService.removeByMap(deleteMap);
-                        for (int i = 0; i < dataArr.size(); i++) {
-                            JSONObject dataJson = dataArr.getJSONObject(i);
+                        for (int i = 0; i < details.size(); i++) {
+                            JSONObject dataJson = details.getJSONObject(i);
                             if (!Check.isNull(dataJson)) {
                             if (!Check.isNull(dataJson)) {
                                 KuaishouPopulation population = new KuaishouPopulation();
                                 KuaishouPopulation population = new KuaishouPopulation();
                                 population.setOrientationId(dataJson.getLong("orientation_id"));
                                 population.setOrientationId(dataJson.getLong("orientation_id"));

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

@@ -1,5 +1,6 @@
 package cn.com.ctop.kuaishou.modules.report.entity;
 package cn.com.ctop.kuaishou.modules.report.entity;
 
 
+import com.baomidou.mybatisplus.annotation.IdType;
 import com.baomidou.mybatisplus.annotation.TableField;
 import com.baomidou.mybatisplus.annotation.TableField;
 import com.baomidou.mybatisplus.annotation.TableId;
 import com.baomidou.mybatisplus.annotation.TableId;
 import com.baomidou.mybatisplus.annotation.TableName;
 import com.baomidou.mybatisplus.annotation.TableName;
@@ -14,8 +15,8 @@ import java.util.Date;
 @TableName("ctop_kuaishou_report_daily_campaign")
 @TableName("ctop_kuaishou_report_daily_campaign")
 public class KuaishouReportDailyCampaign implements Serializable {
 public class KuaishouReportDailyCampaign implements Serializable {
     private static final long serialVersionUID = 1L;
     private static final long serialVersionUID = 1L;
-    @TableId
-    private String id;
+    @TableId(type = IdType.AUTO)
+    private Long id;
     private Long accountId;
     private Long accountId;
     @JsonProperty("campaign_id")
     @JsonProperty("campaign_id")
     private Long campaignId;
     private Long campaignId;
@@ -32,10 +33,10 @@ public class KuaishouReportDailyCampaign implements Serializable {
     private Long aclick;
     private Long aclick;
     @JsonProperty
     @JsonProperty
     private Long bclick;
     private Long bclick;
-    @JsonProperty
-    private Long share;
-    @JsonProperty
-    private Long comment;
+    @JsonProperty("photo_share")
+    private Long photoShare;
+    @JsonProperty("photo_comment")
+    private Long photoComment;
     @JsonProperty
     @JsonProperty
     private Long photoLike;
     private Long photoLike;
     @JsonProperty
     @JsonProperty
@@ -56,7 +57,6 @@ public class KuaishouReportDailyCampaign implements Serializable {
     private Long activation;
     private Long activation;
     @JsonProperty
     @JsonProperty
     private Long submit;
     private Long submit;
-
     @JsonProperty
     @JsonProperty
     private BigDecimal photoClickRatio;
     private BigDecimal photoClickRatio;
     @JsonProperty
     @JsonProperty
@@ -64,6 +64,10 @@ public class KuaishouReportDailyCampaign implements Serializable {
     @JsonProperty("impression_1k_cost")
     @JsonProperty("impression_1k_cost")
     @TableField("impression_1k_cost")
     @TableField("impression_1k_cost")
     private BigDecimal impression1kCost;
     private BigDecimal impression1kCost;
+
+    @JsonProperty("play_3s_ratio")
+    @TableField("play_3s_ratio")
+    private BigDecimal play3sRatio;
     @JsonProperty
     @JsonProperty
     private BigDecimal photoClickCost;
     private BigDecimal photoClickCost;
     @JsonProperty
     @JsonProperty
@@ -82,6 +86,11 @@ public class KuaishouReportDailyCampaign implements Serializable {
     private Long eventRegister;
     private Long eventRegister;
     @JsonProperty
     @JsonProperty
     private BigDecimal eventRegisterCost;
     private BigDecimal eventRegisterCost;
+    private BigDecimal eventRegisterRatio;
+    private BigDecimal eventCreditGrantLandingRatio;
+    private BigDecimal eventNextDayStayCost;
+    private Long eventNextDayStay;
+    private BigDecimal eventNextDayStayRatio;
     @JsonProperty
     @JsonProperty
     private Long eventJinJianApp;
     private Long eventJinJianApp;
     @JsonProperty
     @JsonProperty
@@ -114,6 +123,8 @@ public class KuaishouReportDailyCampaign implements Serializable {
     private Long eventCreditGrantLandingPage;
     private Long eventCreditGrantLandingPage;
     @JsonProperty
     @JsonProperty
     private BigDecimal eventCreditGrantLandingPageCost;
     private BigDecimal eventCreditGrantLandingPageCost;
+    private Integer status;
+    private String campaignName;
     @JsonProperty
     @JsonProperty
     private Date createTime;
     private Date createTime;
     @JsonProperty
     @JsonProperty

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

@@ -16,9 +16,7 @@ public class KuaishouReportDailyCreative implements Serializable {
     private static final long serialVersionUID = 1L;
     private static final long serialVersionUID = 1L;
     @TableId
     @TableId
     private String id;
     private String id;
-
     private Long accountId;
     private Long accountId;
-
     @JsonProperty("creative_id")
     @JsonProperty("creative_id")
     private Long creativeId;
     private Long creativeId;
 
 

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

@@ -4,6 +4,10 @@ import cn.com.ctop.kuaishou.modules.report.entity.KuaishouReportDailyCampaign;
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 import org.apache.ibatis.annotations.Param;
 import org.apache.ibatis.annotations.Param;
 
 
+import java.util.List;
+
 public interface KuaishouReportDailyCampaignMapper extends BaseMapper<KuaishouReportDailyCampaign> {
 public interface KuaishouReportDailyCampaignMapper extends BaseMapper<KuaishouReportDailyCampaign> {
     void loadCampaignDailyReport(@Param("accountId") Long accountId, @Param("localPath") String localPath);
     void loadCampaignDailyReport(@Param("accountId") Long accountId, @Param("localPath") String localPath);
+
+    void replaceBatch(@Param(value = "records") List<KuaishouReportDailyCampaign> campaigns);
 }
 }

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

@@ -5,44 +5,44 @@
 
 
     <select id="selectSummaryByAccountId" resultType="com.alibaba.fastjson.JSONObject">
     <select id="selectSummaryByAccountId" resultType="com.alibaba.fastjson.JSONObject">
         select
         select
-        sum(charge) cost, -- 消耗
-        sum(photo_show) photoShow, -- 封面展示
-        sum(photo_click) photoClick, -- 封面点击
-        sum(aclick) aclick, -- 素材曝光数
-        (sum(photo_click) / sum(photo_show)) photoClickRatio, -- 封面点击率
+        sum(charge) cost,
+        sum(photo_show) photoShow,
+        sum(photo_click) photoClick,
+        sum(aclick) aclick,
+        (sum(photo_click) / sum(photo_show)) photoClickRatio,
         (sum(form_count) / sum(bclick)) cvr,
         (sum(form_count) / sum(bclick)) cvr,
         ((sum(charge) / (sum(photo_show)) * 1000)) cpm,
         ((sum(charge) / (sum(photo_show)) * 1000)) cpm,
-        sum(bclick) bClick,-- 行为数
-        sum(form_count) formCount, -- 表单提交数
-        (sum(charge) / sum(form_count)) formPrice, -- 表单提交单价
-        ((sum(charge) / sum(form_count)) / #{discount}) afterFormPrice, -- 表单提交单价
-        sum(activation) activationCount, -- 激活数
-        (sum(charge) / sum(activation)) activationPrice, -- 激活单价
-        ((sum(charge) / sum(activation)) / #{discount}) afterActivationPrice, -- 激活单价
-        sum(event_register) eventRegister, -- 注册数
+        sum(bclick) bClick,
+        sum(form_count) formCount,
+        (sum(charge) / sum(form_count)) formPrice,
+        ((sum(charge) / sum(form_count)) / #{discount}) afterFormPrice,
+        sum(activation) activationCount,
+        (sum(charge) / sum(activation)) activationPrice,
+        ((sum(charge) / sum(activation)) / #{discount}) afterActivationPrice,
+        sum(event_register) eventRegister,
 
 
-        sum(form_count + activation) conversionNum, -- 转化数
+        sum(form_count + activation) conversionNum,
 
 
         (case
         (case
         when sum(activation +form_count) != 0
         when sum(activation +form_count) != 0
         then (sum(charge) / sum(activation +form_count))
         then (sum(charge) / sum(activation +form_count))
         else 0
         else 0
         end
         end
-        ) conversionPrice, -- 转化单价
+        ) conversionPrice,
 
 
         (case
         (case
         when sum(activation +form_count) != 0
         when sum(activation +form_count) != 0
         then (sum(charge) / sum(activation +form_count)) / #{discount}
         then (sum(charge) / sum(activation +form_count)) / #{discount}
         else 0
         else 0
         end
         end
-        ) afterConversionPrice, -- 折后转化单价
+        ) afterConversionPrice,
 
 
         (case
         (case
         when sum(event_register) != 0
         when sum(event_register) != 0
         then (sum(charge) / sum(event_register))
         then (sum(charge) / sum(event_register))
         else 0
         else 0
         end
         end
-        ) eventRegisterCost -- 注册成本
+        ) eventRegisterCost
         from
         from
         ctop_kuaishou_report_hourly_account
         ctop_kuaishou_report_hourly_account
         where stat_date = #{date}
         where stat_date = #{date}
@@ -57,31 +57,31 @@
 
 
     <select id="selectAccountReport" resultType="com.alibaba.fastjson.JSONObject">
     <select id="selectAccountReport" resultType="com.alibaba.fastjson.JSONObject">
         select
         select
-        sum(charge) cost, -- 消耗
-        sum(photo_show) photoShow, -- 封面展示
-        sum(photo_click) photoClick, -- 封面点击
-        sum(aclick) aclick, -- 素材曝光数
-        (sum(photo_click) / sum(photo_show)) photoClickRatio, -- 封面点击率
+        sum(charge) cost,
+        sum(photo_show) photoShow,
+        sum(photo_click) photoClick,
+        sum(aclick) aclick,
+        (sum(photo_click) / sum(photo_show)) photoClickRatio,
         (sum(form_count) / sum(bclick)) cvr,
         (sum(form_count) / sum(bclick)) cvr,
         ((sum(charge) / (sum(photo_show)) * 1000)) cpm,
         ((sum(charge) / (sum(photo_show)) * 1000)) cpm,
-        sum(bclick) bClick,-- 行为数
+        sum(bclick) bClick,
         sum(form_count) formCount,
         sum(form_count) formCount,
-        (sum(charge) / sum(form_count)) formPrice, -- 表单提交单价
-        ((sum(charge) / sum(form_count)) / #{discount}) afterFormPrice, -- 表单提交单价
-        sum(activation) activationCount, -- 激活数
-        (sum(charge) / sum(activation)) activationPrice, -- 激活单价
-        ((sum(charge) / sum(activation)) / #{discount}) afterActivationPrice, -- 激活单价
+        (sum(charge) / sum(form_count)) formPrice,
+        ((sum(charge) / sum(form_count)) / #{discount}) afterFormPrice,
+        sum(activation) activationCount,
+        (sum(charge) / sum(activation)) activationPrice,
+        ((sum(charge) / sum(activation)) / #{discount}) afterActivationPrice,
         account_id accountId,
         account_id accountId,
-        (select auth_name from ctop_user_allocation where account_id = accountId limit 1) accountName,
-        sum(event_next_day_stay) eventNextDayStay, -- 次留数
+        (select auth_name from ctop_user_allocation where account_id = t1.account_id limit 1) accountName,
+        sum(event_next_day_stay) eventNextDayStay,
         (case
         (case
         when sum(activation) != 0
         when sum(activation) != 0
         then (sum(event_next_day_stay)/sum(activation))
         then (sum(event_next_day_stay)/sum(activation))
         else 0
         else 0
         end
         end
-        ) eventNextDayStayRatio -- 次留率=次留数/激活数
+        ) eventNextDayStayRatio
         from
         from
-        ctop_kuaishou_report_daily_account
+        ctop_kuaishou_report_daily_account t1
         where account_id in
         where account_id in
         <foreach item="item" index="index" collection="accountIds"
         <foreach item="item" index="index" collection="accountIds"
                  open="(" separator="," close=")">
                  open="(" separator="," close=")">
@@ -93,40 +93,40 @@
 
 
     <select id="selectAccountReportByDate" resultType="com.alibaba.fastjson.JSONObject">
     <select id="selectAccountReportByDate" resultType="com.alibaba.fastjson.JSONObject">
         select
         select
-        sum(charge) cost, -- 消耗
-        sum(photo_show) photoShow, -- 封面展示
-        sum(photo_click) photoClick, -- 封面点击
-        sum(aclick) aclick, -- 素材曝光数
-        (sum(photo_click) / sum(photo_show)) photoClickRatio, -- 封面点击率
+        sum(charge) cost,
+        sum(photo_show) photoShow,
+        sum(photo_click) photoClick,
+        sum(aclick) aclick,
+        (sum(photo_click) / sum(photo_show)) photoClickRatio,
         (sum(form_count) / sum(bclick)) cvr,
         (sum(form_count) / sum(bclick)) cvr,
         ((sum(charge) / (sum(photo_show)) * 1000)) cpm,
         ((sum(charge) / (sum(photo_show)) * 1000)) cpm,
-        sum(bclick) bClick,-- 行为数
+        sum(bclick) bClick,
         sum(form_count) formCount,
         sum(form_count) formCount,
-        (sum(charge) / sum(form_count)) formPrice, -- 表单提交单价
-        ((sum(charge) / sum(form_count)) / #{discount}) afterFormPrice, -- 表单提交单价
-        sum(activation) activationCount, -- 激活数
-        (sum(charge) / sum(activation)) activationPrice, -- 激活单价
-        ((sum(charge) / sum(activation)) / #{discount}) afterActivationPrice, -- 激活单价
-        sum(event_register) eventRegister, -- 注册数
-        sum(form_count + activation) conversionNum, -- 转化数
-        (sum(charge) / sum(activation +form_count )) conversionPrice, -- 转化单价
+        (sum(charge) / sum(form_count)) formPrice,
+        ((sum(charge) / sum(form_count)) / #{discount}) afterFormPrice,
+        sum(activation) activationCount,
+        (sum(charge) / sum(activation)) activationPrice,
+        ((sum(charge) / sum(activation)) / #{discount}) afterActivationPrice,
+        sum(event_register) eventRegister,
+        sum(form_count + activation) conversionNum,
+        (sum(charge) / sum(activation +form_count )) conversionPrice,
         (case
         (case
         when sum(event_register) != 0
         when sum(event_register) != 0
         then (sum(charge) / sum(event_register))
         then (sum(charge) / sum(event_register))
         else 0
         else 0
         end
         end
-        ) eventRegisterCost, -- 注册成本
+        ) eventRegisterCost,
         account_id accountId,
         account_id accountId,
-        (select auth_name from ctop_user_allocation where account_id = accountId limit 1) accountName,
-        sum(event_next_day_stay) eventNextDayStay, -- 次留数
+        (select auth_name from ctop_user_allocation where account_id = = t1.account_id limit 1) accountName,
+        sum(event_next_day_stay) eventNextDayStay,
         (case
         (case
         when sum(activation) != 0
         when sum(activation) != 0
         then (sum(event_next_day_stay)/sum(activation))
         then (sum(event_next_day_stay)/sum(activation))
         else 0
         else 0
         end
         end
-        ) eventNextDayStayRatio -- 次留率=次留数/激活数
+        ) eventNextDayStayRatio
         from
         from
-        ctop_kuaishou_report_daily_account
+        ctop_kuaishou_report_daily_account t1
         where stat_date &lt;= #{startDate}
         where stat_date &lt;= #{startDate}
         and stat_date &gt;= #{endDate}
         and stat_date &gt;= #{endDate}
         and account_id in
         and account_id in
@@ -140,27 +140,27 @@
 
 
     <select id="selectReportDetailGroupAccountId" resultType="com.alibaba.fastjson.JSONObject">
     <select id="selectReportDetailGroupAccountId" resultType="com.alibaba.fastjson.JSONObject">
         select
         select
-        sum(charge) cost, -- 消耗
-        sum(photo_show) photoShow, -- 封面展示
-        sum(photo_click) photoClick, -- 封面点击
-        sum(aclick) aclick, -- 素材曝光数
-        (sum(photo_click) / sum(photo_show)) photoClickRatio, -- 封面点击率
+        sum(charge) cost,
+        sum(photo_show) photoShow,
+        sum(photo_click) photoClick,
+        sum(aclick) aclick,
+        (sum(photo_click) / sum(photo_show)) photoClickRatio,
         (sum(form_count) / sum(bclick)) cvr,
         (sum(form_count) / sum(bclick)) cvr,
         ((sum(charge) / (sum(photo_show)) * 1000)) cpm,
         ((sum(charge) / (sum(photo_show)) * 1000)) cpm,
-        sum(bclick) bClick,-- 行为数
+        sum(bclick) bClick,
         sum(form_count) formCount,
         sum(form_count) formCount,
-        (sum(charge) / sum(form_count)) formPrice, -- 表单提交单价
-        sum(activation) activationCount, -- 激活数
-        (sum(charge) / sum(activation)) activationPrice, -- 激活单价
-        sum(event_register) eventRegister, -- 注册数
-        sum(form_count + activation) conversionNum, -- 转化数
+        (sum(charge) / sum(form_count)) formPrice,
+        sum(activation) activationCount,
+        (sum(charge) / sum(activation)) activationPrice,
+        sum(event_register) eventRegister,
+        sum(form_count + activation) conversionNum,
 
 
         (
         (
         case when sum(activation +form_count ) != 0
         case when sum(activation +form_count ) != 0
         then (sum(charge) / sum(activation +form_count))
         then (sum(charge) / sum(activation +form_count))
         else 0
         else 0
         end
         end
-        )conversionPrice, -- 转化单价
+        )conversionPrice,
 
 
 
 
         (case
         (case
@@ -168,12 +168,12 @@
         then (sum(charge) / sum(event_register))
         then (sum(charge) / sum(event_register))
         else 0
         else 0
         end
         end
-        ) eventRegisterCost, -- 注册成本
+        ) eventRegisterCost,
 
 
         account_id accountId,
         account_id accountId,
-        (select auth_name from ctop_user_allocation where account_id = accountId limit 1) accountName
+        (select auth_name from ctop_user_allocation where account_id = = t1.account_id limit 1) accountName
         from
         from
-        ctop_kuaishou_report_hourly_account
+        ctop_kuaishou_report_hourly_account t1
         where stat_date = #{date}
         where stat_date = #{date}
         and stat_hour &lt;= #{statHour}
         and stat_hour &lt;= #{statHour}
         and account_id in
         and account_id in
@@ -187,44 +187,44 @@
 
 
     <select id="selectReportDetailGroupAccountIdByDate" resultType="com.alibaba.fastjson.JSONObject">
     <select id="selectReportDetailGroupAccountIdByDate" resultType="com.alibaba.fastjson.JSONObject">
         select
         select
-        sum(charge) cost, -- 消耗
-        sum(photo_show) photoShow, -- 封面展示
-        sum(photo_click) photoClick, -- 封面点击
-        sum(aclick) aclick, -- 素材曝光数
-        (sum(photo_click) / sum(photo_show)) photoClickRatio, -- 封面点击率
+        sum(charge) cost,
+        sum(photo_show) photoShow,
+        sum(photo_click) photoClick,
+        sum(aclick) aclick,
+        (sum(photo_click) / sum(photo_show)) photoClickRatio,
         (sum(form_count) / sum(bclick)) cvr,
         (sum(form_count) / sum(bclick)) cvr,
         ((sum(charge) / (sum(photo_show)) * 1000)) cpm,
         ((sum(charge) / (sum(photo_show)) * 1000)) cpm,
-        sum(bclick) bClick,-- 行为数
+        sum(bclick) bClick,
         sum(form_count) formCount,
         sum(form_count) formCount,
-        (sum(charge) / sum(form_count)) formPrice, -- 表单提交单价
-        sum(activation) activationCount, -- 激活数
-        (sum(charge) / sum(activation)) activationPrice, -- 激活单价
-        sum(event_register) eventRegister, -- 注册数
-        sum(form_count + activation) conversionNum, -- 转化数
+        (sum(charge) / sum(form_count)) formPrice,
+        sum(activation) activationCount,
+        (sum(charge) / sum(activation)) activationPrice,
+        sum(event_register) eventRegister,
+        sum(form_count + activation) conversionNum,
         (
         (
         case when sum(activation +form_count ) != 0
         case when sum(activation +form_count ) != 0
         then (sum(charge) / sum(activation +form_count))
         then (sum(charge) / sum(activation +form_count))
         else 0
         else 0
         end
         end
-        )conversionPrice, -- 转化单价
+        )conversionPrice,
 
 
         (case
         (case
         when sum(event_register) != 0
         when sum(event_register) != 0
         then (sum(charge) / sum(event_register))
         then (sum(charge) / sum(event_register))
         else 0
         else 0
         end
         end
-        ) eventRegisterCost, -- 注册成本
+        ) eventRegisterCost,
         account_id accountId,
         account_id accountId,
-        (select auth_name from ctop_user_allocation where account_id = accountId limit 1) accountName,
-        sum(event_next_day_stay) eventNextDayStay, -- 次留数
+        (select auth_name from ctop_user_allocation where account_id = = t1.account_id limit 1) accountName,
+        sum(event_next_day_stay) eventNextDayStay,
         (case
         (case
         when sum(activation) != 0
         when sum(activation) != 0
         then ( sum(event_next_day_stay) / sum(activation) )
         then ( sum(event_next_day_stay) / sum(activation) )
         else 0
         else 0
         end
         end
-        ) eventNextDayStayRatio -- 次留率=次留数/激活数
+        ) eventNextDayStayRatio
         from
         from
-        ctop_kuaishou_report_daily_account
+        ctop_kuaishou_report_daily_account t1
         where stat_date = #{statDate}
         where stat_date = #{statDate}
         and account_id in
         and account_id in
         <foreach item="item" index="index" collection="accountIds"
         <foreach item="item" index="index" collection="accountIds"
@@ -426,24 +426,24 @@
 
 
     <select id="selectSummaryByMap" parameterType="Map" resultType="com.alibaba.fastjson.JSONObject">
     <select id="selectSummaryByMap" parameterType="Map" resultType="com.alibaba.fastjson.JSONObject">
         select
         select
-        sum(charge) cost, -- 消耗
+        sum(charge) cost,
         (case
         (case
         when sum(charge) != 0
         when sum(charge) != 0
         then (sum(charge) / #{discount})
         then (sum(charge) / #{discount})
         else 0
         else 0
         end
         end
-        ) discountCost, -- 封面点击率
+        ) discountCost,
 
 
-        sum(photo_show) photoShow, -- 封面展示
-        sum(photo_click) photoClick, -- 封面点击
-        sum(aclick) aclick, -- 素材曝光数
+        sum(photo_show) photoShow,
+        sum(photo_click) photoClick,
+        sum(aclick) aclick,
 
 
         (case
         (case
         when sum(photo_show) != 0
         when sum(photo_show) != 0
         then (sum(photo_click) / sum(photo_show))
         then (sum(photo_click) / sum(photo_show))
         else 0
         else 0
         end
         end
-        ) photoClickRatio, -- 封面点击率
+        ) photoClickRatio,
 
 
         (case
         (case
         when sum(bclick) != 0
         when sum(bclick) != 0
@@ -459,7 +459,7 @@
         end
         end
         ) cpm,
         ) cpm,
 
 
-        sum(bclick) bClick,-- 行为数
+        sum(bclick) bClick,
         (
         (
         CASE
         CASE
         WHEN sum(form_count + activation) != 0 THEN
         WHEN sum(form_count + activation) != 0 THEN
@@ -467,8 +467,8 @@
         ELSE
         ELSE
         0
         0
         END
         END
-        ) conversionPrice, -- 转化单价
-        sum(form_count + activation) conversions, -- 转化数
+        ) conversionPrice,
+        sum(form_count + activation) conversions,
         (
         (
         CASE
         CASE
         WHEN sum(form_count + activation) != 0 THEN
         WHEN sum(form_count + activation) != 0 THEN
@@ -477,20 +477,20 @@
         0
         0
         END
         END
         ) discountConversionPrice,
         ) discountConversionPrice,
-        sum(event_register) eventRegister, -- 注册数
+        sum(event_register) eventRegister,
         (case
         (case
         when sum(event_register) != 0
         when sum(event_register) != 0
         then (sum(charge) / sum(event_register))
         then (sum(charge) / sum(event_register))
         else 0
         else 0
         end
         end
-        ) eventRegisterCost, -- 注册成本
-        sum(event_next_day_stay) eventNextDayStay, -- 次留数
+        ) eventRegisterCost,
+        sum(event_next_day_stay) eventNextDayStay,
         (case
         (case
         when sum(activation) != 0
         when sum(activation) != 0
         then (sum(event_next_day_stay)/sum(activation))
         then (sum(event_next_day_stay)/sum(activation))
         else 0
         else 0
         end
         end
-        ) eventNextDayStayRatio -- 次留率=次留数/激活数
+        ) eventNextDayStayRatio
 
 
         from
         from
         ctop_kuaishou_report_daily_account
         ctop_kuaishou_report_daily_account
@@ -521,24 +521,24 @@
     <select id="selectHourSummaryByMap" parameterType="Map" resultType="com.alibaba.fastjson.JSONObject">
     <select id="selectHourSummaryByMap" parameterType="Map" resultType="com.alibaba.fastjson.JSONObject">
 
 
         select
         select
-        sum(charge) cost, -- 消耗
+        sum(charge) cost,
         (case
         (case
         when sum(charge) != 0
         when sum(charge) != 0
         then (sum(charge) / #{discount})
         then (sum(charge) / #{discount})
         else 0
         else 0
         end
         end
-        ) discountCost, -- 封面点击率
+        ) discountCost,
 
 
-        sum(photo_show) photoShow, -- 封面展示
-        sum(photo_click) photoClick, -- 封面点击
-        sum(aclick) aclick, -- 素材曝光数
+        sum(photo_show) photoShow,
+        sum(photo_click) photoClick,
+        sum(aclick) aclick,
 
 
         (case
         (case
         when sum(photo_show) != 0
         when sum(photo_show) != 0
         then (sum(photo_click) / sum(photo_show))
         then (sum(photo_click) / sum(photo_show))
         else 0
         else 0
         end
         end
-        ) photoClickRatio, -- 封面点击率
+        ) photoClickRatio,
 
 
         (case
         (case
         when sum(bclick) != 0
         when sum(bclick) != 0
@@ -553,8 +553,8 @@
         else 0
         else 0
         end
         end
         ) cpm,
         ) cpm,
-        sum(form_count + activation) conversions, -- 转化数
-        sum(bclick) bClick,-- 行为数
+        sum(form_count + activation) conversions,
+        sum(bclick) bClick,
 
 
         (
         (
         CASE
         CASE
@@ -563,7 +563,7 @@
         ELSE
         ELSE
         0
         0
         END
         END
-        ) conversionPrice, -- 转化单价
+        ) conversionPrice,
         (
         (
         CASE
         CASE
         WHEN sum(activation + form_count) != 0 THEN
         WHEN sum(activation + form_count) != 0 THEN
@@ -572,13 +572,13 @@
         0
         0
         END
         END
         ) discountConversionPrice,
         ) discountConversionPrice,
-        sum(event_register) eventRegister, -- 注册数
+        sum(event_register) eventRegister,
         (case
         (case
         when sum(event_register) != 0
         when sum(event_register) != 0
         then (sum(charge) / sum(event_register))
         then (sum(charge) / sum(event_register))
         else 0
         else 0
         end
         end
-        ) eventRegisterCost -- 注册成本
+        ) eventRegisterCost
 
 
         from
         from
         ctop_kuaishou_report_hourly_account
         ctop_kuaishou_report_hourly_account

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

@@ -5,9 +5,9 @@
     <select id="getDailyReport" parameterType="Map" resultType="cn.com.ctop.common.module.vo.DailyAccountReportVO">
     <select id="getDailyReport" parameterType="Map" resultType="cn.com.ctop.common.module.vo.DailyAccountReportVO">
         SELECT
         SELECT
         t1.*,
         t1.*,
-        truncate((t1.conversions / t1.bclick),4) conversionRate, -- 转化率
+        truncate((t1.conversions / t1.bclick),4) conversionRate,
 
 
-        truncate(t1.conversionPrice / #{discount},2) discountConversionPrice, -- 折后转化成本
+        truncate(t1.conversionPrice / #{discount},2) discountConversionPrice,
 
 
         (SELECT sum(contract_rebate_real_charged)
         (SELECT sum(contract_rebate_real_charged)
         from ctop_kuaishou_daily_flows
         from ctop_kuaishou_daily_flows
@@ -25,13 +25,13 @@
 
 
             </if>
             </if>
         </where>
         </where>
-        ) contractRebateRealCharged -- 激励花费
+        ) contractRebateRealCharged
         FROM (
         FROM (
         SELECT
         SELECT
-        sum(charge) cost, -- 消耗
-        sum(photo_show) photoShow, -- 展现数
-        sum(aclick) aclick, -- 素材曝光数
-        sum(photo_click) photoClick, -- 点击数
+        sum(charge) cost,
+        sum(photo_show) photoShow,
+        sum(aclick) aclick,
+        sum(photo_click) photoClick,
         (
         (
         CASE
         CASE
         WHEN sum(photo_show) != 0 THEN
         WHEN sum(photo_show) != 0 THEN
@@ -41,7 +41,7 @@
         ELSE
         ELSE
         0
         0
         END
         END
-        ) photoClickRatio, -- 点击率
+        ) photoClickRatio,
         (
         (
         CASE
         CASE
         WHEN sum(charge) != 0 THEN
         WHEN sum(charge) != 0 THEN
@@ -51,9 +51,9 @@
         ELSE
         ELSE
         0
         0
         END
         END
-        ) photoClickCost, -- 平均点击花费
+        ) photoClickCost,
 
 
-        sum(bclick) bclick, -- 行为数
+        sum(bclick) bclick,
 
 
         (
         (
         CASE
         CASE
@@ -62,7 +62,7 @@
         ELSE
         ELSE
         0
         0
         END
         END
-        ) actionRatio, -- 行为率
+        ) actionRatio,
         (
         (
         CASE
         CASE
         WHEN sum(photo_show) != 0 THEN
         WHEN sum(photo_show) != 0 THEN
@@ -71,8 +71,8 @@
         ELSE
         ELSE
         0
         0
         END
         END
-        ) impression1kCost, -- 平均千次展现花费
-        sum(form_count + activation) conversions, -- 转化数
+        ) impression1kCost,
+        sum(form_count + activation) conversions,
         (
         (
         CASE
         CASE
         WHEN sum(form_count + activation) != 0 THEN
         WHEN sum(form_count + activation) != 0 THEN
@@ -82,7 +82,7 @@
         ELSE
         ELSE
         0
         0
         END
         END
-        ) conversionPrice -- 转化单价
+        ) conversionPrice
         FROM
         FROM
         ctop_kuaishou_report_daily_account
         ctop_kuaishou_report_daily_account
         <where>
         <where>
@@ -108,8 +108,8 @@
     <select id="getDailyGroupReport" parameterType="Map" resultType="cn.com.ctop.common.module.vo.DailyGroupReportVO">
     <select id="getDailyGroupReport" parameterType="Map" resultType="cn.com.ctop.common.module.vo.DailyGroupReportVO">
         SELECT
         SELECT
         t1.*,
         t1.*,
-        truncate(t1.conversions / t1.photoClick,4) clickConversionRate, -- 点击转化率
-        truncate(t1.conversionPrice / #{discount},2) discountConversionPrice-- 折后转化单价
+        truncate(t1.conversions / t1.photoClick,4) clickConversionRate,
+        truncate(t1.conversionPrice / #{discount},2) discountConversionPrice
         FROM
         FROM
         (
         (
         SELECT
         SELECT
@@ -121,15 +121,15 @@
         ctop_user_allocation
         ctop_user_allocation
         WHERE
         WHERE
         account_id = accountId
         account_id = accountId
-        ) authName, -- 账户名称
-        stat_date statDate, -- 报表日期
-        campaign_name campaignName, -- 计划名称
-        unit_name unitName, -- 广告组名称
-        sum(charge) cost, -- 花费
-        truncate((sum(charge) / #{discount}),2) disCountCost, -- 折后消费
-        sum(photo_show) photoShow, -- 展现数
-        sum(photo_click) photoClick, -- 点击数
-        sum(bclick) bclick, -- 行为数
+        ) authName,
+        stat_date statDate,
+        campaign_name campaignName,
+        unit_name unitName,
+        sum(charge) cost,
+        truncate((sum(charge) / #{discount}),2) disCountCost,
+        sum(photo_show) photoShow,
+        sum(photo_click) photoClick,
+        sum(bclick) bclick,
         (
         (
         CASE
         CASE
         WHEN sum(aclick) != 0 THEN
         WHEN sum(aclick) != 0 THEN
@@ -137,7 +137,7 @@
         ELSE
         ELSE
         0
         0
         END
         END
-        ) actionRatio, -- 行为率
+        ) actionRatio,
 
 
 
 
         (
         (
@@ -147,7 +147,7 @@
         ELSE
         ELSE
         0
         0
         END
         END
-        ) photoClickRatio, -- 点击率
+        ) photoClickRatio,
 
 
 
 
         (
         (
@@ -159,7 +159,7 @@
         ELSE
         ELSE
         0
         0
         END
         END
-        ) impression1kCost, -- 平均千次展现花费
+        ) impression1kCost,
         (
         (
         CASE
         CASE
         WHEN sum(charge) != 0 THEN
         WHEN sum(charge) != 0 THEN
@@ -169,9 +169,9 @@
         ELSE
         ELSE
         0
         0
         END
         END
-        ) photoClickCost, -- 平均点击花费
+        ) photoClickCost,
 
 
-        sum(form_count + activation) conversions, -- 转化数
+        sum(form_count + activation) conversions,
         (
         (
         CASE
         CASE
         WHEN sum(form_count + activation) != 0 THEN
         WHEN sum(form_count + activation) != 0 THEN
@@ -181,7 +181,7 @@
         ELSE
         ELSE
         0
         0
         END
         END
-        ) conversionPrice -- 转化单价
+        ) conversionPrice
 
 
         FROM
         FROM
         ctop_kuaishou_report_daily_group
         ctop_kuaishou_report_daily_group

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

@@ -110,7 +110,7 @@
 
 
     <select id="getDailyReportByMap" parameterType="java.util.Map" resultType="com.alibaba.fastjson.JSONObject">
     <select id="getDailyReportByMap" parameterType="java.util.Map" resultType="com.alibaba.fastjson.JSONObject">
         SELECT
         SELECT
-        '汇创' agent, -- 代理商
+        '汇创' agent,
         (
         (
         CASE
         CASE
         WHEN t1.media_id = 1 THEN
         WHEN t1.media_id = 1 THEN
@@ -120,13 +120,13 @@
         ELSE
         ELSE
         '未知'
         '未知'
         END
         END
-        ) media, -- 媒体
-        t1.system_type systemType, -- 设备
-        t2.stat_date statDate, -- 日期
-        sum(t2.charge) charge, -- 账面花费
-        ROUND(sum(t2.charge) / #{disCount}, 3) cashCost, -- 现金花费
-        sum(t2.photo_show) photoShow, -- 嚗光
-        sum(t2.photo_click) photoClick, -- 点击
+        ) media,
+        t1.system_type systemType,
+        t2.stat_date statDate,
+        sum(t2.charge) charge,
+        ROUND(sum(t2.charge) / #{disCount}, 3) cashCost,
+        sum(t2.photo_show) photoShow,
+        sum(t2.photo_click) photoClick,
         (
         (
         CASE
         CASE
         WHEN sum(t2.photo_show) != 0 THEN
         WHEN sum(t2.photo_show) != 0 THEN
@@ -142,7 +142,7 @@
         ELSE
         ELSE
         0
         0
         END
         END
-        ) clickRate, -- 点击率
+        ) clickRate,
         (
         (
         CASE
         CASE
         WHEN sum(t2.photo_show) != 0 THEN
         WHEN sum(t2.photo_show) != 0 THEN
@@ -155,12 +155,12 @@
         ELSE
         ELSE
         0
         0
         END
         END
-        ) impression1kCost, -- 千次嚗光花费
-        sum(t2.bclick) bclick, -- 行为量
-        sum(t2.download_completed) eventJinJianApp, -- 下载完成数
-        sum(t2.activation) activation, -- 账户激活量
-        0 youMengactivation, -- 友盟激活量
-        sum(t2.activation) tdActivation, -- TD激活量
+        ) impression1kCost,
+        sum(t2.bclick) bclick,
+        sum(t2.download_completed) eventJinJianApp,
+        sum(t2.activation) activation,
+        0 youMengactivation,
+        sum(t2.activation) tdActivation,
         (
         (
         CASE
         CASE
         WHEN sum(t2.activation) != 0 THEN
         WHEN sum(t2.activation) != 0 THEN
@@ -171,8 +171,8 @@
         ELSE
         ELSE
         0
         0
         END
         END
-        ) activationCost, -- 账户激活成本
-        0 youMengactivationCost, -- 友盟激活成本
+        ) activationCost,
+        0 youMengactivationCost,
         (
         (
         CASE
         CASE
         WHEN sum(t2.activation) != 0 THEN
         WHEN sum(t2.activation) != 0 THEN
@@ -183,7 +183,7 @@
         ELSE
         ELSE
         0
         0
         END
         END
-        ) tdActivationCost, -- TD激活成本
+        ) tdActivationCost,
         (
         (
         CASE
         CASE
         WHEN sum(t2.bclick) != 0 THEN
         WHEN sum(t2.bclick) != 0 THEN
@@ -194,7 +194,7 @@
         ELSE
         ELSE
         0
         0
         END
         END
-        ) actionCost, -- 平均行为单价
+        ) actionCost,
         (
         (
         CASE
         CASE
         WHEN sum(t2.photo_click) != 0 THEN
         WHEN sum(t2.photo_click) != 0 THEN
@@ -205,7 +205,7 @@
         ELSE
         ELSE
         0
         0
         END
         END
-        ) clickCost, -- 平均点击单价
+        ) clickCost,
         (
         (
         CASE
         CASE
         WHEN sum(t2.photo_click) != 0 THEN
         WHEN sum(t2.photo_click) != 0 THEN
@@ -219,7 +219,7 @@
         ELSE
         ELSE
         CONCAT(0, '%')
         CONCAT(0, '%')
         END
         END
-        ) actionRatio, -- 行为率
+        ) actionRatio,
         (
         (
         CASE
         CASE
         WHEN sum(t2.bclick) != 0 THEN
         WHEN sum(t2.bclick) != 0 THEN
@@ -233,7 +233,7 @@
         ELSE
         ELSE
         CONCAT(0, '%')
         CONCAT(0, '%')
         END
         END
-        ) eventJinJianAppRatio, -- 下载完成行为率
+        ) eventJinJianAppRatio,
         (
         (
         CASE
         CASE
         WHEN sum(t2.download_completed) != 0 THEN
         WHEN sum(t2.download_completed) != 0 THEN
@@ -247,7 +247,7 @@
         ELSE
         ELSE
         CONCAT(0, '%')
         CONCAT(0, '%')
         END
         END
-        ) activationRatio -- 下载完成激活率
+        ) activationRatio
         FROM
         FROM
         ctop_user_allocation t1
         ctop_user_allocation t1
         LEFT JOIN ctop_kuaishou_report_daily_account t2 ON t1.account_id = t2.account_id
         LEFT JOIN ctop_kuaishou_report_daily_account t2 ON t1.account_id = t2.account_id
@@ -268,7 +268,7 @@
     <select id="getDirectApplicationReportByMap" parameterType="java.util.Map"
     <select id="getDirectApplicationReportByMap" parameterType="java.util.Map"
             resultType="com.alibaba.fastjson.JSONObject">
             resultType="com.alibaba.fastjson.JSONObject">
         SELECT
         SELECT
-        '汇创' agent, -- 代理商
+        '汇创' agent,
         (
         (
         CASE
         CASE
         WHEN t2.media_id = 1 THEN
         WHEN t2.media_id = 1 THEN
@@ -278,13 +278,13 @@
         ELSE
         ELSE
         '未知'
         '未知'
         END
         END
-        ) media, -- 媒体
-        t2.system_type systemType, -- 设备
-        t2.stat_date statDate, -- 日期
-        sum(t2.charge) charge, -- 账面花费
-        ROUND(sum(t2.charge) / #{disCount}, 3) cashCost, -- 现金花费
-        sum(t2.photo_show) photoShow, -- 嚗光
-        sum(t2.photo_click) photoClick, -- 点击
+        ) media,
+        t2.system_type systemType,
+        t2.stat_date statDate,
+        sum(t2.charge) charge,
+        ROUND(sum(t2.charge) / #{disCount}, 3) cashCost,
+        sum(t2.photo_show) photoShow,
+        sum(t2.photo_click) photoClick,
         (
         (
         CASE
         CASE
         WHEN sum(t2.photo_show) != 0 THEN
         WHEN sum(t2.photo_show) != 0 THEN
@@ -300,7 +300,7 @@
         ELSE
         ELSE
         0
         0
         END
         END
-        ) clickRate,-- 点击率
+        ) clickRate,
         (
         (
         CASE
         CASE
         WHEN sum(t2.photo_show) != 0 THEN
         WHEN sum(t2.photo_show) != 0 THEN
@@ -313,12 +313,12 @@
         ELSE
         ELSE
         0
         0
         END
         END
-        ) impression1kCost, -- 千次嚗光花费
-        sum(t2.bclick) bclick, -- 行为量
-        sum(t2.download_completed) eventJinJianApp, -- 下载完成数
-        sum(t2.activation) activation, -- 账户激活量
-        0 youMengactivation, -- 友盟激活量
-        sum(t2.activation) tdActivation, -- TD激活量
+        ) impression1kCost,
+        sum(t2.bclick) bclick,
+        sum(t2.download_completed) eventJinJianApp,
+        sum(t2.activation) activation,
+        0 youMengactivation,
+        sum(t2.activation) tdActivation,
         (
         (
         CASE
         CASE
         WHEN sum(t2.activation) != 0 THEN
         WHEN sum(t2.activation) != 0 THEN
@@ -329,8 +329,8 @@
         ELSE
         ELSE
         0
         0
         END
         END
-        ) activationCost, -- 账户激活成本
-        0 youMengactivationCost,-- 友盟激活成本
+        ) activationCost,
+        0 youMengactivationCost,
         (
         (
         CASE
         CASE
         WHEN sum(t2.activation) != 0 THEN
         WHEN sum(t2.activation) != 0 THEN
@@ -341,7 +341,7 @@
         ELSE
         ELSE
         0
         0
         END
         END
-        ) tdActivationCost,-- TD激活成本
+        ) tdActivationCost,
         (
         (
         CASE
         CASE
         WHEN sum(t2.bclick) != 0 THEN
         WHEN sum(t2.bclick) != 0 THEN
@@ -352,7 +352,7 @@
         ELSE
         ELSE
         0
         0
         END
         END
-        ) actionCost,-- 平均行为单价
+        ) actionCost,
         (
         (
         CASE
         CASE
         WHEN sum(t2.photo_click) != 0 THEN
         WHEN sum(t2.photo_click) != 0 THEN
@@ -363,7 +363,7 @@
         ELSE
         ELSE
         0
         0
         END
         END
-        ) clickCost, -- 平均点击单价
+        ) clickCost,
         (
         (
         CASE
         CASE
         WHEN sum(t2.photo_click) != 0 THEN
         WHEN sum(t2.photo_click) != 0 THEN
@@ -377,7 +377,7 @@
         ELSE
         ELSE
         CONCAT(0, '%')
         CONCAT(0, '%')
         END
         END
-        ) actionRatio, -- 行为率
+        ) actionRatio,
         (
         (
         CASE
         CASE
         WHEN sum(t2.bclick) != 0 THEN
         WHEN sum(t2.bclick) != 0 THEN
@@ -391,7 +391,7 @@
         ELSE
         ELSE
         CONCAT(0, '%')
         CONCAT(0, '%')
         END
         END
-        ) eventJinJianAppRatio, -- 下载完成行为率
+        ) eventJinJianAppRatio,
         (
         (
         CASE
         CASE
         WHEN sum(t2.download_completed) != 0 THEN
         WHEN sum(t2.download_completed) != 0 THEN
@@ -405,7 +405,7 @@
         ELSE
         ELSE
         CONCAT(0, '%')
         CONCAT(0, '%')
         END
         END
-        ) activationRatio -- 下载完成激活率
+        ) activationRatio
         FROM
         FROM
         (
         (
         SELECT
         SELECT
@@ -453,7 +453,7 @@
             resultType="com.alibaba.fastjson.JSONObject">
             resultType="com.alibaba.fastjson.JSONObject">
 
 
         SELECT
         SELECT
-        '汇创' agent, -- 代理商
+        '汇创' agent,
         (
         (
         CASE
         CASE
         WHEN t2.media_id = 1 THEN
         WHEN t2.media_id = 1 THEN
@@ -463,14 +463,14 @@
         ELSE
         ELSE
         '未知'
         '未知'
         END
         END
-        ) media, -- 媒体
-        t2.system_type systemType, -- 设备
-        t2.stat_date statDate, -- 日期
+        ) media,
+        t2.system_type systemType,
+        t2.stat_date statDate,
         t2.campaignName campaignName ,
         t2.campaignName campaignName ,
-        sum(t2.charge) charge, -- 账面花费
-        ROUND(sum(t2.charge) / #{disCount}, 3) cashCost, -- 现金花费
-        sum(t2.photo_show) photoShow, -- 嚗光
-        sum(t2.photo_click) photoClick, -- 点击
+        sum(t2.charge) charge,
+        ROUND(sum(t2.charge) / #{disCount}, 3) cashCost,
+        sum(t2.photo_show) photoShow,
+        sum(t2.photo_click) photoClick,
         (
         (
         CASE
         CASE
         WHEN sum(t2.photo_show) != 0 THEN
         WHEN sum(t2.photo_show) != 0 THEN
@@ -486,7 +486,7 @@
         ELSE
         ELSE
         0
         0
         END
         END
-        ) clickRate,-- 点击率
+        ) clickRate,
         (
         (
         CASE
         CASE
         WHEN sum(t2.photo_show) != 0 THEN
         WHEN sum(t2.photo_show) != 0 THEN
@@ -499,12 +499,12 @@
         ELSE
         ELSE
         0
         0
         END
         END
-        ) impression1kCost, -- 千次嚗光花费
-        sum(t2.bclick) bclick, -- 行为量
-        sum(t2.download_completed) eventJinJianApp, -- 下载完成数
-        sum(t2.activation) activation, -- 账户激活量
-        0 youMengactivation, -- 友盟激活量
-        sum(t2.activation) tdActivation, -- TD激活量
+        ) impression1kCost,
+        sum(t2.bclick) bclick,
+        sum(t2.download_completed) eventJinJianApp,
+        sum(t2.activation) activation,
+        0 youMengactivation,
+        sum(t2.activation) tdActivation,
         (
         (
         CASE
         CASE
         WHEN sum(t2.activation) != 0 THEN
         WHEN sum(t2.activation) != 0 THEN
@@ -515,8 +515,8 @@
         ELSE
         ELSE
         0
         0
         END
         END
-        ) activationCost, -- 账户激活成本
-        0 youMengactivationCost,-- 友盟激活成本
+        ) activationCost,
+        0 youMengactivationCost,
         (
         (
         CASE
         CASE
         WHEN sum(t2.activation) != 0 THEN
         WHEN sum(t2.activation) != 0 THEN
@@ -527,7 +527,7 @@
         ELSE
         ELSE
         0
         0
         END
         END
-        ) tdActivationCost,-- TD激活成本
+        ) tdActivationCost,
         (
         (
         CASE
         CASE
         WHEN sum(t2.bclick) != 0 THEN
         WHEN sum(t2.bclick) != 0 THEN
@@ -538,7 +538,7 @@
         ELSE
         ELSE
         0
         0
         END
         END
-        ) actionCost,-- 平均行为单价
+        ) actionCost,
         (
         (
         CASE
         CASE
         WHEN sum(t2.photo_click) != 0 THEN
         WHEN sum(t2.photo_click) != 0 THEN
@@ -549,7 +549,7 @@
         ELSE
         ELSE
         0
         0
         END
         END
-        ) clickCost, -- 平均点击单价
+        ) clickCost,
         (
         (
         CASE
         CASE
         WHEN sum(t2.photo_click) != 0 THEN
         WHEN sum(t2.photo_click) != 0 THEN
@@ -563,7 +563,7 @@
         ELSE
         ELSE
         CONCAT(0, '%')
         CONCAT(0, '%')
         END
         END
-        ) actionRatio, -- 行为率
+        ) actionRatio,
         (
         (
         CASE
         CASE
         WHEN sum(t2.bclick) != 0 THEN
         WHEN sum(t2.bclick) != 0 THEN
@@ -577,7 +577,7 @@
         ELSE
         ELSE
         CONCAT(0, '%')
         CONCAT(0, '%')
         END
         END
-        ) eventJinJianAppRatio, -- 下载完成行为率
+        ) eventJinJianAppRatio,
         (
         (
         CASE
         CASE
         WHEN sum(t2.download_completed) != 0 THEN
         WHEN sum(t2.download_completed) != 0 THEN
@@ -591,7 +591,7 @@
         ELSE
         ELSE
         CONCAT(0, '%')
         CONCAT(0, '%')
         END
         END
-        ) activationRatio -- 下载完成激活率
+        ) activationRatio
         FROM
         FROM
         (
         (
         SELECT
         SELECT

+ 204 - 230
module-kuaishou/src/main/java/cn/com/ctop/kuaishou/modules/report/mapper/xml/KuaishouReportDailyAccountMapper.xml

@@ -430,9 +430,9 @@
     <insert id="loadAccountDailyReport">
     <insert id="loadAccountDailyReport">
 		LOAD DATA local INFILE  #{localPath}
 		LOAD DATA local INFILE  #{localPath}
 		INTO TABLE ctop_kuaishou_report_daily_account
 		INTO TABLE ctop_kuaishou_report_daily_account
-		FIELDS TERMINATED BY ',' enclosed by '"' LINES TERMINATED BY '\r\n'
+		FIELDS TERMINATED BY ',' enclosed by '"' LINES TERMINATED BY '\n'
 		IGNORE 1 LINES
 		IGNORE 1 LINES
-		(@ad_scene,
+		(ad_scene,
         charge,
         charge,
         photo_show,
         photo_show,
         aclick,
         aclick,
@@ -450,13 +450,13 @@
         activation,
         activation,
         submit,
         submit,
         stat_date,
         stat_date,
-        @stat_hour,
+        stat_hour,
         photo_click,
         photo_click,
         photo_click_ratio,
         photo_click_ratio,
         action_ratio,
         action_ratio,
         impression_1k_cost,
         impression_1k_cost,
         photo_click_cost,
         photo_click_cost,
-        @click_1k_cost,
+        click_1k_cost,
         action_cost,
         action_cost,
         event_pay_first_day,
         event_pay_first_day,
         event_pay_purchase_amount_first_day,
         event_pay_purchase_amount_first_day,
@@ -487,41 +487,41 @@
         event_next_day_stay_ratio,
         event_next_day_stay_ratio,
         event_next_day_stay,
         event_next_day_stay,
         play_3s_ratio,
         play_3s_ratio,
-        @event_valid_clues,
-        @event_valid_clues_cost,
-        @ad_product_cnt,
-        @event_goods_view,
-        @merchant_reco_fans,
-        @event_order_amount_roi,
-        @event_goods_view_cost,
-        @merchant_reco_fans_cost,
-        @event_new_user_pay,
-        @event_new_user_pay_cost,
-        @event_new_user_pay_ratio,
-        @event_button_click,
-        @event_button_click_cost,
-        @event_button_click_ratio,
-        @play_5s_ratio,
-        @play_end_ratio,
-        @event_order_paid_roi,
-        @event_new_user_jinjian_app,
-        @event_new_user_jinjian_app_cost,
-        @event_new_user_jinjian_app_roi,
-        @event_new_user_credit_grant_app,
-        @event_new_user_credit_grant_app_cost,
-        @event_new_user_credit_grant_app_roi,
-        @event_new_user_jinjian_page,
-        @event_new_user_jinjian_page_cost,
-        @event_new_user_jinjian_page_roi,
-        @event_new_user_credit_grant_page,
-        @event_new_user_credit_grant_page_cost,
-        @event_new_user_credit_grant_page_roi,
-        @event_appoint_form,
-        @event_appoint_form_cost,
-        @event_appoint_form_ratio,
-        @event_appoint_jump_click,
-        @event_appoint_jump_click_cost,
-        @event_appoint_jump_click_ratio
+        event_valid_clues,
+        event_valid_clues_cost,
+        ad_product_cnt,
+        event_goods_view,
+        merchant_reco_fans,
+        event_order_amount_roi,
+        event_goods_view_cost,
+        merchant_reco_fans_cost,
+        event_new_user_pay,
+        event_new_user_pay_cost,
+        event_new_user_pay_ratio,
+        event_button_click,
+        event_button_click_cost,
+        event_button_click_ratio,
+        play_5s_ratio,
+        play_end_ratio,
+        event_order_paid_roi,
+        event_new_user_jinjian_app,
+        event_new_user_jinjian_app_cost,
+        event_new_user_jinjian_app_roi,
+        event_new_user_credit_grant_app,
+        event_new_user_credit_grant_app_cost,
+        event_new_user_credit_grant_app_roi,
+        event_new_user_jinjian_page,
+        event_new_user_jinjian_page_cost,
+        event_new_user_jinjian_page_roi,
+        event_new_user_credit_grant_page,
+        event_new_user_credit_grant_page_cost,
+        event_new_user_credit_grant_page_roi,
+        event_appoint_form,
+        event_appoint_form_cost,
+        event_appoint_form_ratio,
+        event_appoint_jump_click,
+        event_appoint_jump_click_cost,
+        event_appoint_jump_click_ratio
         )
         )
           set account_id = #{accountId}
           set account_id = #{accountId}
     </insert>
     </insert>
@@ -547,52 +547,52 @@
         b.project_id as 'projectId',
         b.project_id as 'projectId',
         (select project_name from ctop_project where id = b.project_id) as 'projectName',
         (select project_name from ctop_project where id = b.project_id) as 'projectName',
         round(sum(a.charge),2) as 'charge',
         round(sum(a.charge),2) as 'charge',
-        sum(a.photo_show) as 'photoShow', -- 封面曝光数
-        sum(a.photo_click) as 'photoClick', -- 封面点击数
-        sum(a.aclick) as 'aclick', -- 素材曝光数
-        sum(a.bclick) as 'bclick', -- 行为数
-        sum(a.activation) as 'activation', -- 激活数
-        sum(a.submit) as 'submit', -- 提交按钮点击数
-        sum(a.event_register) as 'eventRegister', -- 注册数
-        sum(a.event_next_day_stay) as 'eventNextDayStay', -- 次日留存数
-        ROUND(IFNULL(sum(a.charge)/sum(a.activation),0),2) as 'activationCost', -- 激活成本
+        sum(a.photo_show) as 'photoShow',
+        sum(a.photo_click) as 'photoClick',
+        sum(a.aclick) as 'aclick',
+        sum(a.bclick) as 'bclick',
+        sum(a.activation) as 'activation',
+        sum(a.submit) as 'submit',
+        sum(a.event_register) as 'eventRegister',
+        sum(a.event_next_day_stay) as 'eventNextDayStay',
+        ROUND(IFNULL(sum(a.charge)/sum(a.activation),0),2) as 'activationCost',
         case when photo_show!=0 then concat(round(sum(a.photo_click)/sum(a.photo_show) * 100 ,2),'%') else 0 end as
         case when photo_show!=0 then concat(round(sum(a.photo_click)/sum(a.photo_show) * 100 ,2),'%') else 0 end as
-        'photoClickRatio', -- 封面点击率
+        'photoClickRatio',
         case when aclick!=0 then concat(round(sum(a.bclick)/sum(a.aclick) * 100 ,2),'%') else 0 end as 'actionRate',
         case when aclick!=0 then concat(round(sum(a.bclick)/sum(a.aclick) * 100 ,2),'%') else 0 end as 'actionRate',
         (case
         (case
         when sum(a.photo_show) != 0
         when sum(a.photo_show) != 0
         then round((sum(a.charge) / sum(a.photo_show)) * 1000,2)
         then round((sum(a.charge) / sum(a.photo_show)) * 1000,2)
         else 0
         else 0
         end
         end
-        ) as 'impression1kCost', -- 均千次封面曝光花费
+        ) as 'impression1kCost',
         (case
         (case
         when sum(a.photo_click) != 0
         when sum(a.photo_click) != 0
         then round(sum(a.charge) / sum(a.photo_click),2)
         then round(sum(a.charge) / sum(a.photo_click),2)
         else 0
         else 0
         end
         end
-        ) as 'photoClickCost', -- 平均封面点击单价
+        ) as 'photoClickCost',
         (CASE
         (CASE
         WHEN sum(a.bclick) != 0
         WHEN sum(a.bclick) != 0
         THEN round(sum(a.charge) / sum(a.bclick),2)
         THEN round(sum(a.charge) / sum(a.bclick),2)
         ELSE 0
         ELSE 0
         end
         end
-        ) as 'actionCost', -- 平均行为单价
-        sum(a.photo_share) as 'photoShare', -- 分享数
-        sum(a.photo_comment) as 'photoComment', -- 评论数
-        sum(a.photo_like) as 'photoLike', -- 点赞数
-        sum(a.follow) as 'follow', -- 新增关注数
-        sum(a.report) as 'report', -- 举报数
-        sum(a.cancel_follow) as 'cancelFollow', -- 取消关注数
-        sum(a.block) as 'block', -- 拉黑数
-        sum(a.negative) as 'nagative', -- 减少此类作品数
-        sum(a.download_started) as 'downloadStarted', -- 应用下载数据-安卓下载开始数
-        sum(a.download_completed) as 'downloadCompleted', -- 应用下载数据-安卓下载完成数
+        ) as 'actionCost',
+        sum(a.photo_share) as 'photoShare',
+        sum(a.photo_comment) as 'photoComment',
+        sum(a.photo_like) as 'photoLike',
+        sum(a.follow) as 'follow',
+        sum(a.report) as 'report',
+        sum(a.cancel_follow) as 'cancelFollow',
+        sum(a.block) as 'block',
+        sum(a.negative) as 'nagative',
+        sum(a.download_started) as 'downloadStarted',
+        sum(a.download_completed) as 'downloadCompleted',
         (CASE
         (CASE
         WHEN sum(a.event_next_day_stay) != 0
         WHEN sum(a.event_next_day_stay) != 0
         THEN round(sum(a.charge) / sum(a.event_next_day_stay),2)
         THEN round(sum(a.charge) / sum(a.event_next_day_stay),2)
         ELSE 0
         ELSE 0
         end
         end
-        ) as 'eventNextDayStayCost' -- 次日留存成本
+        ) as 'eventNextDayStayCost'
         from
         from
         ctop_kuaishou_report_daily_account a
         ctop_kuaishou_report_daily_account a
         left join ctop_user_allocation b on a.account_id = b.account_id
         left join ctop_user_allocation b on a.account_id = b.account_id
@@ -646,53 +646,53 @@
         )
         )
         ) as 'designResponsibleName',
         ) as 'designResponsibleName',
         ifnull(round(sum(a.charge),3),0) as 'charge',
         ifnull(round(sum(a.charge),3),0) as 'charge',
-        ifnull(sum(a.photo_show),0) as 'photoShow', -- 封面曝光数
-        ifnull(sum(a.photo_click),0) as 'photoClick', -- 封面点击数
-        ifnull(sum(a.aclick),0) as 'aclick', -- 素材曝光数
-        ifnull(sum(a.bclick),0) as 'bclick', -- 行为数
-        ifnull(sum(a.activation),0) as 'activation', -- 激活数
-        ifnull(sum(a.submit),0) as 'submit', -- 提交按钮点击数
-        ifnull(sum(a.event_register),0) as 'eventRegister', -- 注册数
-        ifnull(sum(event_next_day_stay),0) as 'eventNextDayStay', -- 次日留存数
-        ROUND(IFNULL(sum(a.charge)/sum(a.activation),0),2) as 'activationCost', -- 激活成本
+        ifnull(sum(a.photo_show),0) as 'photoShow',
+        ifnull(sum(a.photo_click),0) as 'photoClick',
+        ifnull(sum(a.aclick),0) as 'aclick',
+        ifnull(sum(a.bclick),0) as 'bclick',
+        ifnull(sum(a.activation),0) as 'activation',
+        ifnull(sum(a.submit),0) as 'submit',
+        ifnull(sum(a.event_register),0) as 'eventRegister',
+        ifnull(sum(event_next_day_stay),0) as 'eventNextDayStay',
+        ROUND(IFNULL(sum(a.charge)/sum(a.activation),0),2) as 'activationCost',
         case when (sum(a.photo_show) is not null and sum(a.photo_show)!=0) then
         case when (sum(a.photo_show) is not null and sum(a.photo_show)!=0) then
         concat(round(ifnull(sum(a.photo_click),0)/sum(a.photo_show) * 100 ,2),'%') else 0 end as 'photoClickRate',
         concat(round(ifnull(sum(a.photo_click),0)/sum(a.photo_show) * 100 ,2),'%') else 0 end as 'photoClickRate',
         case when (sum(a.aclick) is not null and sum(a.aclick)!=0) then
         case when (sum(a.aclick) is not null and sum(a.aclick)!=0) then
-        concat(round(ifnull(sum(a.bclick),0)/sum(a.aclick) * 100 ,2),'%') else 0 end as 'bclickRate', -- 行为率
+        concat(round(ifnull(sum(a.bclick),0)/sum(a.aclick) * 100 ,2),'%') else 0 end as 'bclickRate',
         (case
         (case
         when (sum(a.photo_show) is not null and sum(a.photo_show) != 0)
         when (sum(a.photo_show) is not null and sum(a.photo_show) != 0)
         then round((ifnull(sum(a.charge),0) / sum(a.photo_show)) * 1000,2)
         then round((ifnull(sum(a.charge),0) / sum(a.photo_show)) * 1000,2)
         else 0
         else 0
         end
         end
-        ) as 'impression1kCost', -- 均千次封面曝光花费
+        ) as 'impression1kCost',
         (case
         (case
         when (sum(a.photo_click) is not null and sum(a.photo_click) != 0)
         when (sum(a.photo_click) is not null and sum(a.photo_click) != 0)
         then round( ifnull(sum(a.charge),0) / sum(a.photo_click),2)
         then round( ifnull(sum(a.charge),0) / sum(a.photo_click),2)
         else 0
         else 0
         end
         end
-        ) as 'photoClickCost', -- 平均封面点击单价
+        ) as 'photoClickCost',
         (CASE
         (CASE
         WHEN ( sum(a.bclick) is not null and sum(a.bclick) != 0)
         WHEN ( sum(a.bclick) is not null and sum(a.bclick) != 0)
         THEN round(sum(a.charge) / sum(a.bclick),2)
         THEN round(sum(a.charge) / sum(a.bclick),2)
         ELSE 0
         ELSE 0
         end
         end
-        ) as 'actionCost', -- 平均行为单价
-        ifnull(sum(a.photo_share),0) as 'photoShare', -- 分享数
-        ifnull(sum(a.photo_comment),0) as 'photoComment', -- 评论数
-        ifnull(sum(a.photo_like),0) as 'photoLike', -- 点赞数
-        ifnull(sum(a.follow),0) as 'follow', -- 新增关注数
-        ifnull(sum(a.report),0) as 'report', -- 举报数
-        ifnull(sum(a.cancel_follow),0) as 'cancelFollow', -- 取消关注数
-        ifnull(sum(a.block),0) as 'block', -- 拉黑数
-        ifnull(sum(a.negative),0) as 'nagative', -- 减少此类作品数
-        ifnull(sum(a.download_started),0) as 'downloadStarted', -- 应用下载数据-安卓下载开始数
-        ifnull(sum(a.download_completed),0) as 'downloadCompleted', -- 应用下载数据-安卓下载完成数
+        ) as 'actionCost',
+        ifnull(sum(a.photo_share),0) as 'photoShare',
+        ifnull(sum(a.photo_comment),0) as 'photoComment',
+        ifnull(sum(a.photo_like),0) as 'photoLike',
+        ifnull(sum(a.follow),0) as 'follow',
+        ifnull(sum(a.report),0) as 'report',
+        ifnull(sum(a.cancel_follow),0) as 'cancelFollow',
+        ifnull(sum(a.block),0) as 'block',
+        ifnull(sum(a.negative),0) as 'nagative',
+        ifnull(sum(a.download_started),0) as 'downloadStarted',
+        ifnull(sum(a.download_completed),0) as 'downloadCompleted',
         (CASE
         (CASE
         WHEN ( sum(a.event_next_day_stay) is not null and sum(a.event_next_day_stay) != 0)
         WHEN ( sum(a.event_next_day_stay) is not null and sum(a.event_next_day_stay) != 0)
         THEN round( ifnull(sum(a.charge),0) / sum(a.event_next_day_stay) ,2)
         THEN round( ifnull(sum(a.charge),0) / sum(a.event_next_day_stay) ,2)
         ELSE 0
         ELSE 0
         end
         end
-        ) as 'eventNextDayStayCost' -- 次日留存成本
+        ) as 'eventNextDayStayCost'
         from
         from
         ctop_kuaishou_report_daily_account a
         ctop_kuaishou_report_daily_account a
         left join ctop_user_allocation b
         left join ctop_user_allocation b
@@ -710,10 +710,10 @@
         group by b.project_id order by sum(a.charge) desc
         group by b.project_id order by sum(a.charge) desc
     </select>
     </select>
 
 
-    <!-- 计划汇总 -->
+
     <select id="getKuaishouCampaignInfoByAccountId"
     <select id="getKuaishouCampaignInfoByAccountId"
             resultType="cn.com.ctop.kuaishou.modules.report.entity.KuaishouReportDailyAccountDTO">
             resultType="cn.com.ctop.kuaishou.modules.report.entity.KuaishouReportDailyAccountDTO">
-        -- select * from(
+
         select
         select
         #{yn} as 'yn',
         #{yn} as 'yn',
         concat(#{startDate}, '~' ,#{endDate}) as 'statDate',
         concat(#{startDate}, '~' ,#{endDate}) as 'statDate',
@@ -721,55 +721,55 @@
         (select project_name from ctop_project where id = b.project_id) as 'projectName',
         (select project_name from ctop_project where id = b.project_id) as 'projectName',
         b.auth_name as 'authName',
         b.auth_name as 'authName',
         a.account_id as 'accountId',
         a.account_id as 'accountId',
-        a.campaign_id as 'campaignId', -- 计划id
-        a.campaign_name as 'campaignName', -- 计划名称
+        a.campaign_id as 'campaignId',
+        a.campaign_name as 'campaignName',
         round(sum(a.charge),2) as 'charge',
         round(sum(a.charge),2) as 'charge',
-        sum(a.photo_show) as 'photoShow', -- 封面曝光数
-        sum(a.photo_click) as 'photoClick', -- 封面点击数
-        sum(a.aclick) as 'aclick', -- 素材曝光数
-        sum(a.bclick) as 'bclick', -- 行为数
-        sum(a.activation) as 'activation', -- 激活数
-        sum(a.submit) as 'submit', -- 提交按钮点击数
-        sum(a.event_register) as 'eventRegister', -- 注册数
-        sum(event_next_day_stay) as 'eventNextDayStay', -- 次日留存数
-        ROUND(IFNULL(sum(a.charge)/sum(a.activation),0),2) as 'activationCost', -- 激活成本
+        sum(a.photo_show) as 'photoShow',
+        sum(a.photo_click) as 'photoClick',
+        sum(a.aclick) as 'aclick',
+        sum(a.bclick) as 'bclick',
+        sum(a.activation) as 'activation',
+        sum(a.submit) as 'submit',
+        sum(a.event_register) as 'eventRegister',
+        sum(event_next_day_stay) as 'eventNextDayStay',
+        ROUND(IFNULL(sum(a.charge)/sum(a.activation),0),2) as 'activationCost',
         case when photo_show!=0 then concat(round(sum(a.photo_click)/sum(a.photo_show) * 100 ,2),'%') else 0 end as
         case when photo_show!=0 then concat(round(sum(a.photo_click)/sum(a.photo_show) * 100 ,2),'%') else 0 end as
-        'photoClickRatio', -- 封面点击率
-        case when aclick!=0 then concat(round(sum(a.bclick)/sum(a.aclick) * 100 ,2),'%') else 0 end as 'actionRate', --
+        'photoClickRatio',
+        case when aclick!=0 then concat(round(sum(a.bclick)/sum(a.aclick) * 100 ,2),'%') else 0 end as 'actionRate',
         (case
         (case
         when sum(a.photo_show) != 0
         when sum(a.photo_show) != 0
         then round((sum(a.charge) / sum(a.photo_show)) * 1000,2)
         then round((sum(a.charge) / sum(a.photo_show)) * 1000,2)
         else 0
         else 0
         end
         end
-        ) as 'impression1kCost', -- 均千次封面曝光花费
+        ) as 'impression1kCost',
         (case
         (case
         when sum(a.photo_click) != 0
         when sum(a.photo_click) != 0
         then round(sum(a.charge) / sum(a.photo_click),2)
         then round(sum(a.charge) / sum(a.photo_click),2)
         else 0
         else 0
         end
         end
-        ) as 'photoClickCost', -- 平均封面点击单价
+        ) as 'photoClickCost',
         (CASE
         (CASE
         WHEN sum(a.bclick) != 0
         WHEN sum(a.bclick) != 0
         THEN round(sum(a.charge) / sum(a.bclick),2)
         THEN round(sum(a.charge) / sum(a.bclick),2)
         ELSE 0
         ELSE 0
         end
         end
-        ) as 'actionCost', -- 平均行为单价
-        sum(a.photo_share) as 'photoShare', -- 分享数
-        sum(a.photo_comment) as 'photoComment', -- 评论数
-        sum(a.photo_like) as 'photoLike', -- 点赞数
-        sum(a.follow) as 'follow', -- 新增关注数
-        sum(a.report) as 'report', -- 举报数
-        sum(a.cancel_follow) as 'cancelFollow', -- 取消关注数
-        sum(a.block) as 'block', -- 拉黑数
-        sum(a.negative) as 'nagative', -- 减少此类作品数
-        sum(a.download_started) as 'downloadStarted', -- 应用下载数据-安卓下载开始数
-        sum(a.download_completed) as 'downloadCompleted', -- 应用下载数据-安卓下载完成数
+        ) as 'actionCost',
+        sum(a.photo_share) as 'photoShare',
+        sum(a.photo_comment) as 'photoComment',
+        sum(a.photo_like) as 'photoLike',
+        sum(a.follow) as 'follow',
+        sum(a.report) as 'report',
+        sum(a.cancel_follow) as 'cancelFollow',
+        sum(a.block) as 'block',
+        sum(a.negative) as 'nagative',
+        sum(a.download_started) as 'downloadStarted',
+        sum(a.download_completed) as 'downloadCompleted',
         (CASE
         (CASE
         WHEN sum(a.event_next_day_stay) != 0
         WHEN sum(a.event_next_day_stay) != 0
         THEN round(sum(a.charge) / sum(a.event_next_day_stay),2)
         THEN round(sum(a.charge) / sum(a.event_next_day_stay),2)
         ELSE 0
         ELSE 0
         end
         end
-        ) as 'eventNextDayStayCost' -- 次日留存成本
+        ) as 'eventNextDayStayCost'
         from
         from
         ctop_kuaishou_report_daily_campaign a
         ctop_kuaishou_report_daily_campaign a
         left join ctop_user_allocation b on a.account_id = b.account_id
         left join ctop_user_allocation b on a.account_id = b.account_id
@@ -798,18 +798,13 @@
         </if>
         </if>
         group by a.campaign_id
         group by a.campaign_id
         order by sum(a.charge) desc
         order by sum(a.charge) desc
-        <!--        ) m-->
 
 
-        <!--        <if test="yn = 1">-->
-        <!--            where-->
-        <!--            m.charge != 0-->
-        <!--        </if>-->
     </select>
     </select>
 
 
-    <!-- 根据计划id获取组信息 -->
+
     <select id="getKuaishouUnitInfoByCampaignId"
     <select id="getKuaishouUnitInfoByCampaignId"
             resultType="cn.com.ctop.kuaishou.modules.report.entity.KuaishouReportDailyAccountDTO">
             resultType="cn.com.ctop.kuaishou.modules.report.entity.KuaishouReportDailyAccountDTO">
-        -- select * from (
+
         select
         select
         #{yn} as 'yn',
         #{yn} as 'yn',
         concat(#{startDate}, '~' ,#{endDate}) as 'statDate',
         concat(#{startDate}, '~' ,#{endDate}) as 'statDate',
@@ -817,61 +812,61 @@
         (select project_name from ctop_project where id = b.project_id) as 'projectName',
         (select project_name from ctop_project where id = b.project_id) as 'projectName',
         a.account_id as 'accountId',
         a.account_id as 'accountId',
         b.auth_name as 'authName',
         b.auth_name as 'authName',
-        a.campaign_id as 'campaignId', -- 计划id
-        a.campaign_name as 'campaignName', -- 计划名称
-        a.unit_id as 'unitId', -- 组id,
-        a.unit_name as 'unitName', -- 组名称
+        a.campaign_id as 'campaignId',
+        a.campaign_name as 'campaignName',
+        a.unit_id as 'unitId',
+        a.unit_name as 'unitName',
         round(sum(a.charge),2) as 'charge',
         round(sum(a.charge),2) as 'charge',
-        sum(a.photo_show) as 'photoShow', -- 封面曝光数
-        sum(a.photo_click) as 'photoClick', -- 封面点击数
-        sum(a.aclick) as 'aclick', -- 素材曝光数
-        sum(a.bclick) as 'bclick', -- 行为数
-        sum(a.activation) as 'activation', -- 激活数
-        sum(a.submit) as 'submit', -- 提交按钮点击数
-        sum(a.event_register) as 'eventRegister', -- 注册数
-        sum(event_next_day_stay) as 'eventNextDayStay', -- 次日留存数
-        ROUND(IFNULL(sum(a.charge)/sum(a.activation),0),2) as 'activationCost', -- 激活成本
+        sum(a.photo_show) as 'photoShow',
+        sum(a.photo_click) as 'photoClick',
+        sum(a.aclick) as 'aclick',
+        sum(a.bclick) as 'bclick',
+        sum(a.activation) as 'activation',
+        sum(a.submit) as 'submit',
+        sum(a.event_register) as 'eventRegister',
+        sum(event_next_day_stay) as 'eventNextDayStay',
+        ROUND(IFNULL(sum(a.charge)/sum(a.activation),0),2) as 'activationCost',
         case when photo_show!=0 then concat(round(sum(a.photo_click)/sum(a.photo_show) * 100 ,2),'%') else 0 end as
         case when photo_show!=0 then concat(round(sum(a.photo_click)/sum(a.photo_show) * 100 ,2),'%') else 0 end as
-        'photoClickRatio', -- 封面点击率
+        'photoClickRatio',
         case when aclick!=0 then concat(round(sum(a.bclick)/sum(a.aclick) * 100 ,2),'%') else 0 end as 'actionRate',
         case when aclick!=0 then concat(round(sum(a.bclick)/sum(a.aclick) * 100 ,2),'%') else 0 end as 'actionRate',
         (case
         (case
         when sum(a.photo_show) != 0
         when sum(a.photo_show) != 0
         then round((sum(a.charge) / sum(a.photo_show)) * 1000,2)
         then round((sum(a.charge) / sum(a.photo_show)) * 1000,2)
         else 0
         else 0
         end
         end
-        ) as 'impression1kCost', -- 均千次封面曝光花费
+        ) as 'impression1kCost',
         (case
         (case
         when sum(a.photo_click) != 0
         when sum(a.photo_click) != 0
         then round(sum(a.charge) / sum(a.photo_click),2)
         then round(sum(a.charge) / sum(a.photo_click),2)
         else 0
         else 0
         end
         end
-        ) as 'photoClickCost', -- 平均封面点击单价
+        ) as 'photoClickCost',
         (CASE
         (CASE
         WHEN sum(a.bclick) != 0
         WHEN sum(a.bclick) != 0
         THEN round(sum(a.charge) / sum(a.bclick),2)
         THEN round(sum(a.charge) / sum(a.bclick),2)
         ELSE 0
         ELSE 0
         end
         end
-        ) as 'actionCost', -- 平均行为单价
-        sum(a.photo_share) as 'photoShare', -- 分享数
-        sum(a.photo_comment) as 'photoComment', -- 评论数
-        sum(a.photo_like) as 'photoLike', -- 点赞数
-        sum(a.follow) as 'follow', -- 新增关注数
-        sum(a.report) as 'report', -- 举报数
-        sum(a.cancel_follow) as 'cancelFollow', -- 取消关注数
-        sum(a.block) as 'block', -- 拉黑数
-        sum(a.negative) as 'nagative', -- 减少此类作品数
-        sum(a.download_started) as 'downloadStarted', -- 应用下载数据-安卓下载开始数
-        sum(a.download_completed) as 'downloadCompleted', -- 应用下载数据-安卓下载完成数
+        ) as 'actionCost',
+        sum(a.photo_share) as 'photoShare',
+        sum(a.photo_comment) as 'photoComment',
+        sum(a.photo_like) as 'photoLike',
+        sum(a.follow) as 'follow',
+        sum(a.report) as 'report',
+        sum(a.cancel_follow) as 'cancelFollow',
+        sum(a.block) as 'block',
+        sum(a.negative) as 'nagative',
+        sum(a.download_started) as 'downloadStarted',
+        sum(a.download_completed) as 'downloadCompleted',
         (CASE
         (CASE
         WHEN sum(a.event_next_day_stay) != 0
         WHEN sum(a.event_next_day_stay) != 0
         THEN round(sum(a.charge) / sum(a.event_next_day_stay),2)
         THEN round(sum(a.charge) / sum(a.event_next_day_stay),2)
         ELSE 0
         ELSE 0
         end
         end
-        ) as 'eventNextDayStayCost' -- 次日留存成本
+        ) as 'eventNextDayStayCost'
         from
         from
         ctop_kuaishou_report_daily_group a
         ctop_kuaishou_report_daily_group a
         left join ctop_user_allocation b on a.account_id = b.account_id
         left join ctop_user_allocation b on a.account_id = b.account_id
-        -- left join ctop_kuaishou_campaign c on a.campaign_id = c.campaign_id
+
         where
         where
         a.stat_date &gt;= #{startDate}
         a.stat_date &gt;= #{startDate}
         and
         and
@@ -897,11 +892,7 @@
         </if>
         </if>
         group by unit_id
         group by unit_id
         order by sum(a.charge) desc
         order by sum(a.charge) desc
-        <!--            ) m-->
-        <!--        <if test="yn = 1">-->
-        <!--            where-->
-        <!--            m.charge != 0-->
-        <!--        </if>-->
+
     </select>
     </select>
 
 
     <select id="queryProjectMemberByUserId" resultType="long">
     <select id="queryProjectMemberByUserId" resultType="long">
@@ -922,14 +913,6 @@
     <select id="queryProjectInfoBySaleId" resultType="long">
     <select id="queryProjectInfoBySaleId" resultType="long">
         select
         select
         distinct c.id as projectId
         distinct c.id as projectId
-        -- c.project_name as projectName,
-        -- a.advertiser_id as advertiserId,
-        -- c.advertiser_name as advertiserName,
-        -- (SELECT media_id from ctop_project c where c.id=a.project_id limit 1) as mediaId,
-        -- c.responsible_name as responsibleName,
-        -- c.design_responsible_name as designResponsibleName,
-        -- c.sale_id as saleId,
-        -- u.realname as saleName
         from
         from
         ctop_project c
         ctop_project c
         left join sys_user u on c.sale_id = u.id
         left join sys_user u on c.sale_id = u.id
@@ -946,9 +929,7 @@
         select
         select
         distinct id as projectId,
         distinct id as projectId,
         project_name as projectName,
         project_name as projectName,
-        -- a.advertiser_id as advertiserId,
         advertiser_name as advertiserName,
         advertiser_name as advertiserName,
-        -- (SELECT media_id from ctop_project c where c.id=a.project_id limit 1) as mediaId,
         responsible_name as responsibleName,
         responsible_name as responsibleName,
         design_responsible_name as designResponsibleName
         design_responsible_name as designResponsibleName
         from ctop_project
         from ctop_project
@@ -970,14 +951,10 @@
         where a.user_id = #{userId}
         where a.user_id = #{userId}
     </select>
     </select>
 
 
-    <!-- 管理员所在项目 -->
+
     <select id="queryProjectMemberByAdmins" resultType="long">
     <select id="queryProjectMemberByAdmins" resultType="long">
         select
         select
         id as projectId
         id as projectId
-        -- project_name as projectName,
-        -- advertiser_name as advertiserName ,
-        -- responsible_name as responsibleName,
-        -- design_responsible_name as designResponsibleName
         from
         from
         ctop_project
         ctop_project
         where
         where
@@ -991,7 +968,7 @@
 
 
     <select id="getKuaishouCreativeInfoByUnitId"
     <select id="getKuaishouCreativeInfoByUnitId"
             resultType="cn.com.ctop.kuaishou.modules.report.entity.KuaishouReportDailyAccountDTO">
             resultType="cn.com.ctop.kuaishou.modules.report.entity.KuaishouReportDailyAccountDTO">
-        -- select * from (
+
         select
         select
         #{yn} as 'yn',
         #{yn} as 'yn',
         concat(#{startDate}, '~' ,#{endDate}) as 'statDate',
         concat(#{startDate}, '~' ,#{endDate}) as 'statDate',
@@ -1001,57 +978,57 @@
         b.auth_name as 'authName',
         b.auth_name as 'authName',
         a.creative_id as 'creativeId',
         a.creative_id as 'creativeId',
         a.creative_name as 'creativeName',
         a.creative_name as 'creativeName',
-        a.campaign_id as 'campaignId', -- 计划id
-        a.campaign_name as 'campaignName', -- 计划名称
-        a.unit_id as 'unitId', -- 组id,
-        a.unit_name as 'unitName', -- 组名称
+        a.campaign_id as 'campaignId',
+        a.campaign_name as 'campaignName',
+        a.unit_id as 'unitId',
+        a.unit_name as 'unitName',
         round(sum(a.charge),2) as 'charge',
         round(sum(a.charge),2) as 'charge',
-        sum(a.photo_show) as 'photoShow', -- 封面曝光数
-        sum(a.photo_click) as 'photoClick', -- 封面点击数
-        sum(a.aclick) as 'aclick', -- 素材曝光数
-        sum(a.bclick) as 'bclick', -- 行为数
-        sum(a.activation) as 'activation', -- 激活数
-        sum(a.submit) as 'submit', -- 提交按钮点击数
-        sum(a.event_register) as 'eventRegister', -- 注册数
-        sum(event_next_day_stay) as 'eventNextDayStay', -- 次日留存数
-        ROUND(IFNULL(sum(a.charge)/sum(a.activation),0),2) as 'activationCost', -- 激活成本
+        sum(a.photo_show) as 'photoShow',
+        sum(a.photo_click) as 'photoClick',
+        sum(a.aclick) as 'aclick',
+        sum(a.bclick) as 'bclick',
+        sum(a.activation) as 'activation',
+        sum(a.submit) as 'submit',
+        sum(a.event_register) as 'eventRegister',
+        sum(event_next_day_stay) as 'eventNextDayStay',
+        ROUND(IFNULL(sum(a.charge)/sum(a.activation),0),2) as 'activationCost',
         case when photo_show!=0 then concat(round(sum(a.photo_click)/sum(a.photo_show) * 100 ,2),'%') else 0 end as
         case when photo_show!=0 then concat(round(sum(a.photo_click)/sum(a.photo_show) * 100 ,2),'%') else 0 end as
-        'photoClickRatio', -- 封面点击率
+        'photoClickRatio',
         case when aclick!=0 then concat(round(sum(a.bclick)/sum(a.aclick) * 100 ,2),'%') else 0 end as 'actionRate',
         case when aclick!=0 then concat(round(sum(a.bclick)/sum(a.aclick) * 100 ,2),'%') else 0 end as 'actionRate',
         (case
         (case
         when sum(a.photo_show) != 0 and sum(a.photo_show) is not null
         when sum(a.photo_show) != 0 and sum(a.photo_show) is not null
         then round((sum(a.charge) / sum(a.photo_show)) * 1000,2)
         then round((sum(a.charge) / sum(a.photo_show)) * 1000,2)
         else 0
         else 0
         end
         end
-        ) as 'impression1kCost', -- 均千次封面曝光花费
+        ) as 'impression1kCost',
         (case
         (case
         when sum(a.photo_click) != 0
         when sum(a.photo_click) != 0
         then round(sum(a.charge) / sum(a.photo_click),2)
         then round(sum(a.charge) / sum(a.photo_click),2)
         else 0
         else 0
         end
         end
-        ) as 'photoClickCost', -- 平均封面点击单价
+        ) as 'photoClickCost',
         (CASE
         (CASE
         WHEN sum(a.bclick) != 0
         WHEN sum(a.bclick) != 0
         THEN round(sum(a.charge) / sum(a.bclick),2)
         THEN round(sum(a.charge) / sum(a.bclick),2)
         ELSE 0
         ELSE 0
         end
         end
-        ) as 'actionCost', -- 平均行为单价
-        sum(a.photo_share) as 'photoShare', -- 分享数
-        sum(a.photo_comment) as 'photoComment', -- 评论数
-        sum(a.photo_like) as 'photoLike', -- 点赞数
-        sum(a.follow) as 'follow', -- 新增关注数
-        sum(a.report) as 'report', -- 举报数
-        sum(a.cancel_follow) as 'cancelFollow', -- 取消关注数
-        sum(a.block) as 'block', -- 拉黑数
-        sum(a.negative) as 'nagative', -- 减少此类作品数
-        sum(a.download_started) as 'downloadStarted', -- 应用下载数据-安卓下载开始数
-        sum(a.download_completed) as 'downloadCompleted', -- 应用下载数据-安卓下载完成数
+        ) as 'actionCost',
+        sum(a.photo_share) as 'photoShare',
+        sum(a.photo_comment) as 'photoComment',
+        sum(a.photo_like) as 'photoLike',
+        sum(a.follow) as 'follow',
+        sum(a.report) as 'report',
+        sum(a.cancel_follow) as 'cancelFollow',
+        sum(a.block) as 'block',
+        sum(a.negative) as 'nagative',
+        sum(a.download_started) as 'downloadStarted',
+        sum(a.download_completed) as 'downloadCompleted',
         (CASE
         (CASE
         WHEN sum(a.event_next_day_stay) != 0
         WHEN sum(a.event_next_day_stay) != 0
         THEN round(sum(a.charge) / sum(a.event_next_day_stay),2)
         THEN round(sum(a.charge) / sum(a.event_next_day_stay),2)
         ELSE 0
         ELSE 0
         end
         end
-        ) as 'eventNextDayStayCost', -- 次日留存成本
+        ) as 'eventNextDayStayCost',
         (select url from ctop_kuaishou_video_get where photo_id = c.photo_id limit 1) as url,
         (select url from ctop_kuaishou_video_get where photo_id = c.photo_id limit 1) as url,
         (select cover_url from ctop_kuaishou_video_get where photo_id = c.photo_id limit 1) as coverUrl,
         (select cover_url from ctop_kuaishou_video_get where photo_id = c.photo_id limit 1) as coverUrl,
         (select material_type from ctop_kuaishou_video_get where photo_id = c.photo_id limit 1) as materialType
         (select material_type from ctop_kuaishou_video_get where photo_id = c.photo_id limit 1) as materialType
@@ -1085,13 +1062,10 @@
         </if>
         </if>
         group by a.creative_id
         group by a.creative_id
         order by sum(a.charge) desc
         order by sum(a.charge) desc
-        <!--        )m-->
-        <!--        <if test="yn=1">-->
-        <!--            where m.charge != 0-->
-        <!--        </if>-->
+
     </select>
     </select>
 
 
-    <!-- 获取项目成员所在所有项目下的所有账户id -->
+
     <select id="getVideoUrl" resultType="cn.com.ctop.kuaishou.modules.report.entity.KuaishouVideoInfoDTO">
     <select id="getVideoUrl" resultType="cn.com.ctop.kuaishou.modules.report.entity.KuaishouVideoInfoDTO">
         select
         select
         url as url,
         url as url,
@@ -1167,53 +1141,53 @@
         )
         )
         ) as 'designResponsibleName',
         ) as 'designResponsibleName',
         ifnull(round(sum(a.charge),3),0) as 'charge',
         ifnull(round(sum(a.charge),3),0) as 'charge',
-        ifnull(sum(a.photo_show),0) as 'photoShow', -- 封面曝光数
-        ifnull(sum(a.photo_click),0) as 'photoClick', -- 封面点击数
-        ifnull(sum(a.aclick),0) as 'aclick', -- 素材曝光数
-        ifnull(sum(a.bclick),0) as 'bclick', -- 行为数
-        ifnull(sum(a.activation),0) as 'activation', -- 激活数
-        ifnull(sum(a.submit),0) as 'submit', -- 提交按钮点击数
-        ifnull(sum(a.event_register),0) as 'eventRegister', -- 注册数
-        ifnull(sum(event_next_day_stay),0) as 'eventNextDayStay', -- 次日留存数
-        ROUND(IFNULL(sum(a.charge)/sum(a.activation),0),2) as 'activationCost', -- 激活成本
+        ifnull(sum(a.photo_show),0) as 'photoShow',
+        ifnull(sum(a.photo_click),0) as 'photoClick',
+        ifnull(sum(a.aclick),0) as 'aclick',
+        ifnull(sum(a.bclick),0) as 'bclick',
+        ifnull(sum(a.activation),0) as 'activation',
+        ifnull(sum(a.submit),0) as 'submit',
+        ifnull(sum(a.event_register),0) as 'eventRegister',
+        ifnull(sum(event_next_day_stay),0) as 'eventNextDayStay',
+        ROUND(IFNULL(sum(a.charge)/sum(a.activation),0),2) as 'activationCost',
         case when (sum(a.photo_show) is not null and sum(a.photo_show)!=0) then
         case when (sum(a.photo_show) is not null and sum(a.photo_show)!=0) then
         concat(round(ifnull(sum(a.photo_click),0)/sum(a.photo_show) * 100 ,2),'%') else 0 end as 'photoClickRate',
         concat(round(ifnull(sum(a.photo_click),0)/sum(a.photo_show) * 100 ,2),'%') else 0 end as 'photoClickRate',
         case when (sum(a.aclick) is not null and sum(a.aclick)!=0) then
         case when (sum(a.aclick) is not null and sum(a.aclick)!=0) then
-        concat(round(ifnull(sum(a.bclick),0)/sum(a.aclick) * 100 ,2),'%') else 0 end as 'bclickRate', -- 行为率
+        concat(round(ifnull(sum(a.bclick),0)/sum(a.aclick) * 100 ,2),'%') else 0 end as 'bclickRate',
         (case
         (case
         when (sum(a.photo_show) is not null and sum(a.photo_show) != 0)
         when (sum(a.photo_show) is not null and sum(a.photo_show) != 0)
         then round((ifnull(sum(a.charge),0) / sum(a.photo_show)) * 1000,2)
         then round((ifnull(sum(a.charge),0) / sum(a.photo_show)) * 1000,2)
         else 0
         else 0
         end
         end
-        ) as 'impression1kCost', -- 均千次封面曝光花费
+        ) as 'impression1kCost',
         (case
         (case
         when (sum(a.photo_click) is not null and sum(a.photo_click) != 0)
         when (sum(a.photo_click) is not null and sum(a.photo_click) != 0)
         then round( ifnull(sum(a.charge),0) / sum(a.photo_click),2)
         then round( ifnull(sum(a.charge),0) / sum(a.photo_click),2)
         else 0
         else 0
         end
         end
-        ) as 'photoClickCost', -- 平均封面点击单价
+        ) as 'photoClickCost',
         (CASE
         (CASE
         WHEN ( sum(a.bclick) is not null and sum(a.bclick) != 0)
         WHEN ( sum(a.bclick) is not null and sum(a.bclick) != 0)
         THEN round(sum(a.charge) / sum(a.bclick),2)
         THEN round(sum(a.charge) / sum(a.bclick),2)
         ELSE 0
         ELSE 0
         end
         end
-        ) as 'actionCost', -- 平均行为单价
-        ifnull(sum(a.photo_share),0) as 'photoShare', -- 分享数
-        ifnull(sum(a.photo_comment),0) as 'photoComment', -- 评论数
-        ifnull(sum(a.photo_like),0) as 'photoLike', -- 点赞数
-        ifnull(sum(a.follow),0) as 'follow', -- 新增关注数
-        ifnull(sum(a.report),0) as 'report', -- 举报数
-        ifnull(sum(a.cancel_follow),0) as 'cancelFollow', -- 取消关注数
-        ifnull(sum(a.block),0) as 'block', -- 拉黑数
-        ifnull(sum(a.negative),0) as 'nagative', -- 减少此类作品数
-        ifnull(sum(a.download_started),0) as 'downloadStarted', -- 应用下载数据-安卓下载开始数
-        ifnull(sum(a.download_completed),0) as 'downloadCompleted', -- 应用下载数据-安卓下载完成数
+        ) as 'actionCost',
+        ifnull(sum(a.photo_share),0) as 'photoShare',
+        ifnull(sum(a.photo_comment),0) as 'photoComment',
+        ifnull(sum(a.photo_like),0) as 'photoLike',
+        ifnull(sum(a.follow),0) as 'follow',
+        ifnull(sum(a.report),0) as 'report',
+        ifnull(sum(a.cancel_follow),0) as 'cancelFollow',
+        ifnull(sum(a.block),0) as 'block',
+        ifnull(sum(a.negative),0) as 'nagative',
+        ifnull(sum(a.download_started),0) as 'downloadStarted',
+        ifnull(sum(a.download_completed),0) as 'downloadCompleted',
         (CASE
         (CASE
         WHEN ( sum(a.event_next_day_stay) is not null and sum(a.event_next_day_stay) != 0)
         WHEN ( sum(a.event_next_day_stay) is not null and sum(a.event_next_day_stay) != 0)
         THEN round( ifnull(sum(a.charge),0) / sum(a.event_next_day_stay) ,2)
         THEN round( ifnull(sum(a.charge),0) / sum(a.event_next_day_stay) ,2)
         ELSE 0
         ELSE 0
         end
         end
-        ) as 'eventNextDayStayCost' -- 次日留存成本
+        ) as 'eventNextDayStayCost'
         from
         from
         ctop_kuaishou_report_daily_account a
         ctop_kuaishou_report_daily_account a
         left join ctop_user_allocation b
         left join ctop_user_allocation b

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

@@ -2,24 +2,24 @@
 <!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
 <!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
 <mapper namespace="cn.com.ctop.kuaishou.modules.report.mapper.KuaishouReportDailyAgentSumMapper">
 <mapper namespace="cn.com.ctop.kuaishou.modules.report.mapper.KuaishouReportDailyAgentSumMapper">
 
 
-    <!-- 公司报表sql -->
+
     <select id="companyReport" resultType="cn.com.ctop.kuaishou.modules.report.entity.KuaishouReportDailyAgentSum">
     <select id="companyReport" resultType="cn.com.ctop.kuaishou.modules.report.entity.KuaishouReportDailyAgentSum">
             select
             select
-            date_format(date, '%Y-%m-%d') as date,  <!-- 日期 -->
-            cost_campaign_count as costCampaignCount,  <!-- 有消费计划数 -->
-            balance as balance,  <!-- 总余额 -->
-            cost as cost,  <!-- 总消耗 -->
-            xianjin_cost as xianjinCost,  <!-- 现金消耗 -->
-            fandian_cost as fandianCost,  <!-- 后返消耗 -->
-            kuangfan_cost as kuangfanCost,  <!-- 框返消耗 -->
-            jili_cost as jiliCost,  <!-- 激励账户消耗 -->
-            xinyong_cost as xinyongCost,  <!-- 信用账户消耗 -->
-            fengmian_show_count as fengmianShowCount,  <!-- 封面曝光数 -->
-            fengmian_click_count as fengmianClickCount,  <!-- 封面点击数 -->
-            sucai_show_count as sucaiShowCount,  <!-- 素材曝光数 -->
-            convert_count as convertCount,  <!-- 行为数 -->
-            fengmian_click_rate as fengmianClickRate,  <!-- 封面点击率 -->
-            convert_click_rate as convertClickRate  <!-- 转化点击率 -->
+            date_format(date, '%Y-%m-%d') as date,
+            cost_campaign_count as costCampaignCount,
+            balance as balance,
+            cost as cost,
+            xianjin_cost as xianjinCost,
+            fandian_cost as fandianCost,
+            kuangfan_cost as kuangfanCost,
+            jili_cost as jiliCost,
+            xinyong_cost as xinyongCost,
+            fengmian_show_count as fengmianShowCount,
+            fengmian_click_count as fengmianClickCount,
+            sucai_show_count as sucaiShowCount,
+            convert_count as convertCount,
+            fengmian_click_rate as fengmianClickRate,
+            convert_click_rate as convertClickRate
         from
         from
         ctop_kuaishou_report_daily_agent_sum
         ctop_kuaishou_report_daily_agent_sum
         where
         where
@@ -30,20 +30,20 @@
 
 
     <select id="companyReportSum" resultType="cn.com.ctop.kuaishou.modules.report.entity.KuaishouReportDailyAgentSum">
     <select id="companyReportSum" resultType="cn.com.ctop.kuaishou.modules.report.entity.KuaishouReportDailyAgentSum">
         select
         select
-        sum(cost_campaign_count) as costCampaignCount,  <!-- 有消费计划数 -->
-        sum(balance) as balance,  <!-- 总余额 -->
-        sum(cost) as cost,  <!-- 总消耗 -->
-        sum(xianjin_cost) as xianjinCost,  <!-- 现金消耗 -->
-        sum(fandian_cost) as fandianCost,  <!-- 后返消耗 -->
-        sum(kuangfan_cost) as kuangfanCost,  <!-- 框返消耗 -->
-        sum(jili_cost) as jiliCost,  <!-- 激励账户消耗 -->
-        sum(xinyong_cost) as xinyongCost,  <!-- 信用账户消耗 -->
-        sum(fengmian_show_count) as fengmianShowCount,  <!-- 封面曝光数 -->
-        sum(fengmian_click_count) as fengmianClickCount,  <!-- 封面点击数 -->
-        sum(sucai_show_count) as sucaiShowCount,  <!-- 素材曝光数 -->
-        sum(convert_count) as convertCount,  <!-- 行为数 -->
-        sum(fengmian_click_rate) as fengmianClickRate,  <!-- 封面点击率 -->
-        sum(convert_click_rate) as convertClickRate  <!-- 转化点击率 -->
+        sum(cost_campaign_count) as costCampaignCount,
+        sum(balance) as balance,
+        sum(cost) as cost,
+        sum(xianjin_cost) as xianjinCost,
+        sum(fandian_cost) as fandianCost,
+        sum(kuangfan_cost) as kuangfanCost,
+        sum(jili_cost) as jiliCost,
+        sum(xinyong_cost) as xinyongCost,
+        sum(fengmian_show_count) as fengmianShowCount,
+        sum(fengmian_click_count) as fengmianClickCount,
+        sum(sucai_show_count) as sucaiShowCount,
+        sum(convert_count) as convertCount,
+        sum(fengmian_click_rate) as fengmianClickRate,
+        sum(convert_click_rate) as convertClickRate
         from
         from
         ctop_kuaishou_report_daily_agent_sum
         ctop_kuaishou_report_daily_agent_sum
         where
         where
@@ -51,14 +51,14 @@
         date &gt;= #{startDate}
         date &gt;= #{startDate}
     </select>
     </select>
 
 
-    <!-- 根据传入时间获取公司报表账户的列表 -->
+
     <select id="companyReportAccountDetailList" resultType="cn.com.ctop.kuaishou.modules.report.entity.KuaishouReportDailyAgent">
     <select id="companyReportAccountDetailList" resultType="cn.com.ctop.kuaishou.modules.report.entity.KuaishouReportDailyAgent">
             select
             select
-            date_format(date, '%Y-%m-%d') as date,  <!-- 日期 -->
-            account_id as accountId,  <!-- 账户id -->
-            kid as kid, <!-- 快手id -->
-            advertiser_name as advertiserName, <!-- 广告主名称 -->
-            advertiser_create_time as advertiserCreateTime, <!-- 广告主创建时间 -->
+            date_format(date, '%Y-%m-%d') as date,
+            account_id as accountId,
+            kid as kid,
+            advertiser_name as advertiserName,
+            advertiser_create_time as advertiserCreateTime,
             cost_campaign_count as costCampaignCount, <!-- 有消费计划数 -->
             cost_campaign_count as costCampaignCount, <!-- 有消费计划数 -->
             balance as balance, <!-- 总余额 -->
             balance as balance, <!-- 总余额 -->
             cost as cost, <!-- 总消耗 -->
             cost as cost, <!-- 总消耗 -->

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

@@ -105,5 +105,127 @@
         )
         )
           set account_id = #{accountId}
           set account_id = #{accountId}
     </insert>
     </insert>
+    <insert id="replaceBatch">
+        replace into ctop_kuaishou_report_daily_campaign
+        (
+        account_id,
+        campaign_id,
+        status,
+        campaign_name,
+        charge,
+        photo_show,
+        aclick,
+        bclick ,
+        photo_share ,
+        photo_comment ,
+        photo_like,
+        follow ,
+        cancel_follow ,
+        report ,
+        block,
+        negative,
+        download_started  ,
+        download_completed ,
+        activation ,
+        submit ,
+        stat_date ,
+        photo_click ,
+        photo_click_ratio ,
+        action_ratio ,
+        impression_1k_cost ,
+        photo_click_cost,
+        action_cost,
+        event_pay_first_day ,
+        event_pay_purchase_amount_first_day ,
+        event_pay_first_day_roi,
+        event_pay ,
+        event_pay_purchase_amount ,
+        event_pay_roi ,
+        event_register ,
+        event_register_cost ,
+        event_register_ratio,
+        event_jin_jian_app ,
+        event_jin_jian_app_cost,
+        event_credit_grant_app ,
+        event_credit_grant_app_cost,
+        event_credit_grant_app_ratio,
+        event_order_paid,
+        event_order_paid_purchase_amount,
+        event_jin_jian_landing_page ,
+        event_jin_jian_landing_page_cost,
+        event_credit_grant_landing_page,
+        event_credit_grant_landing_page_cost,
+        event_credit_grant_landing_ratio,
+        event_next_day_stay_cost,
+        event_next_day_stay_ratio,
+        form_action_ratio,
+        event_order_paid_cost,
+        event_next_day_stay ,
+        form_cost ,
+        form_count ,
+        play_3s_ratio
+        )
+        values
+        <foreach collection="records" item="record" separator=",">
+            (
+            #{record.accountId},
+            #{record.campaignId},
+            #{record.status},
+            #{record.campaignName},
+            #{record.charge},
+            #{record.photoShow},
+            #{record.aclick},
+            #{record.bclick},
+            #{record.photoShare },
+            #{record.photoComment },
+            #{record.photoLike},
+            #{record.follow},
+            #{record.cancelFollow },
+            #{record.report},
+            #{record.block},
+            #{record.negative},
+            #{record.downloadStarted},
+            #{record.downloadCompleted},
+            #{record.activation},
+            #{record.submit},
+            #{record.statDate},
+            #{record.photoClick},
+            #{record.photoClickRatio},
+            #{record.actionRatio},
+            #{record.impression1kCost},
+            #{record.photoClickCost},
+            #{record.actionCost},
+            #{record.eventPayFirstDay},
+            #{record.eventPayPurchaseAmountFirstDay},
+            #{record.eventPayFirstDayRoi},
+            #{record.eventPay},
+            #{record.eventPayPurchaseAmount },
+            #{record.eventPayRoi},
+            #{record.eventRegister},
+            #{record.eventRegisterCost},
+            #{record.eventRegisterRatio},
+            #{record.eventJinJianApp},
+            #{record.eventJinJianAppCost},
+            #{record.eventCreditGrantApp},
+            #{record.eventCreditGrantAppCost},
+            #{record.eventCreditGrantAppRatio},
+            #{record.eventOrderPaid},
+            #{record.eventOrderPaidPurchaseAmount},
+            #{record.eventJinJianLandingPage },
+            #{record.eventJinJianLandingPageCost},
+            #{record.eventCreditGrantLandingPage},
+            #{record.eventCreditGrantLandingPageCost},
+            #{record.eventCreditGrantLandingRatio},
+            #{record.eventNextDayStayCost},
+            #{record.eventNextDayStayRatio},
+            #{record.formActionRatio},
+            #{record.eventOrderPaidCost},
+            #{record.eventNextDayStay},
+            #{record.formCost},
+            #{record.formCount},
+            #{record.play3sRatio}
+            )
+        </foreach>
+    </insert>
 
 
-</mapper>
+</mapper>

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

@@ -13,45 +13,45 @@
 
 
     <select id="selectByMap" parameterType="Map" resultType="com.alibaba.fastjson.JSONObject">
     <select id="selectByMap" parameterType="Map" resultType="com.alibaba.fastjson.JSONObject">
         SELECT
         SELECT
-        sum(t2.charge) cost, -- 花费
-        sum(t2.photo_show) photoShow, -- 封面曝光数
-        sum(t2.photo_click) photoClick, -- 封面点击数
-        sum(t2.aclick) aclick, -- 素材曝光数
-        sum(t2.bclick) bclick, -- 行为数
+        sum(t2.charge) cost,
+        sum(t2.photo_show) photoShow,
+        sum(t2.photo_click) photoClick,
+        sum(t2.aclick) aclick,
+        sum(t2.bclick) bclick,
         (case
         (case
         when sum(photo_show) != 0
         when sum(photo_show) != 0
         then (sum(t2.photo_click) / sum(photo_show))
         then (sum(t2.photo_click) / sum(photo_show))
         else 0
         else 0
         end
         end
-        ) photoClickRatio, -- 封面点击率
+        ) photoClickRatio,
 
 
         (case
         (case
         when sum(aclick) != 0
         when sum(aclick) != 0
         then (sum(t2.bclick) / sum(aclick))
         then (sum(t2.bclick) / sum(aclick))
         else 0
         else 0
         end
         end
-        ) actionRatio, -- 行为率
+        ) actionRatio,
 
 
         (case
         (case
         when sum(t2.photo_show) != 0
         when sum(t2.photo_show) != 0
         then ((sum(t2.charge) / sum(t2.photo_show)) * 1000)
         then ((sum(t2.charge) / sum(t2.photo_show)) * 1000)
         else 0
         else 0
         end
         end
-        ) impression1kCost, -- 均千次封面曝光花费
+        ) impression1kCost,
 
 
         (case
         (case
         when sum(t2.photo_click) != 0
         when sum(t2.photo_click) != 0
         then (sum(t2.charge) / sum(t2.photo_click))
         then (sum(t2.charge) / sum(t2.photo_click))
         else 0
         else 0
         end
         end
-        ) photoClickCost, -- 平均封面点击单价
+        ) photoClickCost,
 
 
         (CASE
         (CASE
         WHEN sum(t2.photo_click) != 0
         WHEN sum(t2.photo_click) != 0
         THEN (sum(t2.charge) / sum(t2.photo_click))
         THEN (sum(t2.charge) / sum(t2.photo_click))
         ELSE 0
         ELSE 0
         end
         end
-        ) actionCost, -- 平均行为单价
+        ) actionCost,
 
 
         (case
         (case
         WHEN sum(t2.form_count) != 0
         WHEN sum(t2.form_count) != 0
@@ -60,7 +60,7 @@
         THEN sum(t2.activation)
         THEN sum(t2.activation)
         ELSE 0
         ELSE 0
         END
         END
-        ) conversions, -- 转化数
+        ) conversions,
 
 
         (
         (
         CASE
         CASE
@@ -70,10 +70,10 @@
         THEN (sum(t2.charge) / sum(t2.activation))
         THEN (sum(t2.charge) / sum(t2.activation))
         ELSE 0
         ELSE 0
         END
         END
-        ) conversionPrice, -- 转化单价
+        ) conversionPrice,
         t2.photo_url as  'url',
         t2.photo_url as  'url',
         t2.cover_url as  'coverUrl',
         t2.cover_url as  'coverUrl',
-        t2.signature signature -- 视频md5
+        t2.signature signature
         from
         from
         ctop_user_allocation t1
         ctop_user_allocation t1
         left join
         left join
@@ -100,45 +100,45 @@
 
 
     <select id="selectChainRatioByMap" parameterType="Map" resultType="com.alibaba.fastjson.JSONObject">
     <select id="selectChainRatioByMap" parameterType="Map" resultType="com.alibaba.fastjson.JSONObject">
         SELECT
         SELECT
-        sum(charge) cost, -- 花费
-        sum(photo_show) photoShow, -- 封面曝光数
-        sum(photo_click) photoClick, -- 封面点击数
-        sum(aclick) aclick, -- 素材曝光数
-        sum(bclick) bclick, -- 行为数
+        sum(charge) cost,
+        sum(photo_show) photoShow,
+        sum(photo_click) photoClick,
+        sum(aclick) aclick,
+        sum(bclick) bclick,
         (case
         (case
         when sum(photo_show) != 0
         when sum(photo_show) != 0
         then (sum(photo_click) / sum(photo_show))
         then (sum(photo_click) / sum(photo_show))
         else 0
         else 0
         end
         end
-        ) photoClickRatio, -- 封面点击率
+        ) photoClickRatio,
 
 
         (case
         (case
         when sum(aclick) != 0
         when sum(aclick) != 0
         then (sum(bclick) / sum(aclick))
         then (sum(bclick) / sum(aclick))
         else 0
         else 0
         end
         end
-        ) actionRatio, -- 行为率
+        ) actionRatio,
 
 
         (case
         (case
         when sum(photo_show) != 0
         when sum(photo_show) != 0
         then ((sum(charge) / sum(photo_show)) * 1000)
         then ((sum(charge) / sum(photo_show)) * 1000)
         else 0
         else 0
         end
         end
-        ) impression1kCost, -- 均千次封面曝光花费
+        ) impression1kCost,
 
 
         (case
         (case
         when sum(photo_click) != 0
         when sum(photo_click) != 0
         then (sum(charge) / sum(photo_click))
         then (sum(charge) / sum(photo_click))
         else 0
         else 0
         end
         end
-        ) photoClickCost, -- 平均封面点击单价
+        ) photoClickCost,
 
 
         (CASE
         (CASE
         WHEN sum(photo_click) != 0
         WHEN sum(photo_click) != 0
         THEN (sum(charge) / sum(photo_click))
         THEN (sum(charge) / sum(photo_click))
         ELSE 0
         ELSE 0
         end
         end
-        ) actionCost, -- 平均行为单价
+        ) actionCost,
 
 
         (case
         (case
         WHEN sum(form_count) != 0
         WHEN sum(form_count) != 0
@@ -147,7 +147,7 @@
         THEN sum(activation)
         THEN sum(activation)
         ELSE 0
         ELSE 0
         END
         END
-        ) conversions, -- 转化数
+        ) conversions,
 
 
         (
         (
         CASE
         CASE
@@ -157,7 +157,7 @@
         THEN (sum(charge) / sum(activation))
         THEN (sum(charge) / sum(activation))
         ELSE 0
         ELSE 0
         END
         END
-        ) conversionPrice -- 转化单价
+        ) conversionPrice
         from
         from
         ctop_kuaishou_report_hourly_creative_statistic
         ctop_kuaishou_report_hourly_creative_statistic
 
 
@@ -184,45 +184,45 @@
     <select id="selectDailyByMap" parameterType="Map" resultType="com.alibaba.fastjson.JSONObject">
     <select id="selectDailyByMap" parameterType="Map" resultType="com.alibaba.fastjson.JSONObject">
 
 
         SELECT
         SELECT
-        sum(t2.charge) cost, -- 花费
-        sum(t2.photo_show) photoShow, -- 封面曝光数
-        sum(t2.photo_click) photoClick, -- 封面点击数
-        sum(t2.aclick) aclick, -- 素材曝光数
-        sum(t2.bclick) bclick, -- 行为数
+        sum(t2.charge) cost,
+        sum(t2.photo_show) photoShow,
+        sum(t2.photo_click) photoClick,
+        sum(t2.aclick) aclick,
+        sum(t2.bclick) bclick,
         (case
         (case
         when sum(t2.photo_show) != 0
         when sum(t2.photo_show) != 0
         then (sum(t2.photo_click) / sum(t2.photo_show))
         then (sum(t2.photo_click) / sum(t2.photo_show))
         else 0
         else 0
         end
         end
-        ) photoClickRatio, -- 封面点击率
+        ) photoClickRatio,
 
 
         (case
         (case
         when sum(t2.aclick) != 0
         when sum(t2.aclick) != 0
         then (sum(t2.bclick) / sum(t2.aclick))
         then (sum(t2.bclick) / sum(t2.aclick))
         else 0
         else 0
         end
         end
-        ) actionRatio, -- 行为率
+        ) actionRatio,
 
 
         (case
         (case
         when sum(t2.photo_show) != 0
         when sum(t2.photo_show) != 0
         then ((sum(t2.charge) / sum(t2.photo_show)) * 1000)
         then ((sum(t2.charge) / sum(t2.photo_show)) * 1000)
         else 0
         else 0
         end
         end
-        ) impression1kCost, -- 均千次封面曝光花费
+        ) impression1kCost,
 
 
         (case
         (case
         when sum(t2.photo_click) != 0
         when sum(t2.photo_click) != 0
         then (sum(t2.charge) / sum(t2.photo_click))
         then (sum(t2.charge) / sum(t2.photo_click))
         else 0
         else 0
         end
         end
-        ) photoClickCost, -- 平均封面点击单价
+        ) photoClickCost,
 
 
         (CASE
         (CASE
         WHEN sum(t2.photo_click) != 0
         WHEN sum(t2.photo_click) != 0
         THEN (sum(t2.charge) / sum(t2.photo_click))
         THEN (sum(t2.charge) / sum(t2.photo_click))
         ELSE 0
         ELSE 0
         end
         end
-        ) actionCost, -- 平均行为单价
+        ) actionCost,
 
 
         (case
         (case
         WHEN sum(t2.form_count) != 0
         WHEN sum(t2.form_count) != 0
@@ -231,7 +231,7 @@
         THEN sum(t2.activation)
         THEN sum(t2.activation)
         ELSE 0
         ELSE 0
         END
         END
-        ) conversions, -- 转化数
+        ) conversions,
 
 
         (
         (
         CASE
         CASE
@@ -241,10 +241,10 @@
         THEN (sum(t2.charge) / sum(t2.activation))
         THEN (sum(t2.charge) / sum(t2.activation))
         ELSE 0
         ELSE 0
         END
         END
-        ) conversionPrice, -- 转化单价
+        ) conversionPrice,
         t2.photo_url as  'url',
         t2.photo_url as  'url',
         t2.cover_url as  'coverUrl',
         t2.cover_url as  'coverUrl',
-        t2.signature signature -- 视频md5
+        t2.signature signature
         from
         from
         ctop_user_allocation t1
         ctop_user_allocation t1
         left join
         left join
@@ -273,45 +273,45 @@
 
 
     <select id="selectDailyChainRatioByMap" parameterType="Map" resultType="com.alibaba.fastjson.JSONObject">
     <select id="selectDailyChainRatioByMap" parameterType="Map" resultType="com.alibaba.fastjson.JSONObject">
         SELECT
         SELECT
-        sum(charge) cost, -- 花费
-        sum(photo_show) photoShow, -- 封面曝光数
-        sum(photo_click) photoClick, -- 封面点击数
-        sum(aclick) aclick, -- 素材曝光数
-        sum(bclick) bclick, -- 行为数
+        sum(charge) cost,
+        sum(photo_show) photoShow,
+        sum(photo_click) photoClick,
+        sum(aclick) aclick,
+        sum(bclick) bclick,
         (case
         (case
         when sum(photo_show) != 0
         when sum(photo_show) != 0
         then (sum(photo_click) / sum(photo_show))
         then (sum(photo_click) / sum(photo_show))
         else 0
         else 0
         end
         end
-        ) photoClickRatio, -- 封面点击率
+        ) photoClickRatio,
 
 
         (case
         (case
         when sum(aclick) != 0
         when sum(aclick) != 0
         then (sum(bclick) / sum(aclick))
         then (sum(bclick) / sum(aclick))
         else 0
         else 0
         end
         end
-        ) actionRatio, -- 行为率
+        ) actionRatio,
 
 
         (case
         (case
         when sum(photo_show) != 0
         when sum(photo_show) != 0
         then ((sum(charge) / sum(photo_show)) * 1000)
         then ((sum(charge) / sum(photo_show)) * 1000)
         else 0
         else 0
         end
         end
-        ) impression1kCost, -- 均千次封面曝光花费
+        ) impression1kCost,
 
 
         (case
         (case
         when sum(photo_click) != 0
         when sum(photo_click) != 0
         then (sum(charge) / sum(photo_click))
         then (sum(charge) / sum(photo_click))
         else 0
         else 0
         end
         end
-        ) photoClickCost, -- 平均封面点击单价
+        ) photoClickCost,
 
 
         (CASE
         (CASE
         WHEN sum(photo_click) != 0
         WHEN sum(photo_click) != 0
         THEN (sum(charge) / sum(photo_click))
         THEN (sum(charge) / sum(photo_click))
         ELSE 0
         ELSE 0
         end
         end
-        ) actionCost, -- 平均行为单价
+        ) actionCost,
 
 
         (case
         (case
         WHEN sum(form_count) != 0
         WHEN sum(form_count) != 0
@@ -320,7 +320,7 @@
         THEN sum(activation)
         THEN sum(activation)
         ELSE 0
         ELSE 0
         END
         END
-        ) conversions, -- 转化数
+        ) conversions,
 
 
         (
         (
         CASE
         CASE
@@ -330,7 +330,7 @@
         THEN (sum(charge) / sum(activation))
         THEN (sum(charge) / sum(activation))
         ELSE 0
         ELSE 0
         END
         END
-        ) conversionPrice -- 转化单价
+        ) conversionPrice
         from
         from
         ctop_kuaishou_report_daily_material
         ctop_kuaishou_report_daily_material
         <where>
         <where>
@@ -357,45 +357,45 @@
 
 
     <select id="selectHourMaterialList" parameterType="Map" resultType="com.alibaba.fastjson.JSONObject">
     <select id="selectHourMaterialList" parameterType="Map" resultType="com.alibaba.fastjson.JSONObject">
         SELECT
         SELECT
-        sum(t2.charge) cost, -- 花费
-        sum(t2.photo_show) photoShow, -- 封面曝光数
-        sum(t2.photo_click) photoClick, -- 封面点击数
-        sum(t2.aclick) aclick, -- 素材曝光数
-        sum(t2.bclick) bclick, -- 行为数
+        sum(t2.charge) cost,
+        sum(t2.photo_show) photoShow,
+        sum(t2.photo_click) photoClick,
+        sum(t2.aclick) aclick,
+        sum(t2.bclick) bclick,
         (case
         (case
         when sum(photo_show) != 0
         when sum(photo_show) != 0
         then (sum(t2.photo_click) / sum(photo_show))
         then (sum(t2.photo_click) / sum(photo_show))
         else 0
         else 0
         end
         end
-        ) photoClickRatio, -- 封面点击率
+        ) photoClickRatio,
 
 
         (case
         (case
         when sum(aclick) != 0
         when sum(aclick) != 0
         then (sum(t2.bclick) / sum(aclick))
         then (sum(t2.bclick) / sum(aclick))
         else 0
         else 0
         end
         end
-        ) actionRatio, -- 行为率
+        ) actionRatio,
 
 
         (case
         (case
         when sum(t2.photo_show) != 0
         when sum(t2.photo_show) != 0
         then ((sum(t2.charge) / sum(t2.photo_show)) * 1000)
         then ((sum(t2.charge) / sum(t2.photo_show)) * 1000)
         else 0
         else 0
         end
         end
-        ) impression1kCost, -- 均千次封面曝光花费
+        ) impression1kCost,
 
 
         (case
         (case
         when sum(t2.photo_click) != 0
         when sum(t2.photo_click) != 0
         then (sum(t2.charge) / sum(t2.photo_click))
         then (sum(t2.charge) / sum(t2.photo_click))
         else 0
         else 0
         end
         end
-        ) photoClickCost, -- 平均封面点击单价
+        ) photoClickCost,
 
 
         (CASE
         (CASE
         WHEN sum(t2.photo_click) != 0
         WHEN sum(t2.photo_click) != 0
         THEN (sum(t2.charge) / sum(t2.photo_click))
         THEN (sum(t2.charge) / sum(t2.photo_click))
         ELSE 0
         ELSE 0
         end
         end
-        ) actionCost, -- 平均行为单价
+        ) actionCost,
 
 
         (case
         (case
         WHEN sum(t2.form_count) != 0
         WHEN sum(t2.form_count) != 0
@@ -404,7 +404,7 @@
         THEN sum(t2.activation)
         THEN sum(t2.activation)
         ELSE 0
         ELSE 0
         END
         END
-        ) conversions, -- 转化数
+        ) conversions,
 
 
         (
         (
         CASE
         CASE
@@ -414,10 +414,10 @@
         THEN (sum(t2.charge) / sum(t2.activation))
         THEN (sum(t2.charge) / sum(t2.activation))
         ELSE 0
         ELSE 0
         END
         END
-        ) conversionPrice, -- 转化单价
+        ) conversionPrice,
 
 
-        t2.url url, -- 视频url
-        t2.signature signature, -- 视频md5
+        t2.url url,
+        t2.signature signature,
         t2.account_id accountId
         t2.account_id accountId
         from
         from
         ctop_oauth_token t1
         ctop_oauth_token t1
@@ -445,46 +445,46 @@
 
 
     <select id="selectDayMaterialList" parameterType="Map" resultType="com.alibaba.fastjson.JSONObject">
     <select id="selectDayMaterialList" parameterType="Map" resultType="com.alibaba.fastjson.JSONObject">
         SELECT
         SELECT
-        sum(t1.charge) cost, -- 花费
-        sum(t1.photo_show) photoShow, -- 封面曝光数
-        sum(t1.photo_click) photoClick, -- 封面点击数
-        sum(t1.aclick) aclick, -- 素材曝光数
-        sum(t1.bclick) bclick, -- 行为数
-        sum(t1.download_completed) downloadCompleted, -- 安卓下载完成 数
+        sum(t1.charge) cost,
+        sum(t1.photo_show) photoShow,
+        sum(t1.photo_click) photoClick,
+        sum(t1.aclick) aclick,
+        sum(t1.bclick) bclick,
+        sum(t1.download_completed) downloadCompleted,
         (case
         (case
         when sum(t1.photo_show) != 0
         when sum(t1.photo_show) != 0
         then (sum(t1.photo_click) / sum(t1.photo_show))
         then (sum(t1.photo_click) / sum(t1.photo_show))
         else 0
         else 0
         end
         end
-        ) photoClickRatio, -- 封面点击率
+        ) photoClickRatio,
 
 
         (case
         (case
         when sum(t1.aclick) != 0
         when sum(t1.aclick) != 0
         then (sum(t1.bclick) / sum(t1.aclick))
         then (sum(t1.bclick) / sum(t1.aclick))
         else 0
         else 0
         end
         end
-        ) actionRatio, -- 行为率
+        ) actionRatio,
 
 
         (case
         (case
         when sum(t1.photo_show) != 0
         when sum(t1.photo_show) != 0
         then ((sum(t1.charge) / sum(t1.photo_show)) * 1000)
         then ((sum(t1.charge) / sum(t1.photo_show)) * 1000)
         else 0
         else 0
         end
         end
-        ) impression1kCost, -- 均千次封面曝光花费
+        ) impression1kCost,
 
 
         (case
         (case
         when sum(t1.photo_click) != 0
         when sum(t1.photo_click) != 0
         then (sum(t1.charge) / sum(t1.photo_click))
         then (sum(t1.charge) / sum(t1.photo_click))
         else 0
         else 0
         end
         end
-        ) photoClickCost, -- 平均封面点击单价
+        ) photoClickCost,
 
 
         (CASE
         (CASE
         WHEN sum(t1.photo_click) != 0
         WHEN sum(t1.photo_click) != 0
         THEN (sum(t1.charge) / sum(t1.photo_click))
         THEN (sum(t1.charge) / sum(t1.photo_click))
         ELSE 0
         ELSE 0
         end
         end
-        ) actionCost, -- 平均行为单价
+        ) actionCost,
 
 
         (case
         (case
         WHEN sum(t1.form_count) != 0
         WHEN sum(t1.form_count) != 0
@@ -493,7 +493,7 @@
         THEN sum(t1.activation)
         THEN sum(t1.activation)
         ELSE 0
         ELSE 0
         END
         END
-        ) conversions, -- 转化数
+        ) conversions,
 
 
         (
         (
         CASE
         CASE
@@ -503,11 +503,11 @@
         THEN (sum(t1.charge) / sum(t1.activation))
         THEN (sum(t1.charge) / sum(t1.activation))
         ELSE 0
         ELSE 0
         END
         END
-        ) conversionPrice, -- 转化单价
+        ) conversionPrice,
 
 
         t1.photo_url  as  'url',
         t1.photo_url  as  'url',
         t1.cover_url as  'coverUrl',
         t1.cover_url as  'coverUrl',
-        t1.signature signature, -- 视频md5
+        t1.signature signature,
         t1.account_id accountId
         t1.account_id accountId
         from
         from
         ctop_kuaishou_report_daily_material t1
         ctop_kuaishou_report_daily_material t1

+ 3 - 0
module-kuaishou/src/main/java/cn/com/ctop/kuaishou/modules/report/service/IKuaishouReportDailyCampaignService.java

@@ -3,5 +3,8 @@ package cn.com.ctop.kuaishou.modules.report.service;
 import cn.com.ctop.kuaishou.modules.report.entity.KuaishouReportDailyCampaign;
 import cn.com.ctop.kuaishou.modules.report.entity.KuaishouReportDailyCampaign;
 import com.baomidou.mybatisplus.extension.service.IService;
 import com.baomidou.mybatisplus.extension.service.IService;
 
 
+import java.util.List;
+
 public interface IKuaishouReportDailyCampaignService extends IService<KuaishouReportDailyCampaign> {
 public interface IKuaishouReportDailyCampaignService extends IService<KuaishouReportDailyCampaign> {
+    void replaceBatch(List<KuaishouReportDailyCampaign> campaigns);
 }
 }

+ 9 - 0
module-kuaishou/src/main/java/cn/com/ctop/kuaishou/modules/report/service/impl/KuaishouReportDailyCampaignServiceImpl.java

@@ -4,8 +4,17 @@ import cn.com.ctop.kuaishou.modules.report.entity.KuaishouReportDailyCampaign;
 import cn.com.ctop.kuaishou.modules.report.mapper.KuaishouReportDailyCampaignMapper;
 import cn.com.ctop.kuaishou.modules.report.mapper.KuaishouReportDailyCampaignMapper;
 import cn.com.ctop.kuaishou.modules.report.service.IKuaishouReportDailyCampaignService;
 import cn.com.ctop.kuaishou.modules.report.service.IKuaishouReportDailyCampaignService;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 import org.springframework.stereotype.Service;
 
 
+import java.util.List;
+
 @Service
 @Service
 public class KuaishouReportDailyCampaignServiceImpl extends ServiceImpl<KuaishouReportDailyCampaignMapper, KuaishouReportDailyCampaign> implements IKuaishouReportDailyCampaignService {
 public class KuaishouReportDailyCampaignServiceImpl extends ServiceImpl<KuaishouReportDailyCampaignMapper, KuaishouReportDailyCampaign> implements IKuaishouReportDailyCampaignService {
+    @Autowired
+    private KuaishouReportDailyCampaignMapper kuaishouReportDailyCampaignMapper;
+    @Override
+    public void replaceBatch(List<KuaishouReportDailyCampaign> campaigns) {
+        kuaishouReportDailyCampaignMapper.replaceBatch(campaigns);
+    }
 }
 }

+ 0 - 1
module-oa/src/main/java/cn/com/ctop/oa/modules/controller/WechatNoListController.java

@@ -265,7 +265,6 @@ public class WechatNoListController {
     /**
     /**
      * 考勤异常记录 导出数据
      * 考勤异常记录 导出数据
      *
      *
-     * @param requestBody
      * @param response
      * @param response
      */
      */
     @GetMapping("/excel")
     @GetMapping("/excel")

+ 51 - 99
module-toutiao/src/main/java/cn/com/ctop/toutiao/modules/report/mapper/xml/ByteDanceVideoReportDailyMapper.xml

@@ -34,7 +34,7 @@
         a.advertiser_id                          as advertiserId,
         a.advertiser_id                          as advertiserId,
         a.advertiser_name                        as advertiserName,
         a.advertiser_name                        as advertiserName,
         a.stat_datetime                          as statDatetime,
         a.stat_datetime                          as statDatetime,
-        sum(a.cost)                              as cost,                           -- 消耗
+        sum(a.cost)                              as cost,
         a.signature                              as signature,
         a.signature                              as signature,
         a.video_url                              as videoUrl,
         a.video_url                              as videoUrl,
         '-'                                      as materialDesc,
         '-'                                      as materialDesc,
@@ -46,194 +46,146 @@
             end as materialUploadTime
             end as materialUploadTime
         from ctop_bytedance_video_info video where video.signature = a.signature limit 1)           as materialUploadTime,
         from ctop_bytedance_video_info video where video.signature = a.signature limit 1)           as materialUploadTime,
         1                                        as appType,
         1                                        as appType,
-        sum(a.click)                             as clickMaterial,                  -- 点击数
+        sum(a.click)                             as clickMaterial,
 
 
         case
         case
         when sum(a.total_play) != 0
         when sum(a.total_play) != 0
         then sum(a.play25_feed_break) / sum(a.total_play)
         then sum(a.play25_feed_break) / sum(a.total_play)
-        else 0 end                           as play25FeedBreakRate,            -- 25%进度播放率
+        else 0 end                           as play25FeedBreakRate,
 
 
         case
         case
         when sum(a.total_play) != 0
         when sum(a.total_play) != 0
         then sum(a.play_over) / sum(a.total_play)
         then sum(a.play_over) / sum(a.total_play)
-        else 0 end                           as playOverRate,                   -- 整体完播率
+        else 0 end                           as playOverRate,
 
 
         case
         case
         when sum(a.click) != 0
         when sum(a.click) != 0
         then sum(a.convert_material) / sum(a.click)
         then sum(a.convert_material) / sum(a.click)
-        else 0 end                           as convertRate,                    -- 转化率  转化数/点击数*100% !
-        sum(a.active)                            as active,                         -- 应用下载-激活
-        sum(a.download_finish)                   as downloadFinish,                 -- 应用下载-安卓下载完成
-        sum(a.download_start)                    as downloadStart,                  -- 应用下载-安卓下载开始
-        sum(a.install_finish)                    as installFinish,                  -- 应用下载-安卓安装完成
-        sum(a.register)                          as register,                       -- 应用下载-注册
-        sum(a.pay_count)                         as payCount,                       -- 应用下载-付费数
-        -- sum(a.in_app_uv)                         as inAppUv,                        -- 应用下载-到达uv
-        -- sum(a.in_app_detail_uv)                  as inAppDetailUv,                  -- 应用下载-详情页到站uv
-        -- sum(a.in_app_cart)                       as inAppCart,                      -- 应用下载-加入购物车
-        -- sum(a.in_app_order)                      as inAppOrder,                     -- 应用下载-提交订单
-        -- sum(a.in_app_pay)                        as inAppPay,                       -- 应用下载-付费
-        -- sum(a.phone)                             as phone,                          -- 落地页-电话拨打数
-        sum(a.form)                              as form,                           --  表单提交数
-        -- sum(a.map_search)                        as mapSearch,                      -- 落地页-地图搜索
-        -- sum(a.button)                            as button,                         -- 落地页-按钮button
-        -- sum(a.view_material)                     as viewMaterial,                   -- 落地页-关键页面浏览
-        -- sum(a.qq)                                as qq,                             -- 落地页-QQ咨询数
-        -- sum(a.lottery)                           as lottery,                        -- 落地页-抽奖数
-        -- sum(a.vote)                              as vote,                           -- 落地页-投票
-        -- sum(a.redirect)                          as redirect,                       -- 落地页-页面跳转
-        -- sum(a.shopping)                          as shopping,                       -- 落地页-商品购买
-        -- sum(a.consult)                           as consult,                        -- 落地页-在线咨询
-        -- sum(a.wechat)                            as wechat,                         -- 落地页-微信
-        -- sum(a.phone_confirm)                     as phoneConfirm,                   -- 落地页-智能电话确认拨打
-        -- sum(a.phone_connect)                     as phoneConnect,                   -- 落地页-智能电话确认接通
-        -- sum(a.consult_effective)                 as consultEffective,               -- 落地页-智能电话有效咨询
-        sum(a.total_play)                        as totalPlay,                      -- 视频-总播放
-        sum(a.valid_play)                        as validPlay,                      -- 视频-有效播放
-        sum(a.wifi_play)                         as wifiPlay,                       -- 视频-wifi播放
-        sum(a.play25_feed_break)                 as play25FeedBreak,                -- 视频-播放25%进度总数
-        sum(a.play50_feed_break)                 as play50FeedBreak,                -- 视频-播放50%进度总数
-        sum(a.play75_feed_break)                 as play75FeedBreak,                -- 视频-播放75%进度总数
-        sum(a.play100_feed_break)                as play100FeedBreak,               -- 视频-播放100%进度总数
-        -- sum(a.advanced_creative_phone_click)     as advancedCreativePhoneClick,     -- 附加创意-电话按钮
-        -- sum(a.advanced_creative_counsel_click)   as advancedCreativeCounselClick,     -- 附加创意-在线咨询
-        -- sum(a.advanced_creative_form_click)      as advancedCreativeFormClick,      -- 附加创意-表单提交
-        sum(a.share_material)                    as shareMaterial,                  -- 互动数据-分享数
-        -- sum(a.comment_material)                  as commentMaterial,                -- 互动数据-评论数
-        sum(a.follow)                            as follow,                         -- 互动数据-新增关注数
-        -- sum(a.home_visited)                      as homeVisited,                    -- 互动数据-主页访问量
-        -- sum(a.ies_challenge_click)               as iesChallengeClick,              -- 互动数据-挑战赛查看数
-        -- sum(a.ies_music_click)                   as iesMusicClick,                  -- 互动数据-音乐查看数
-        sum(a.next_day_open)                     as nextDayOpen,                    -- 次留数
+        else 0 end                           as convertRate,
+        sum(a.active)                            as active,
+        sum(a.download_finish)                   as downloadFinish,
+        sum(a.download_start)                    as downloadStart,
+        sum(a.install_finish)                    as installFinish,
+        sum(a.register)                          as register,
+        sum(a.pay_count)                         as payCount,
+        sum(a.form)                              as form,
+        sum(a.total_play)                        as totalPlay,
+        sum(a.valid_play)                        as validPlay,
+        sum(a.wifi_play)                         as wifiPlay,
+        sum(a.play25_feed_break)                 as play25FeedBreak,
+        sum(a.play50_feed_break)                 as play50FeedBreak,
+        sum(a.play75_feed_break)                 as play75FeedBreak,
+        sum(a.play100_feed_break)                as play100FeedBreak,
+        sum(a.share_material)                    as shareMaterial,
+        sum(a.follow)                            as follow,
+        sum(a.next_day_open)                     as nextDayOpen,
         case
         case
         when sum(a.active) != 0
         when sum(a.active) != 0
         then sum(a.next_day_open) / sum(a.active)
         then sum(a.next_day_open) / sum(a.active)
-        else 0 end                           as nextDayOpenRate,                -- 次留率 = 次留数/激活数
+        else 0 end                           as nextDayOpenRate,
 
 
         case
         case
         when sum(a.next_day_open) != 0
         when sum(a.next_day_open) != 0
         then sum(a.cost) / sum(a.next_day_open)
         then sum(a.cost) / sum(a.next_day_open)
-        else 0 end                           as nextDayOpenCost,                -- 次留成本 = 消耗/次留数
+        else 0 end                           as nextDayOpenCost,
 
 
-        sum(a.active_pay_amount)                 as activePayAmount,                -- 应用下载广告数据-付费次数
+        sum(a.active_pay_amount)                 as activePayAmount,
 
 
         case
         case
         when sum(a.valid_play) != 0
         when sum(a.valid_play) != 0
         then sum(a.cost) / sum(a.valid_play)
         then sum(a.cost) / sum(a.valid_play)
-        else 0 end                              validPlayCost,                  -- 视频数据-有效播放成本  计算公式:总花费/有效播放数,当天数据可能会有波动,次日早8点后稳定。
-        -- sum(a.advanced_creative_coupon_addition) as advancedCreativeCouponAddition, -- 附加创意-附加创意卡券领取
-        sum(a.convert_material)                  as convertMaterial,                -- 转化数据-转化数
+        else 0 end                              validPlayCost,
+        sum(a.convert_material)                  as convertMaterial,
 
 
         case
         case
         when sum(a.active_pay_amount) != 0
         when sum(a.active_pay_amount) != 0
         then sum(a.cost) / sum(a.active_pay_amount)
         then sum(a.cost) / sum(a.active_pay_amount)
-        else 0 end                           as activePayCost,                  -- 应用下载广告数据-付费成本 = 消耗/付费次数
-        -- sum(a.download)                          as download,                       -- 落地页转化数据-下载开始
-
+        else 0 end                           as activePayCost,
         case
         case
         when sum(a.click) != 0
         when sum(a.click) != 0
         then sum(a.cost) / sum(a.click)
         then sum(a.cost) / sum(a.click)
-        else 0 end                           as cpc,                            -- 平均点击单价
-        -- sum(a.location_click)                    as locationClick,                  -- 互动数据-POI点击数
-        -- sum(a.play_over_rate)                    as playOverRate,                   -- 视频数据-播完率
-
+        else 0 end                           as cpc,
         case
         case
         when sum(a.show_material) != 0
         when sum(a.show_material) != 0
         then sum(a.click) / sum(a.show_material)
         then sum(a.click) / sum(a.show_material)
-        else 0 end                           as ctr,                            -- 展现数据-点击率   广告被点击的次数占展示次数的百分比。计算方法:点击数/展示数*100%
+        else 0 end                           as ctr,
 
 
         case
         case
         when sum(a.show_material) != 0
         when sum(a.show_material) != 0
         then sum(a.cost) / sum(a.show_material) * 1000
         then sum(a.cost) / sum(a.show_material) * 1000
-        else 0 end                              cpm,                            -- 平均千次展现费用  广告平均每一千次展现所付出的费用,计算公式是:总花费/展示数*1000。
-        sum(a.wifi_play_rate)                    as wifiPlayRate,                   -- 视频数据-WiFi播放占比
-        sum(a.like_material)                     as likeMaterial,                   -- 互动数据-点赞数
+        else 0 end                              cpm,
+        sum(a.wifi_play_rate)                    as wifiPlayRate,
+        sum(a.like_material)                     as likeMaterial,
 
 
 
 
         case
         case
         when sum(a.active) != 0
         when sum(a.active) != 0
         then sum(a.cost) / sum(a.active)
         then sum(a.cost) / sum(a.active)
-        else 0 end                              activeCost,                     -- 应用下载广告数据-激活成本  计算方式:总花费/激活数。
+        else 0 end                              activeCost,
 
 
         case
         case
         when sum(a.game_addiction) != 0
         when sum(a.game_addiction) != 0
         then sum(a.cost) / sum(a.game_addiction)
         then sum(a.cost) / sum(a.game_addiction)
-        else 0 end                           as gameAddictionCost,              -- 应用下载广告数据-关键行为成本  广告主为每个有APP内关键行为的用户所付出的成本,计算公式是总花费/关键行为数。当天数据可能会有波动,次日早8点后稳定。
-        sum(a.game_addiction)                    as gameAddiction,                  -- 应用下载广告数据-关键行为数
+        else 0 end                           as gameAddictionCost,
+        sum(a.game_addiction)                    as gameAddiction,
 
 
         case
         case
         when sum(a.click) != 0
         when sum(a.click) != 0
         then sum(a.active) / sum(a.click)
         then sum(a.active) / sum(a.click)
-        else 0 end                           as activeRate,                     -- 应用下载广告数据-激活率   计算方式:激活数/点击数*100%
+        else 0 end                           as activeRate,
 
 
 
 
         case
         case
         when sum(a.active) != 0
         when sum(a.active) != 0
         then sum(a.game_addiction) / sum(a.active)
         then sum(a.game_addiction) / sum(a.active)
-        else 0 end                              gameAddictionRate,              -- 应用下载广告数据-关键行为率  关键行为用户占激活用户的比例
+        else 0 end                              gameAddictionRate,
 
 
         case
         case
         when sum(a.active) != 0
         when sum(a.active) != 0
         then sum(a.register) / sum(a.active)
         then sum(a.register) / sum(a.active)
-        else 0 end                           as activeRegisterRate,             -- 应用下载广告数据-注册率   注册用户占激活用户的比例
-
-
+        else 0 end                           as activeRegisterRate,
         case
         case
         when sum(a.download_finish) != 0
         when sum(a.download_finish) != 0
         then sum(a.cost) / sum(a.download_finish)
         then sum(a.cost) / sum(a.download_finish)
-        else 0 end                           as downloadFinishCost,             -- 应用下载广告数据-安卓下载完成成本 计算方式:总花费/安卓下载完成数。
-
-
+        else 0 end                           as downloadFinishCost,
         case
         case
         when sum(a.register) != 0
         when sum(a.register) != 0
         then sum(a.cost) / sum(a.register)
         then sum(a.cost) / sum(a.register)
-        else 0 end                           as activeRegisterCost,             -- 应用下载广告数据-注册成本  总花费/注册数,当天数据可能会有波动,次日早8点后稳定。
-        sum(a.show_material)                     as showMaterial,                   -- 展现数据-展示数
-
-
+        else 0 end                           as activeRegisterCost,
+        sum(a.show_material)                     as showMaterial,
         case
         case
         when sum(a.download_start) != 0
         when sum(a.download_start) != 0
         then sum(a.download_finish) / sum(a.download_start)
         then sum(a.download_finish) / sum(a.download_start)
-        else 0 end                           as downloadFinishRate,             -- 应用下载广告数据-安卓下载完成率  计算方式:安卓下载完成数/安卓下载开始数
-
+        else 0 end                           as downloadFinishRate,
         case
         case
         when sum(a.download_finish) != 0
         when sum(a.download_finish) != 0
         then sum(a.install_finish) / sum(a.download_finish)
         then sum(a.install_finish) / sum(a.download_finish)
-        else 0 end                           as installFinishRate,              -- 应用下载广告数据-安卓安装完成率  计算方式:安卓安装完成数/安卓下载完成数
-        -- sum(a.coupon)                            as coupon,                         -- 落地页转化数据-建站卡券领取
-        -- sum(a.coupon_single_page)                as couponSinglePage,               -- 落地页转化数据-卡券页领取
-        sum(a.play_over)                         as playOver,                       -- 完播数
-
+        else 0 end                           as installFinishRate,
+        sum(a.play_over)                         as playOver,
         case
         case
         when sum(a.download_start) != 0
         when sum(a.download_start) != 0
         then sum(a.cost) / sum(a.download_start)
         then sum(a.cost) / sum(a.download_start)
-        else 0 end                           as downloadStartCost,              -- 应用下载广告数据-安卓下载开始成本  计算方法:总花费/安卓下载开始数。
-        -- sum(a.message)                           as message,                        -- 落地页转化数据-短信咨询  用户点击短信咨询的次数
-
-
+        else 0 end                           as downloadStartCost,
         case
         case
         when sum(a.show_material) != 0
         when sum(a.show_material) != 0
         then sum(a.valid_play) / sum(a.show_material)
         then sum(a.valid_play) / sum(a.show_material)
-        else 0 end                           as validPlayRate,                  -- 视频数据-有效播放率  有效播放数/展示数
+        else 0 end                           as validPlayRate,
         case
         case
         when sum(a.valid_play) != 0
         when sum(a.valid_play) != 0
         then sum(a.average_play_time_per_play*a.valid_play)/sum(a.valid_play)
         then sum(a.average_play_time_per_play*a.valid_play)/sum(a.valid_play)
-        else 0 end as averagePlayTimePerPlay,         -- 视频数据-平均单次播放时长
+        else 0 end as averagePlayTimePerPlay,
         case
         case
         when sum(a.convert_material) != 0
         when sum(a.convert_material) != 0
         then sum(a.cost) / sum(a.convert_material)
         then sum(a.cost) / sum(a.convert_material)
-        else 0 end                           as convertCost,                    --  转化数据-转化成本=总花费/转化数
-
-
+        else 0 end                           as convertCost,
         case
         case
         when sum(a.install_finish) != 0
         when sum(a.install_finish) != 0
         then sum(a.cost) / sum(a.install_finish)
         then sum(a.cost) / sum(a.install_finish)
-        else 0 end                           as installFinishCost,              --  应用下载广告数据-安卓安装完成成本  计算方式:总花费/安卓安装完成数
-
+        else 0 end                           as installFinishCost,
         case
         case
         when sum(a.click) != 0
         when sum(a.click) != 0
         then sum(a.download_start) / sum(a.click)
         then sum(a.download_start) / sum(a.click)
-        else 0 end                           as downloadStartRate               --  应用下载广告数据-安卓下载开始率  计算方法:安卓下载开始数/点击数
+        else 0 end                           as downloadStartRate
     </sql>
     </sql>
 
 
     <select id="getRoleCodeByUserId" resultType="string">
     <select id="getRoleCodeByUserId" resultType="string">

+ 2 - 2
module-toutiao/src/main/resources/json_template/bytedance_filed_mapping.json

@@ -72,7 +72,7 @@
     "comment": "激活率"
     "comment": "激活率"
   },
   },
   "register": {
   "register": {
-    "filed": "IFNULL(sum(t1.register),0) as register  ",
+    "filed": "IFNULL(sum(t1.register),0) as register",
     "comment": "注册数"
     "comment": "注册数"
   },
   },
   "activeRegisterCost": {
   "activeRegisterCost": {
@@ -139,4 +139,4 @@
     "filed": "IFNULL(sum(t1.share),0) as shareMaterial ",
     "filed": "IFNULL(sum(t1.share),0) as shareMaterial ",
     "comment": "分享数"
     "comment": "分享数"
   }
   }
-}
+}

+ 3 - 3
module-toutiao/src/main/resources/json_template/bytedance_video_report_mapping.json

@@ -4,7 +4,7 @@
     "comment": "消耗"
     "comment": "消耗"
   },
   },
   "showMaterial": {
   "showMaterial": {
-    "filed": "IFNULL(sum(t1.show_material)0) as showMaterial ",
+    "filed": "IFNULL(sum(t1.show_material),0) as showMaterial ",
     "comment": "展示数"
     "comment": "展示数"
   },
   },
   "cpm": {
   "cpm": {
@@ -143,7 +143,7 @@
     "filed": "IFNULL(sum(t1.follow),0) as follow ",
     "filed": "IFNULL(sum(t1.follow),0) as follow ",
     "comment": "新增关注数"
     "comment": "新增关注数"
   },
   },
-  "likeMaterial": { 
+  "likeMaterial": {
     "filed": "IFNULL(sum(t1.like_material),0) as likeMaterial ",
     "filed": "IFNULL(sum(t1.like_material),0) as likeMaterial ",
     "comment": "点赞数"
     "comment": "点赞数"
   },
   },
@@ -151,4 +151,4 @@
     "filed": "IFNULL(sum(t1.share_material),0) as shareMaterial ",
     "filed": "IFNULL(sum(t1.share_material),0) as shareMaterial ",
     "comment": "分享数"
     "comment": "分享数"
   }
   }
-}
+}