瀏覽代碼

Merge branch 'master' into test

yumeng 5 年之前
父節點
當前提交
0747f67f35
共有 47 個文件被更改,包括 1369 次插入269 次删除
  1. 19 6
      jeecg-boot-module-system/src/main/java/org/jeecg/modules/ctop/controller/ProjectController.java
  2. 56 35
      jeecg-boot-module-system/src/main/java/org/jeecg/modules/ctop/controller/TestController.java
  3. 69 0
      jeecg-boot-module-system/src/main/java/org/jeecg/modules/ctop/entity/BytedanceAreaInfo.java
  4. 4 6
      jeecg-boot-module-system/src/main/java/org/jeecg/modules/ctop/job/KuaishouMaterialsLoadJob.java
  5. 3 4
      jeecg-boot-module-system/src/main/java/org/jeecg/modules/ctop/job/KuaishouSuZaoLoadJob.java
  6. 5 13
      jeecg-boot-module-system/src/main/java/org/jeecg/modules/ctop/mapper/xml/KuaishouMatcostAccountMayMapper.xml
  7. 1 1
      jeecg-boot-module-system/src/main/java/org/jeecg/modules/ctop/service/impl/KuaishouMatcostAccountMayServiceImpl.java
  8. 27 5
      jeecg-boot-module-system/src/test/java/org/jeecg/SampleTest.java
  9. 1 1
      module-common/src/main/java/cn/com/ctop/common/module/mapper/xml/BindAccountLoginMapper.xml
  10. 13 11
      module-common/src/main/java/cn/com/ctop/common/module/service/impl/BindAccountLoginServiceImpl.java
  11. 5 0
      module-common/src/main/java/cn/com/ctop/common/module/utils/KuaishouInterfaceConstant.java
  12. 2 0
      module-crawler/src/main/java/cn/com/ctop/crawler/modules/pangolin/entity/PangolinReportBillMonth.java
  13. 13 13
      module-crawler/src/main/java/cn/com/ctop/crawler/modules/pangolin/mapper/xml/PangolinAppMapper.xml
  14. 19 19
      module-crawler/src/main/java/cn/com/ctop/crawler/modules/pangolin/mapper/xml/PangolinReportAppHourMapper.xml
  15. 4 4
      module-crawler/src/main/java/cn/com/ctop/crawler/modules/pangolin/mapper/xml/PangolinReportBillMonthMapper.xml
  16. 10 12
      module-crawler/src/main/java/cn/com/ctop/crawler/modules/pangolin/mapper/xml/PangolinReportChannelDailyMapper.xml
  17. 1 1
      module-crawler/src/main/java/cn/com/ctop/crawler/modules/pangolin/service/impl/PangolinAppServiceImpl.java
  18. 13 11
      module-crawler/src/main/java/cn/com/ctop/crawler/modules/pangolin/service/impl/PangolinCrawlerServiceImpl.java
  19. 0 1
      module-crawler/src/main/java/cn/com/ctop/crawler/modules/pangolin/service/impl/PangolinReportAppHourServiceImpl.java
  20. 6 7
      module-job-kuaishou/src/main/java/cn/com/ctop/job/kuaishou/handler/KuaishouAccountBidJob.java
  21. 5 2
      module-job-kuaishou/src/main/java/cn/com/ctop/job/kuaishou/handler/KuaishouSuZaoLoadJob.java
  22. 69 12
      module-kuaishou/src/main/java/cn/com/ctop/kuaishou/modules/batch/controller/BatchController.java
  23. 1 0
      module-kuaishou/src/main/java/cn/com/ctop/kuaishou/modules/batch/entity/KuaiShouVideoGet.java
  24. 1 1
      module-kuaishou/src/main/java/cn/com/ctop/kuaishou/modules/batch/service/IBatchService.java
  25. 14 3
      module-kuaishou/src/main/java/cn/com/ctop/kuaishou/modules/batch/service/IKuaishouInterfaceService.java
  26. 35 14
      module-kuaishou/src/main/java/cn/com/ctop/kuaishou/modules/batch/service/impl/BatchServiceImpl.java
  27. 51 59
      module-kuaishou/src/main/java/cn/com/ctop/kuaishou/modules/batch/service/impl/KuaiShouVideoGetServiceImpl.java
  28. 96 23
      module-kuaishou/src/main/java/cn/com/ctop/kuaishou/modules/batch/service/impl/KuaishouInterfaceServiceImpl.java
  29. 2 2
      module-kuaishou/src/main/java/cn/com/ctop/kuaishou/modules/material/service/impl/KuaishouBidWarningServiceImpl.java
  30. 259 0
      module-toutiao/src/main/java/cn/com/ctop/toutiao/modules/batch/controller/BytedanceAreaInfoController.java
  31. 171 0
      module-toutiao/src/main/java/cn/com/ctop/toutiao/modules/batch/controller/BytedanceInterestCategoryController.java
  32. 72 0
      module-toutiao/src/main/java/cn/com/ctop/toutiao/modules/batch/entity/BytedanceAreaInfo.java
  33. 73 0
      module-toutiao/src/main/java/cn/com/ctop/toutiao/modules/batch/entity/BytedanceInterestCategory.java
  34. 15 0
      module-toutiao/src/main/java/cn/com/ctop/toutiao/modules/batch/mapper/BytedanceAreaInfoMapper.java
  35. 7 0
      module-toutiao/src/main/java/cn/com/ctop/toutiao/modules/batch/mapper/BytedanceInterestCategoryMapper.java
  36. 5 0
      module-toutiao/src/main/java/cn/com/ctop/toutiao/modules/batch/mapper/xml/BytedanceAreaInfoMapper.xml
  37. 5 0
      module-toutiao/src/main/java/cn/com/ctop/toutiao/modules/batch/mapper/xml/BytedanceInterestCategoryMapper.xml
  38. 16 0
      module-toutiao/src/main/java/cn/com/ctop/toutiao/modules/batch/service/IBytedanceAreaInfoService.java
  39. 1 0
      module-toutiao/src/main/java/cn/com/ctop/toutiao/modules/batch/service/IBytedanceGroupApiService.java
  40. 7 0
      module-toutiao/src/main/java/cn/com/ctop/toutiao/modules/batch/service/IBytedanceInterestCategoryService.java
  41. 33 0
      module-toutiao/src/main/java/cn/com/ctop/toutiao/modules/batch/service/impl/BytedanceAreaInfoServiceImpl.java
  42. 26 1
      module-toutiao/src/main/java/cn/com/ctop/toutiao/modules/batch/service/impl/BytedanceGroupApiServiceImpl.java
  43. 11 0
      module-toutiao/src/main/java/cn/com/ctop/toutiao/modules/batch/service/impl/BytedanceInterestCategoryServiceImpl.java
  44. 4 1
      module-toutiao/src/main/java/cn/com/ctop/toutiao/modules/material/service/impl/BytedanceBidWarningServiceImpl.java
  45. 1 1
      module-toutiao/src/main/java/cn/com/ctop/toutiao/modules/report/mapper/xml/ByteDanceVideoReportDailyMapper.xml
  46. 7 0
      module-toutiao/src/main/java/cn/com/ctop/toutiao/modules/report/service/IBytedanceReportDailyAgentService.java
  47. 111 0
      module-toutiao/src/main/java/cn/com/ctop/toutiao/modules/report/service/impl/BytedanceReportDailyAgentServiceImpl.java

+ 19 - 6
jeecg-boot-module-system/src/main/java/org/jeecg/modules/ctop/controller/ProjectController.java

@@ -173,6 +173,12 @@ public class ProjectController {
                                                 @RequestParam(name = "pageSize", defaultValue = "10") Integer pageSize,
                                                 HttpServletRequest req) {
         Result<IPage<Project>> result = new Result<>();
+        String advertiserName = project.getAdvertiserName();
+        project.setAdvertiserName(null);
+        String projectName = project.getProjectName();
+        project.setProjectName(null);
+
+
         String industryId = project.getIndustryId();
         project.setIndustryId(null);
         QueryWrapper<Project> queryWrapper = QueryGenerator.initQueryWrapper(project, req.getParameterMap());
@@ -183,12 +189,19 @@ public class ProjectController {
             queryWrapper.eq("user_id", sysUser.getId());
             queryWrapper.orderByDesc("create_time");
         }
-        if(null!=industryId&&!"".equals(industryId.trim())){
+        if (null != industryId && !"".equals(industryId.trim())) {
             SysCategory category = sysCategoryService.getById(industryId);
-            if(null!=category){
-                queryWrapper.likeRight("industry_code",category.getCode());
+            if (null != category) {
+                queryWrapper.likeRight("industry_code", category.getCode());
             }
         }
+        if (!Check.isNull(advertiserName)) {
+            queryWrapper.like("advertiser_name", advertiserName);
+
+        }
+        if (!Check.isNull(projectName)) {
+            queryWrapper.like("project_name", projectName);
+        }
         IPage<Project> pageList = projectService.page(page, queryWrapper);
         result.setSuccess(true);
         result.setResult(pageList);
@@ -217,7 +230,7 @@ public class ProjectController {
                 project.setCompanyId(advertiser.getCompanyId());
             }
             SysCategory category = sysCategoryService.getById(project.getIndustryId());
-            if(null!=category){
+            if (null != category) {
                 project.setIndustryCode(category.getCode());
                 project.setIndustryId(category.getId());
             }
@@ -283,7 +296,7 @@ public class ProjectController {
         }
 
         SysCategory category = sysCategoryService.getById(project.getIndustryId());
-        if(null!=category){
+        if (null != category) {
             project.setIndustryCode(category.getCode());
             project.setIndustryId(category.getId());
         }
@@ -308,7 +321,7 @@ public class ProjectController {
             userAllocationQueryWrapper.eq("project_id", project.getId());
             UserAllocation updateUserAllocation = new UserAllocation();
             updateUserAllocation.setProjectName(project.getProjectName());
-           // updateUserAllocation.setMediaId(project.getMediaId());
+            // updateUserAllocation.setMediaId(project.getMediaId());
             userAllocationService.update(updateUserAllocation, userAllocationQueryWrapper);
 
             if (ok) {

+ 56 - 35
jeecg-boot-module-system/src/main/java/org/jeecg/modules/ctop/controller/TestController.java

@@ -100,37 +100,34 @@ public class TestController {
 
     @GetMapping(value = "/getSuZhao")
     public void getSuZhao() throws JobExecutionException {
-        Thread thread = new Thread() {
-            @Override
-            public void run() {
-                SimpleDateFormat sim = new SimpleDateFormat("yyyy-MM-dd");
-                try {
 
-                    //1:查询当日数据
-                    List<CtopOauthToken> tokens = tokenService.selectKuaiShouToken();
-                    if (null == tokens || tokens.size() <= 0) {
-                        log.info("定时获取快手数据异常:未获取到可用的token");
-                        return;
-                    }
+        try {
 
-                    executorService = Executors.newFixedThreadPool(8);
-                    tokens.forEach(token -> {
-                        executorService.submit(new Runnable() {
-                            @Override
-                            public void run() {
-                                //1: 获取广告主信息数据
-                                kuaishouInterfaceService.getSuZaoList(token.getAccessToken(), token.getAccountId(), 1, null, null);
-                            }
-                        });
-                    });
-                } catch (Exception e) {
-                    e.printStackTrace();
-                }
+            //1:查询当日数据
+            QueryWrapper<CtopOauthToken> queryWrapper = new QueryWrapper<>();
+            queryWrapper.eq("media_id", 2);
+            queryWrapper.orderByDesc("create_time");
+            List<CtopOauthToken> tokens = tokenService.list(queryWrapper);
+            if (null == tokens || tokens.size() <= 0) {
+                log.info("定时获取快手数据异常:未获取到可用的token");
+                return;
+            }
 
+            executorService = Executors.newFixedThreadPool(8);
+            tokens.forEach(token -> {
+                executorService.submit(new Runnable() {
+                    @Override
+                    public void run() {
+                        //1: 获取广告主信息数据
+                        log.info("获取素造素材:accountId:{}", token.getAccountId());
+                        kuaishouInterfaceService.getSuZaoList(token.getAccessToken(), token.getAccountId(), 1, null, null);
+                    }
+                });
+            });
+        } catch (Exception e) {
+            e.printStackTrace();
+        }
 
-            }
-        };
-        thread.start();
 
     }
 
@@ -192,18 +189,19 @@ public class TestController {
                             public void run() {
                                 try {
                                     kuaishouInterfaceService.getSuZaoList(token.getAccessToken(), token.getAccountId(), 1, null, null);
-                                    String nowDate = DateUtils.getNowDate("yyyy-MM-dd");
+                                    kuaishouInterfaceService.getVideoList(token, null, null);
+                                    Thread.sleep(500);
+                                     /*String nowDate = DateUtils.getNowDate("yyyy-MM-dd");
                                     String videoEndDate = DateUtils.addDay(nowDate, -180);
-                                    SimpleDateFormat simpleDateFormat = new SimpleDateFormat("yyyy-MM-dd");
+                                   SimpleDateFormat simpleDateFormat = new SimpleDateFormat("yyyy-MM-dd");
                                     Date end = simpleDateFormat.parse(nowDate);
                                     Date start = simpleDateFormat.parse(videoEndDate);
                                     List<Date> dates = DateUtils.findDates(start, end);
                                     for (int i = 0; i < dates.size(); i++) {
                                         String formatDate = simpleDateFormat.format(dates.get(i));
-                                        kuaishouInterfaceService.getVideoList(token, formatDate);
                                         kuaishouInterfaceService.getImageList(token, formatDate);
                                         Thread.sleep(500);
-                                    }
+                                    }*/
 
                                 } catch (Exception e) {
                                     e.printStackTrace();
@@ -223,7 +221,7 @@ public class TestController {
     }
 
 
-   /* @GetMapping(value = "/getVideoByAccountId")
+    @GetMapping(value = "/getVideoByAccountId")
     public String getVideoByAccountId(Long accountId) throws IOException {
 
         try {
@@ -236,7 +234,8 @@ public class TestController {
                     tokenQueryWrapper.eq("account_id", accountId);
                     CtopOauthToken one = tokenService.getOne(tokenQueryWrapper);
                     try {
-                        kuaishouInterfaceService.getSuZaoList(one.getAccessToken(), one.getAccountId(), 1);
+                        kuaishouInterfaceService.getSuZaoList(one.getAccessToken(), one.getAccountId(), 1, null, null);
+                        kuaishouInterfaceService.getVideoList(one, null, null);
                         String nowDate = DateUtils.getNowDate("yyyy-MM-dd");
                         String videoEndDate = DateUtils.addDay(nowDate, -180);
                         SimpleDateFormat simpleDateFormat = new SimpleDateFormat("yyyy-MM-dd");
@@ -245,7 +244,7 @@ public class TestController {
                         List<Date> dates = DateUtils.findDates(start, end);
                         for (int i = 0; i < dates.size(); i++) {
                             String formatDate = simpleDateFormat.format(dates.get(i));
-                            kuaishouInterfaceService.getVideoList(one, formatDate);
+
                             kuaishouInterfaceService.getImageList(one, formatDate);
                             Thread.sleep(100);
                         }
@@ -263,7 +262,7 @@ public class TestController {
             e.printStackTrace();
         }
         return "Success";
-    }*/
+    }
 
 
     @GetMapping(value = "/createCutTask")
@@ -442,6 +441,28 @@ public class TestController {
     }
 
 
+    @GetMapping(value = "/getHistoryDataByAccountId")
+    public String getHistoryDataByAccountId(Long accountId) {
+        Result<String> result = new Result<>();
+        try {
+            String endDateStr = DateUtils.getDate("yyyy-MM-dd");
+            String startDate = DateUtils.addMonth(endDateStr, -6);
+            QueryWrapper<CtopOauthToken> tokenQueryWrapper = new QueryWrapper<>();
+            tokenQueryWrapper.eq("media_id", 2);
+            tokenQueryWrapper.eq("account_id", accountId);
+            CtopOauthToken ctopOauthTokens = oauthTokenMapper.selectOne(tokenQueryWrapper);
+            if (!Check.isNull(ctopOauthTokens)) {
+                historyReportTaskService.createTask(ctopOauthTokens.getAccountId(), ctopOauthTokens.getAccessToken(), startDate, endDateStr, CtopAdConstant.KUAISHOU_LOAD_JOB_TYPE_HISTORY);
+
+            }
+        } catch (Exception e) {
+            e.printStackTrace();
+            result.setSuccess(false);
+        }
+        return "success";
+    }
+
+
     @GetMapping(value = "/getTaskList")
     public String getTaskList() {
         Result<String> result = new Result<>();

+ 69 - 0
jeecg-boot-module-system/src/main/java/org/jeecg/modules/ctop/entity/BytedanceAreaInfo.java

@@ -0,0 +1,69 @@
+package org.jeecg.modules.ctop.entity;
+
+import com.baomidou.mybatisplus.annotation.IdType;
+import com.baomidou.mybatisplus.annotation.TableId;
+import com.baomidou.mybatisplus.annotation.TableName;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+import lombok.experimental.Accessors;
+import org.jeecgframework.poi.excel.annotation.Excel;
+
+import java.util.Date;
+
+/**
+ * 省市县信息
+ *
+ * @author jeecg-boot
+ * @version V1.0
+ * @date 2019-09-17
+ */
+@Data
+@TableName("ctop_bytedance_area_info")
+@EqualsAndHashCode(callSuper = false)
+@Accessors(chain = true)
+@ApiModel(value = "ctop_bytedance_area_info对象", description = "省市县信息")
+public class BytedanceAreaInfo {
+
+    /**
+     * id
+     */
+    @TableId(type = IdType.UUID)
+    @ApiModelProperty(value = "id")
+    private Integer id;
+    /**
+     * name
+     */
+    @Excel(name = "name", width = 15)
+    @ApiModelProperty(value = "name")
+    private String name;
+    /**
+     * code
+     */
+    @Excel(name = "code", width = 15)
+    @ApiModelProperty(value = "code")
+    private String code;
+    /**
+     * parentCode
+     */
+    @Excel(name = "parentCode", width = 15)
+    @ApiModelProperty(value = "parentCode")
+    private String parentCode;
+    /**
+     * level
+     */
+    @Excel(name = "level", width = 15)
+    @ApiModelProperty(value = "level")
+    private Integer level;
+    /**
+     * createTime
+     */
+    @ApiModelProperty(value = "createTime")
+    private Date createTime;
+    /**
+     * updateTime
+     */
+    @ApiModelProperty(value = "updateTime")
+    private Date updateTime;
+}

+ 4 - 6
jeecg-boot-module-system/src/main/java/org/jeecg/modules/ctop/job/KuaishouMaterialsLoadJob.java

@@ -10,7 +10,6 @@ import org.quartz.JobExecutionContext;
 import org.quartz.JobExecutionException;
 import org.springframework.beans.factory.annotation.Autowired;
 
-import java.util.Date;
 import java.util.List;
 import java.util.concurrent.ExecutorService;
 import java.util.concurrent.Executors;
@@ -29,11 +28,10 @@ public class KuaishouMaterialsLoadJob implements Job {
         Thread thread = new Thread() {
             @Override
             public void run() {
-                //增加接口的开始和结束日期
-                Date startDate = DateUtils.addDay(new Date(), -1);
-                Date endDate = new Date();
-                //1:查询当日数据
+
                 List<CtopOauthToken> tokens = tokenService.selectKuaiShouToken();
+                String endDate = DateUtils.getNowDate("yyyy-MM-dd");
+                String startDate = DateUtils.getAnotherDay("yyyy-mm-dd", endDate, -1);
                 executorService = Executors.newFixedThreadPool(8);
                 tokens.forEach(token -> {
                     executorService.submit(new Runnable() {
@@ -42,7 +40,7 @@ public class KuaishouMaterialsLoadJob implements Job {
                             try {
 
                                 //获取全量视频素材数据
-                                kuaishouInterfaceService.getVideoList(token, DateUtils.getNowDate("yyyy-MM-dd"));
+                                kuaishouInterfaceService.getVideoList(token, startDate, endDate);
                                 // 获取图片信息数据
                                 kuaishouInterfaceService.getImageList(token, DateUtils.getNowDate("yyyy-MM-dd"));
                             } catch (Exception e) {

+ 3 - 4
jeecg-boot-module-system/src/main/java/org/jeecg/modules/ctop/job/KuaishouSuZaoLoadJob.java

@@ -2,9 +2,7 @@ package org.jeecg.modules.ctop.job;
 
 import cn.com.ctop.common.module.entity.CtopOauthToken;
 import cn.com.ctop.common.module.service.ICtopOauthTokenService;
-import cn.com.ctop.common.module.utils.CtopAdConstant;
 import cn.com.ctop.kuaishou.modules.batch.service.IKuaishouInterfaceService;
-import com.xxl.job.core.util.DateUtil;
 import lombok.extern.slf4j.Slf4j;
 import org.jeecg.common.util.DateUtils;
 import org.quartz.Job;
@@ -37,8 +35,9 @@ public class KuaishouSuZaoLoadJob implements Job {
                         @Override
                         public void run() {
                             try {
-                                String endDate = DateUtils.getNowDate("yyyy-MM-dd");
-                                String startDate = DateUtils.getAnotherDay("yyyy-mm-dd", endDate, -1);
+                                String nowDate = DateUtils.getNowDate("yyyy-MM-dd");
+                                String endDate = DateUtils.getAnotherDay("yyyy-mm-dd", nowDate, 1);
+                                String startDate = DateUtils.getAnotherDay("yyyy-mm-dd", nowDate, -1);
                                 kuaishouInterfaceService.getSuZaoList(token.getAccessToken(), token.getAccountId(), 1, startDate, endDate);
                             } catch (Exception e) {
                                 e.printStackTrace();

+ 5 - 13
jeecg-boot-module-system/src/main/java/org/jeecg/modules/ctop/mapper/xml/KuaishouMatcostAccountMayMapper.xml

@@ -10,24 +10,16 @@
         where video_code = #{code}
     </update>
     <select id="getMinDateByCode" resultType="java.lang.String">
-        SELECT
-            min(s.stat_date)
-        FROM
-            ctop_kuaishou_report_daily_creative s
-            LEFT JOIN ctop_kuaishou_creative creative2 ON s.creative_id = creative2.creative_id
-            left join ctop_kuaishou_video_get video on video.photo_id = creative2.photo_id and creative2.account_id = video.account_id
-        WHERE
-            video.signature = #{code}
+    select substr(min(tmp.stat_date),1,10) from kuaishou_video_new_v2 video
+        left join tmp_kuaishou_creative_statdate2 tmp on tmp.photo_id = video.photo_id
+        where video.video_code = #{code}
     </select>
     <select id="getCostByParams" resultType="java.math.BigDecimal">
         SELECT
             sum(report.charge)
         FROM
-        ctop_kuaishou_report_daily_creative report
-        LEFT JOIN ctop_kuaishou_creative creative2 ON report.creative_id = creative2.creative_id
-        left join ctop_kuaishou_video_get video on video.photo_id = creative2.photo_id and creative2.account_id = video.account_id
+        tmp_kuaishou_creative_report report
         WHERE
-        video.signature =#{code} and report.stat_date &gt;= #{startDate} and report.stat_date &lt;= #{endDate};
-
+        report.video_code =#{code} and report.state_date &gt;= #{startDate} and report.state_date &lt; #{endDate};
     </select>
 </mapper>

+ 1 - 1
jeecg-boot-module-system/src/main/java/org/jeecg/modules/ctop/service/impl/KuaishouMatcostAccountMayServiceImpl.java

@@ -17,7 +17,7 @@ public class KuaishouMatcostAccountMayServiceImpl extends ServiceImpl<KuaishouMa
     @Override
     public KuaishouMatcostAccountMay getOne() {
         QueryWrapper<KuaishouMatcostAccountMay>queryWrapper = new QueryWrapper<>();
-        queryWrapper.isNotNull("end_date").isNotNull("video_code").isNull("twcost").last("limit 1");
+        queryWrapper.isNull("twcost").isNotNull("end_date").last("limit 1");
         return this.getOne(queryWrapper);
     }
 

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

@@ -10,6 +10,7 @@ import cn.com.ctop.crawler.modules.pangolin.service.PangolinCrawlerService;
 import cn.com.ctop.crawler.modules.pangolin.service.PangolinLoginService;
 import cn.com.ctop.kuaishou.modules.graphql.service.IKuaishouWebInterfaceService;
 import cn.com.ctop.toutiao.modules.material.service.IByteDanceAdvertiserDataService;
+import cn.com.ctop.toutiao.modules.report.service.IReportService;
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import lombok.extern.slf4j.Slf4j;
 import org.jeecg.common.util.DateUtils;
@@ -22,6 +23,7 @@ import org.springframework.boot.test.context.SpringBootTest;
 import org.springframework.test.context.junit4.SpringRunner;
 
 import java.math.BigDecimal;
+import java.util.Date;
 import java.util.HashMap;
 import java.util.List;
 import java.util.concurrent.CountDownLatch;
@@ -36,10 +38,23 @@ public class SampleTest {
     private ICtopOauthTokenService oauthTokenService;
     @Autowired
     private IByteDanceAdvertiserDataService advertiserDataService;
+    @Autowired
+    private IReportService reportService;
     @Test
     public void testOceanEngineJob() {
-        CtopOauthToken token = oauthTokenService.getTokenByAccountId(1629785592929294L);
-        advertiserDataService.getMaterialList(token);
+        CtopOauthToken token1 = oauthTokenService.getTokenByAccountId(1670725854459911L);
+        CtopOauthToken token2 = oauthTokenService.getTokenByAccountId(1670827164313607L);
+        CtopOauthToken token3 = oauthTokenService.getTokenByAccountId(1670801593147405L);
+        CtopOauthToken token4 = oauthTokenService.getTokenByAccountId(1670827163327501L);
+        CtopOauthToken token5 = oauthTokenService.getTokenByAccountId(1670827163853832L);
+        for(int i=0;i<100;i++){
+            Date startDate = DateUtils.addDay(new Date(),-i);
+            reportService.getAdvertiserReport(token1,startDate,startDate,CtopAdConstant.BYTEDANCE_REPORT_TYPE_DAILY);
+            reportService.getAdvertiserReport(token2,startDate,startDate,CtopAdConstant.BYTEDANCE_REPORT_TYPE_DAILY);
+            reportService.getAdvertiserReport(token3,startDate,startDate,CtopAdConstant.BYTEDANCE_REPORT_TYPE_DAILY);
+            reportService.getAdvertiserReport(token4,startDate,startDate,CtopAdConstant.BYTEDANCE_REPORT_TYPE_DAILY);
+            reportService.getAdvertiserReport(token5,startDate,startDate,CtopAdConstant.BYTEDANCE_REPORT_TYPE_DAILY);
+        }
     }
 
     @Autowired
@@ -133,6 +148,13 @@ public class SampleTest {
             }else{
                 matcostAccountMayService.updateCostByCode(matcostAccountMay.getVideoCode(),BigDecimal.ZERO);
             }
+//            String minDate = matcostAccountMayService.getMinDate(matcostAccountMay.getVideoCode());
+//            if(null == minDate||minDate.trim().equals("")){
+//                matcostAccountMayService.updateByCode(matcostAccountMay.getVideoCode(),"-");
+//            }else{
+//                matcostAccountMayService.updateByCode(matcostAccountMay.getVideoCode(),minDate);
+//            }
+
             loadData();
         }
     }
@@ -146,9 +168,9 @@ public class SampleTest {
         List<BindAccountLogin> list = bindAccountLoginService.list(queryWrapper);
         if (list != null && !list.isEmpty()) {
             for (BindAccountLogin bindAccountLogin : list) {
-//                pangolinCrawlerService.getChannelList(bindAccountLogin);
-                pangolinCrawlerService.getActivationList(bindAccountLogin, DateUtils.getNowDate("yyyy-MM-dd"), 1);
-                pangolinCrawlerService.getCheckList(bindAccountLogin);
+                pangolinCrawlerService.getChannelList(bindAccountLogin);
+//                pangolinCrawlerService.getActivationList(bindAccountLogin, DateUtils.getNowDate("yyyy-MM-dd"), 1);
+//                pangolinCrawlerService.getCheckList(bindAccountLogin);
 //                QueryWrapper<PangolinApp> queryWrapper1 = new QueryWrapper<>();
 //                queryWrapper1.eq("account_name", bindAccountLogin.getAccountName());
 //                List<PangolinApp> appList = pangolinAppService.list(queryWrapper1);

+ 1 - 1
module-common/src/main/java/cn/com/ctop/common/module/mapper/xml/BindAccountLoginMapper.xml

@@ -25,7 +25,7 @@
         from
         ctop_bind_account_login login
         left join ctop_project project on login.project_id = project.id
-        where 1=1
+        where login.status = 1
         <if test="userId!=null">
             and login.user_id = #{userId}
         </if>

+ 13 - 11
module-common/src/main/java/cn/com/ctop/common/module/service/impl/BindAccountLoginServiceImpl.java

@@ -34,6 +34,8 @@ import java.util.Map;
 @Slf4j
 @Service
 public class BindAccountLoginServiceImpl extends ServiceImpl<BindAccountLoginMapper, BindAccountLogin> implements IBindAccountLoginService {
+    @Autowired
+    private BindAccountLoginMapper bindAccountLoginMapper;
     @Override
     public boolean checkLogin(BindAccountLogin bindAccountLogin, String response) {
         if (response.contains("<html>")) {
@@ -43,6 +45,7 @@ public class BindAccountLoginServiceImpl extends ServiceImpl<BindAccountLoginMap
         }
         return true;
     }
+
     @Override
     public BindAccountLogin selectByAccountId(String accountId) {
         QueryWrapper<BindAccountLogin> queryWrapper = new QueryWrapper<>();
@@ -68,21 +71,20 @@ public class BindAccountLoginServiceImpl extends ServiceImpl<BindAccountLoginMap
 
     @Override
     public List<PangolinProjectVO> getProjectByParams(String userId, String loginType) {
-        List<PangolinProjectVO> projectVOS =  bindAccountLoginMapper.getProjectByParams(userId,loginType,null);
-        List<PangolinProjectVO> setProjectVOS = new ArrayList<>();
-        if(null!=projectVOS&&!projectVOS.isEmpty()){
-            projectVOS.forEach(pangolinProjectVO -> {
-                List<PangolinAccountVO>accountVOS = bindAccountLoginMapper.getAccountByParams(userId,loginType,pangolinProjectVO.getProjectId());
-                pangolinProjectVO.setAccountVOList(accountVOS);
-                setProjectVOS.add(pangolinProjectVO);
+        List<PangolinProjectVO> projectVos =  bindAccountLoginMapper.getProjectByParams(userId,loginType,null);
+        List<PangolinProjectVO> setProjectVos = new ArrayList<>();
+        if(null!=projectVos&&!projectVos.isEmpty()){
+            projectVos.forEach(pangolinProjectVO -> {
+                List<PangolinAccountVO>accountVos = bindAccountLoginMapper.getAccountByParams(userId,loginType,pangolinProjectVO.getProjectId());
+                if(null!=accountVos&&!accountVos.isEmpty()){
+                    pangolinProjectVO.setAccountVOList(accountVos);
+                    setProjectVos.add(pangolinProjectVO);
+                }
             });
         }
-        return setProjectVOS;
+        return setProjectVos;
     }
 
-    @Autowired
-    private BindAccountLoginMapper bindAccountLoginMapper;
-
     @Override
     public Map<String, Object> getListByUserId(String userId) {
         Map<String,Object>result = new HashMap<>();

+ 5 - 0
module-common/src/main/java/cn/com/ctop/common/module/utils/KuaishouInterfaceConstant.java

@@ -198,6 +198,11 @@ public class KuaishouInterfaceConstant {
      */
     public static final String ASYNC_TASK_DOWNLOAD = "/rest/openapi/v1/async_task/download";
 
+    /**
+     * 落地页查询
+     */
+    public static final String PAGE_LIST = "/rest/openapi/v2/lp/page/list";
+
 
     /**
      * 登录

+ 2 - 0
module-crawler/src/main/java/cn/com/ctop/crawler/modules/pangolin/entity/PangolinReportBillMonth.java

@@ -44,4 +44,6 @@ public class PangolinReportBillMonth {
      * 账户质量分
      */
     private BigDecimal accountQualityScore;
+
+    private String accountName;
 }

+ 13 - 13
module-crawler/src/main/java/cn/com/ctop/crawler/modules/pangolin/mapper/xml/PangolinAppMapper.xml

@@ -2,28 +2,28 @@
 <!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
 <mapper namespace="cn.com.ctop.crawler.modules.pangolin.mapper.PangolinAppMapper">
     <select id="getListByParams" resultType="cn.com.ctop.crawler.modules.pangolin.entity.PangolinApp">
-        select app.*
+        select distinct app.app_id as 'id',name
             from ctop_pangolin_app app
         left join ctop_bind_account_login login on login.account_name = app.account_name
         where
-        1=1
+        login.status = 1
         <if test="userId!=null">
             and login.user_id = #{userId}
         </if>
         <if test="accountNames!=null or projectIds!=null">
             and  ( 1=0
-              <if test="accountNames!=null">
-                  or login.account_name in
-                  <foreach item="item" index="index" collection="accountNames" open="(" separator="," close=")">
+                <if test="accountNames!=null">
+                    or login.account_name in
+                    <foreach item="item" index="index" collection="accountNames" open="(" separator="," close=")">
                       #{item}
-                  </foreach>
-              </if>
-            <if test="projectIds!=null">
-                or login.project_id in
-                <foreach item="item" index="index" collection="projectIds" open="(" separator="," close=")">
-                    #{item}
-                </foreach>
-            </if>
+                    </foreach>
+                </if>
+                <if test="projectIds!=null">
+                    or login.project_id in
+                    <foreach item="item" index="index" collection="projectIds" open="(" separator="," close=")">
+                        #{item}
+                    </foreach>
+                </if>
               )
         </if>
     </select>

+ 19 - 19
module-crawler/src/main/java/cn/com/ctop/crawler/modules/pangolin/mapper/xml/PangolinReportAppHourMapper.xml

@@ -15,12 +15,12 @@
             hour
        from (select num,date,hour
 from ctop_pangolin_report_app_hour appHourActive
-         left join ctop_pangolin_app app on app.id = appHourActive.app_id
-         left join ctop_bind_account_login login on login.account_name = app.account_name
+         left join ctop_pangolin_app app on app.app_id = appHourActive.app_id
+         left join ctop_bind_account_login login on login.account_name = appHourActive.account_name
 where appHourActive.type = #{type}
 and date =  #{today} and hour = #{hour}
 <if test="appId!=null">
-    and app.id = #{appId}
+    and app.app_id = #{appId}
 </if>
 <if test="userId!=null">
     and login.user_id = #{userId}
@@ -28,7 +28,7 @@ and date =  #{today} and hour = #{hour}
         <if test="accountNames!=null or projectIds!=null">
             and  ( 1=0
             <if test="accountNames!=null">
-                or login.account_name in
+                or appHourActive.account_name in
                 <foreach item="item" index="index" collection="accountNames" open="(" separator="," close=")">
                     #{item}
                 </foreach>
@@ -44,12 +44,12 @@ and date =  #{today} and hour = #{hour}
 group by appHourActive.date, appHourActive.hour
 union all select num,date,hour
 from ctop_pangolin_report_app_hour appHourActive
-         left join ctop_pangolin_app app on app.id = appHourActive.app_id
-         left join ctop_bind_account_login login on login.account_name = app.account_name
+         left join ctop_pangolin_app app on app.app_id = appHourActive.app_id
+         left join ctop_bind_account_login login on login.account_name = appHourActive.account_name
 where appHourActive.type = #{type}
         and date =  #{yesterday} and hour = #{hour}
         <if test="appId!=null">
-            and app.id = #{appId}
+            and app.app_id = #{appId}
         </if>
         <if test="userId!=null">
             and login.user_id = #{userId}
@@ -57,7 +57,7 @@ where appHourActive.type = #{type}
         <if test="accountNames!=null or projectIds!=null">
             and  ( 1=0
             <if test="accountNames!=null">
-                or login.account_name in
+                or appHourActive.account_name in
                 <foreach item="item" index="index" collection="accountNames" open="(" separator="," close=")">
                     #{item}
                 </foreach>
@@ -73,12 +73,12 @@ where appHourActive.type = #{type}
         group by appHourActive.date, appHourActive.hour
 union all select num,date,hour
 from ctop_pangolin_report_app_hour appHourActive
-         left join ctop_pangolin_app app on app.id = appHourActive.app_id
-         left join ctop_bind_account_login login on login.account_name = app.account_name
+         left join ctop_pangolin_app app on app.app_id = appHourActive.app_id
+         left join ctop_bind_account_login login on login.account_name = appHourActive.account_name
 where appHourActive.type = #{type}
         and date =  #{sevenDaysAgo} and hour = #{hour}
         <if test="appId!=null">
-            and app.id = #{appId}
+            and app.app_id = #{appId}
         </if>
         <if test="userId!=null">
             and login.user_id = #{userId}
@@ -86,7 +86,7 @@ where appHourActive.type = #{type}
         <if test="accountNames!=null or projectIds!=null">
             and  ( 1=0
             <if test="accountNames!=null">
-                or login.account_name in
+                or appHourActive.account_name in
                 <foreach item="item" index="index" collection="accountNames" open="(" separator="," close=")">
                     #{item}
                 </foreach>
@@ -104,8 +104,8 @@ where appHourActive.type = #{type}
     union all
     select num,date,hour
     from ctop_pangolin_report_app_hour appHourActive
-    left join ctop_pangolin_app app on app.id = appHourActive.app_id
-    left join ctop_bind_account_login login on login.account_name = app.account_name
+    left join ctop_pangolin_app app on app.app_id = appHourActive.app_id
+    left join ctop_bind_account_login login on login.account_name = appHourActive.account_name
     where appHourActive.type = #{type}
     and date =  #{compareTime1} and hour = #{hour}
     <if test="appId!=null">
@@ -117,7 +117,7 @@ where appHourActive.type = #{type}
     <if test="accountNames!=null or projectIds!=null">
         and  ( 1=0
         <if test="accountNames!=null">
-            or login.account_name in
+            or appHourActive.account_name in
             <foreach item="item" index="index" collection="accountNames" open="(" separator="," close=")">
                 #{item}
             </foreach>
@@ -136,12 +136,12 @@ where appHourActive.type = #{type}
             union all
             select num,date,hour
             from ctop_pangolin_report_app_hour appHourActive
-            left join ctop_pangolin_app app on app.id = appHourActive.app_id
-            left join ctop_bind_account_login login on login.account_name = app.account_name
+            left join ctop_pangolin_app app on app.app_id = appHourActive.app_id
+            left join ctop_bind_account_login login on login.account_name = appHourActive.account_name
             where appHourActive.type = #{type}
             and date =  #{compareTime2} and hour = #{hour}
             <if test="appId!=null">
-                and app.id = #{appId}
+                and app.app_id = #{appId}
             </if>
             <if test="userId!=null">
                 and login.user_id = #{userId}
@@ -149,7 +149,7 @@ where appHourActive.type = #{type}
             <if test="accountNames!=null or projectIds!=null">
                 and  ( 1=0
                 <if test="accountNames!=null">
-                    or login.account_name in
+                    or appHourActive.account_name in
                     <foreach item="item" index="index" collection="accountNames" open="(" separator="," close=")">
                         #{item}
                     </foreach>

+ 4 - 4
module-crawler/src/main/java/cn/com/ctop/crawler/modules/pangolin/mapper/xml/PangolinReportBillMonthMapper.xml

@@ -16,14 +16,14 @@
        round(avg(bill.account_quality_score),2) as 'account_quality_score',
        sum(bill.actual_total_price) as 'actual_total_price'
     from ctop_pangolin_report_bill_month bill
-         left join ctop_pangolin_app app on app.id = bill.app_id
-         left join ctop_bind_account_login login on login.account_name = app.account_name
+         left join ctop_pangolin_app app on app.app_id = bill.app_id
+         left join ctop_bind_account_login login on login.account_name = bill.account_name
          where 1=1
          <if test="userId!=null">
              and login.user_id = #{userId}
          </if>
          <if test="appId!=null">
-             and app.id = #{appId}
+             and app.app_id = #{appId}
          </if>
         <if test="startDate!=null">
             and bill.date &gt;= #{startDate}
@@ -37,7 +37,7 @@
         <if test="accountNames!=null or projectIds!=null">
             and  ( 1=0
             <if test="accountNames!=null">
-                or login.account_name in
+                or bill.account_name in
                 <foreach item="item" index="index" collection="accountNames" open="(" separator="," close=")">
                     #{item}
                 </foreach>

+ 10 - 12
module-crawler/src/main/java/cn/com/ctop/crawler/modules/pangolin/mapper/xml/PangolinReportChannelDailyMapper.xml

@@ -6,7 +6,8 @@
             resultType="cn.com.ctop.crawler.modules.pangolin.entity.PangolinReportChannelDaily">
         select
             daily.date,
-            channel.name as 'channel_name',
+--             daily.channel_name as 'channel_name',
+            '-' as 'channel_name',
             <if test="appId == null">
                 '-' as 'app_name',
             </if>
@@ -18,15 +19,14 @@
             sum(daily.total_price)as 'total_price'
         from
         ctop_pangolin_report_channel_daily daily
-        left join ctop_pangolin_channel channel on channel.name = daily.channel_name
-        left join ctop_bind_account_login login on login.account_name = channel.account_name
-        left join ctop_pangolin_app app on app.account_name = channel.account_name
+        left join ctop_bind_account_login login on login.account_name = daily.account_name
+        left join ctop_pangolin_app app on app.name = daily.app_name and app.account_name = daily.account_name
         where 1=1
         <if test="userId!=null">
             and login.user_id = #{userId}
         </if>
         <if test="appId!=null">
-            and app.id = #{appId}
+            and app.app_id = #{appId}
         </if>
         <if test="startDate!=null">
             and daily.date &gt;= #{startDate}
@@ -40,7 +40,7 @@
         <if test="accountNames!=null or projectIds!=null">
             and  ( 1=0
             <if test="accountNames!=null">
-                or login.account_name in
+                or daily.account_name in
                 <foreach item="item" index="index" collection="accountNames" open="(" separator="," close=")">
                     #{item}
                 </foreach>
@@ -60,15 +60,14 @@
             sum(daily.external_activation)
         from
         ctop_pangolin_report_channel_daily daily
-        left join ctop_pangolin_channel channel on channel.name = daily.channel_name
-        left join ctop_bind_account_login login on login.account_name = channel.account_name
-        left join ctop_pangolin_app app on app.account_name = channel.account_name
+        left join ctop_bind_account_login login on login.account_name = daily.account_name
+        left join ctop_pangolin_app app on app.account_name = daily.account_name and daily.app_name = app.name
         where 1=1
         <if test="userId!=null">
             and login.user_id = #{userId}
         </if>
         <if test="appId!=null">
-            and app.id = #{appId}
+            and app.app_id = #{appId}
         </if>
         <if test="startDate!=null">
             and daily.date &gt;= #{startDate}
@@ -82,7 +81,7 @@
         <if test="accountNames!=null or projectIds!=null">
             and  ( 1=0
             <if test="accountNames!=null">
-                or login.account_name in
+                or daily.account_name in
                 <foreach item="item" index="index" collection="accountNames" open="(" separator="," close=")">
                     #{item}
                 </foreach>
@@ -95,7 +94,6 @@
             </if>
             )
         </if>
-
     </select>
 
 </mapper>

+ 1 - 1
module-crawler/src/main/java/cn/com/ctop/crawler/modules/pangolin/service/impl/PangolinAppServiceImpl.java

@@ -71,7 +71,7 @@ public class PangolinAppServiceImpl extends ServiceImpl<PangolinAppMapper, Pango
         if(null == getApp){
             this.save(app);
         }else{
-            getApp.setName(app.getAccountName());
+            getApp.setName(app.getName());
             this.updateById(getApp);
         }
     }

+ 13 - 11
module-crawler/src/main/java/cn/com/ctop/crawler/modules/pangolin/service/impl/PangolinCrawlerServiceImpl.java

@@ -80,11 +80,13 @@ public class PangolinCrawlerServiceImpl implements PangolinCrawlerService {
                     pangolinReportBillMonth.setYear(Integer.parseInt(date.split("-")[0]));
                     pangolinReportBillMonth.setMonth(Integer.parseInt(date.split("-")[1]));
                     pangolinReportBillMonth.setDate(date);
+                    pangolinReportBillMonth.setAccountName(bindAccountLogin.getAccountName());
                     QueryWrapper<PangolinReportBillMonth> queryWrapper = new QueryWrapper<>();
                     queryWrapper.eq("os", pangolinReportBillMonth.getOs());
                     queryWrapper.eq("app_id", pangolinReportBillMonth.getAppId());
                     queryWrapper.eq("month", pangolinReportBillMonth.getMonth());
                     queryWrapper.eq("year", pangolinReportBillMonth.getYear());
+                    queryWrapper.eq("account_name", pangolinReportBillMonth.getAccountName());
                     if (pangolinReportBillMonthService.getOne(queryWrapper) == null) {
                         pangolinReportBillMonthService.save(pangolinReportBillMonth);
                     } else {
@@ -135,17 +137,17 @@ public class PangolinCrawlerServiceImpl implements PangolinCrawlerService {
                     app.setName(name);
                     pangolinAppService.saveOrUpdateApp(app);
                 }
-                Iterator<JsonNode> channelIterator = resultNode.get("data").get("ChannelNameList").elements();
-                while (channelIterator.hasNext()) {
-                    JsonNode channelNode = channelIterator.next();
-                    Long id = channelNode.get("Id").asLong();
-                    String name = channelNode.get("Name").asText();
-                    PangolinChannel channel = new PangolinChannel();
-                    channel.setAccountName(bindAccountLogin.getAccountName());
-                    channel.setId(id);
-                    channel.setName(name);
-                    pangolinChannelService.saveOrUpdate(channel);
-                }
+//                Iterator<JsonNode> channelIterator = resultNode.get("data").get("ChannelNameList").elements();
+//                while (channelIterator.hasNext()) {
+//                    JsonNode channelNode = channelIterator.next();
+//                    Long id = channelNode.get("Id").asLong();
+//                    String name = channelNode.get("Name").asText();
+//                    PangolinChannel channel = new PangolinChannel();
+//                    channel.setAccountName(bindAccountLogin.getAccountName());
+//                    channel.setId(id);
+//                    channel.setName(name);
+//                    pangolinChannelService.saveOrUpdate(channel);
+//                }
             }
         } catch (IOException e) {
             e.printStackTrace();

+ 0 - 1
module-crawler/src/main/java/cn/com/ctop/crawler/modules/pangolin/service/impl/PangolinReportAppHourServiceImpl.java

@@ -24,7 +24,6 @@ public class PangolinReportAppHourServiceImpl extends ServiceImpl<PangolinReport
 
     @Override
     public Map<String, Object> getRealTimeData(String userId, JSONObject data) {
-
         Map<String, Object> resultMap = new HashMap<>();
         String today = DateUtils.formatDate();
         String yesterday = DateUtils.addDay(today,-1);

+ 6 - 7
module-job-kuaishou/src/main/java/cn/com/ctop/job/kuaishou/handler/KuaishouAccountBidJob.java

@@ -1,8 +1,8 @@
 package cn.com.ctop.job.kuaishou.handler;
 
 import cn.com.ctop.kuaishou.modules.material.service.IKuaishouBidWarningService;
-import org.quartz.JobExecutionContext;
-import org.quartz.JobExecutionException;
+import com.xxl.job.core.biz.model.ReturnT;
+import com.xxl.job.core.handler.annotation.XxlJob;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Component;
 
@@ -13,11 +13,10 @@ public class KuaishouAccountBidJob {
 
     /**
      * 出价预警
-     *
-     * @param jobExecutionContext
-     * @throws JobExecutionException
-     */
-    public void execute(JobExecutionContext jobExecutionContext) {
+     **/
+    @XxlJob("kuaishouAccountBidJob")
+    public ReturnT<String> execute(String param) {
         bidWarningService.bidWarning();
+        return ReturnT.SUCCESS;
     }
 }

+ 5 - 2
module-job-kuaishou/src/main/java/cn/com/ctop/job/kuaishou/handler/KuaishouSuZaoLoadJob.java

@@ -26,10 +26,13 @@ public class KuaishouSuZaoLoadJob {
     public ReturnT<String> execute(String param) throws Exception {
         List<CtopOauthToken> tokens = tokenService.selectKuaiShouToken();
         executorService = Executors.newFixedThreadPool(8);
-        String endDate = DateUtils.getDate("yyyy-MM-dd");
-        String startDate = DateUtils.getAnotherDay("yyyy-MM-dd", endDate, -1);
+        String nowDate = DateUtils.getNowDate("yyyy-MM-dd");
+        String endDate = DateUtils.getAnotherDay("yyyy-mm-dd", nowDate, 1);
+        String startDate = DateUtils.getAnotherDay("yyyy-mm-dd", nowDate, -1);
         tokens.forEach(token -> executorService.submit(() -> kuaishouInterfaceService.getSuZaoList(token.getAccessToken(), token.getAccountId(), 1, startDate, endDate)));
         XxlJobLogger.log("快手素造数据同步完成");
         return ReturnT.SUCCESS;
     }
+
+
 }

+ 69 - 12
module-kuaishou/src/main/java/cn/com/ctop/kuaishou/modules/batch/controller/BatchController.java

@@ -30,7 +30,6 @@ import org.springframework.web.bind.annotation.*;
 
 import javax.servlet.http.HttpServletRequest;
 import java.math.BigDecimal;
-import java.util.ArrayList;
 import java.util.List;
 import java.util.Map;
 
@@ -118,11 +117,8 @@ public class BatchController {
             result.setResult(spendVo);
 
             String nowDate = DateUtils.getNowDate("yyyy-MM-dd");
-            String anotherDay = DateUtils.getAnotherDay("yyyy-MM-dd", nowDate, -1);
-
-            List dateList = new ArrayList();
-            dateList.add(nowDate);
-            dateList.add(anotherDay);
+            String startDate = DateUtils.getAnotherDay("yyyy-mm-dd", nowDate, -1);
+            String endDate = DateUtils.getAnotherDay("yyyy-mm-dd", nowDate, 1);
 
 
             Thread planThread = new Thread() {
@@ -155,10 +151,8 @@ public class BatchController {
             Thread thread2 = new Thread() {
                 @Override
                 public void run() {
-                    for (int i = 0; i < dateList.size(); i++) {
-                        String date = (String) dateList.get(i);
-                        iKuaishouInterfaceService.getVideoList(oauthToken, date);
-                    }
+                    iKuaishouInterfaceService.getVideoList(oauthToken, startDate, nowDate);
+
                 }
             };
             thread2.start();
@@ -166,8 +160,7 @@ public class BatchController {
             Thread thread3 = new Thread() {
                 @Override
                 public void run() {
-                    String endDate = DateUtils.getNowDate("yyyy-MM-dd");
-                    String startDate = DateUtils.getAnotherDay("yyyy-mm-dd", endDate, -1);
+
                     iKuaishouInterfaceService.getSuZaoList(oauthToken.getAccessToken(), oauthToken.getAccountId(), 1, startDate, endDate);
                 }
             };
@@ -1125,6 +1118,7 @@ public class BatchController {
                 queryWrapper.between("stat_date", startDate, endDate);
             }
             queryWrapper.orderByDesc("stat_date");
+            queryWrapper.groupBy("signature");
             Page<KuaiShouVideoGet> page = new Page<>(pageNo, pageSize);
             IPage<KuaiShouVideoGet> pageList = kuaiShouVideoGetService.page(page, queryWrapper);
             result.setSuccess(true);
@@ -2129,4 +2123,67 @@ public class BatchController {
     }
 
 
+    /**
+     * 获取可选的动态词包
+     *
+     * @param accountId
+     * @return
+     */
+    @GetMapping(value = "/getPageList")
+    public Result<JSONArray> getPageList(Long accountId, Long appId, String viewComp) {
+        Result<JSONArray> result = new Result<>();
+        try {
+            if (Check.isNull(accountId)) {
+                throw new Exception("入参为空");
+            }
+            CtopOauthToken oauthToken = oauthTokenService.getTokenByAccountId(accountId);
+            if (Check.isNull(oauthToken)) {
+                throw new Exception("未获取到账户信息");
+            }
+            JSONArray pageArr = iKuaishouInterfaceService.getPageList(accountId, oauthToken.getAccessToken(), appId, viewComp);
+            result.setResult(pageArr);
+            result.setSuccess(true);
+        } catch (Exception e) {
+            e.printStackTrace();
+            result.setSuccess(false);
+            result.setMessage(e.getMessage());
+        }
+        return result;
+    }
+
+
+    /**
+     * 获取可选的动态词包
+     *
+     * @param accountId
+     * @return
+     */
+    @GetMapping(value = "/getAppId")
+    public Result<Long> getAppId(Long accountId, Long unitId) {
+        Result<Long> result = new Result<>();
+        try {
+            if (Check.isNull(accountId)) {
+                throw new Exception("入参为空");
+            }
+            QueryWrapper<KuaiShouGroup> groupQueryWrapper = new QueryWrapper<>();
+            groupQueryWrapper.eq("account_id", accountId);
+            groupQueryWrapper.eq("unit_id", unitId);
+            KuaiShouGroup one = kuaiShouGroupService.getOne(groupQueryWrapper);
+            if (!Check.isNull(one)) {
+                result.setResult(one.getAppId());
+                result.setSuccess(true);
+            } else {
+                result.setSuccess(false);
+            }
+
+
+        } catch (Exception e) {
+            e.printStackTrace();
+            result.setSuccess(false);
+            result.setMessage(e.getMessage());
+        }
+        return result;
+    }
+
+
 }

+ 1 - 0
module-kuaishou/src/main/java/cn/com/ctop/kuaishou/modules/batch/entity/KuaiShouVideoGet.java

@@ -96,4 +96,5 @@ public class KuaiShouVideoGet {
 
 
     private Integer channelType;
+    private Integer status;
 }

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

@@ -137,5 +137,5 @@ public interface IBatchService {
      * @param unitId
      * @param copyUnitId
      */
-    void copyCreative(Long accountId, Long unitId, Long copyUnitId) throws Exception;
+    void copyCreative(Long accountId, Long unitId, Long copyUnitId,JSONObject appJson) throws Exception;
 }

+ 14 - 3
module-kuaishou/src/main/java/cn/com/ctop/kuaishou/modules/batch/service/IKuaishouInterfaceService.java

@@ -299,9 +299,9 @@ public interface IKuaishouInterfaceService {
      * 获取视频列表
      *
      * @param token
-     * @param statDate
+     * @param
      */
-    void getVideoList(CtopOauthToken token, String statDate);
+    void getVideoList(CtopOauthToken token, String startDate, String endDate);
 
 
     /**
@@ -458,7 +458,7 @@ public interface IKuaishouInterfaceService {
      * @param accountId
      * @param page
      */
-    void getSuZaoList(String token, Long accountId, int page, String startDate,String endDate);
+    void getSuZaoList(String token, Long accountId, int page, String startDate, String endDate);
 
     /**
      * 异步获取创意信息
@@ -489,6 +489,17 @@ public interface IKuaishouInterfaceService {
      * @return
      */
     JSONArray getCreativeWord(Long accountId, String accessToken);
+
+
+    /**
+     * 获取下载页id
+     *
+     * @param accountId
+     * @param appId
+     * @param viewComp
+     * @return
+     */
+    JSONArray getPageList(Long accountId, String token, Long appId, String viewComp);
 }
 
 

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

@@ -420,7 +420,8 @@ public class BatchServiceImpl implements IBatchService {
                                     @Override
                                     public void run() {
                                         try {
-                                            copyCreative(oauthToken.getAccountId(), unitId, copyUnitId);
+                                            JSONObject appJson = requestJson.getJSONObject("appJson"); // 是否修改应用
+                                            copyCreative(oauthToken.getAccountId(), unitId, copyUnitId, appJson);
                                         } catch (Exception e) {
                                             e.printStackTrace();
                                         }
@@ -649,11 +650,8 @@ public class BatchServiceImpl implements IBatchService {
                 throw new Exception("请输入需要创建的广告组");
             }
 
-
-            // 创建条数
-
-            JSONArray successArr = new JSONArray();
-            JSONArray failArr = new JSONArray();
+            // 是否修改应用
+            JSONObject appJson = requestJson.getJSONObject("appJson");
 
             if (!Check.isNull(groupJson)) {
 
@@ -705,7 +703,7 @@ public class BatchServiceImpl implements IBatchService {
                                     @Override
                                     public void run() {
                                         try {
-                                            copyCreative(oauthToken.getAccountId(), unitId, copyUnitId);
+                                            copyCreative(oauthToken.getAccountId(), unitId, copyUnitId, appJson);
                                         } catch (Exception e) {
                                             e.printStackTrace();
                                         }
@@ -978,7 +976,7 @@ public class BatchServiceImpl implements IBatchService {
                             @Override
                             public void run() {
                                 try {
-                                    copyCreative(group.getAccountId(), copyUnitId, group.getUnitId());
+                                    copyCreative(group.getAccountId(), copyUnitId, group.getUnitId(), null);
                                 } catch (Exception e) {
                                     e.printStackTrace();
                                 }
@@ -1014,7 +1012,7 @@ public class BatchServiceImpl implements IBatchService {
      * @param unitId
      */
     @Override
-    public void copyCreative(Long accountId, Long unitId, Long copyUnitId) throws Exception {
+    public void copyCreative(Long accountId, Long unitId, Long copyUnitId, JSONObject appJson) throws Exception {
         // 查询当前复制组下的所有非程序化创意
 
         QueryWrapper<KuaiShouCreative> queryWrapper = new QueryWrapper<>();
@@ -1062,10 +1060,26 @@ public class BatchServiceImpl implements IBatchService {
                 if (!Check.isNull(creative.getOverlayType())) {
                     creativeJson.put("overlay_type", creative.getOverlayType());
                 }
+
+                // 是否修改应用
+                if (!Check.isNull(appJson)) {
+                    Boolean isUpdate = appJson.getBoolean("isUpdate");
+                    if (isUpdate) {
+                        if (!Check.isNull(appJson.getLong("siteId"))) {
+                            creativeJson.put("site_id", appJson.getLong("siteId"));
+                        }
+                    } else {
+                        if (!Check.isNull(creative.getSiteId())) {
+                            creativeJson.put("site_id", creative.getSiteId());
+                        }
+                    }
+                } else {
+                    if (!Check.isNull(creative.getSiteId())) {
+                        creativeJson.put("site_id", creative.getSiteId());
+                    }
+                }
+
                 // 安卓下载中间页
-                /*if (!Check.isNull(creative.getSiteId())) {
-                    creativeJson.put("site_id", creative.getSiteId());
-                }*/
 
 
                 Map<String, Object> returnCreativeMap = kuaishouInterfaceService.creativeCreate(oauthToken.getAccessToken(), accountId, creativeJson, 1);
@@ -1145,10 +1159,14 @@ public class BatchServiceImpl implements IBatchService {
         }
         String action_bar_text = requestJson.getString("actionBarText");
         String click_track_url = requestJson.getString("clickTrackUrl");
+        String site_id = requestJson.getString("siteId");
         JSONObject returnJson = new JSONObject();
         JSONArray successArr = new JSONArray();
         JSONArray failArr = new JSONArray();
         JSONArray dataJsons = requestJson.getJSONArray("dataJson");
+
+        Integer content = requestJson.getInteger("content");
+
         if (!Check.isNull(dataJsons)) {
             for (int i = 0; i < dataJsons.size(); i++) {
                 JSONObject dataJson = dataJsons.getJSONObject(i);
@@ -1160,13 +1178,16 @@ public class BatchServiceImpl implements IBatchService {
                         for (int j = 0; j < imageArr.size(); j++) {
                             JSONObject imageJson = imageArr.getJSONObject(j);
                             if (!Check.isNull(imageJson)) {
-                                String name = imageJson.getString("name");
+                                content += 1;
+                                String name = imageJson.getString("name") + content;
                                 creativeJson.put("action_bar_text", action_bar_text);
                                 creativeJson.put("description", description);
                                 creativeJson.put("creative_name", name);
                                 creativeJson.put("photo_id", photo_id);
                                 creativeJson.put("click_track_url", click_track_url);
-
+                                if (!Check.isNull(site_id)) {
+                                    creativeJson.put("site_id", site_id);
+                                }
                                 String imageToken = null;
                                 String signature = imageJson.getString("signature");
                                 if (!Check.isNull(signature)) {

+ 51 - 59
module-kuaishou/src/main/java/cn/com/ctop/kuaishou/modules/batch/service/impl/KuaiShouVideoGetServiceImpl.java

@@ -12,6 +12,7 @@ import com.alibaba.fastjson.JSONArray;
 import com.alibaba.fastjson.JSONObject;
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 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.Value;
 import org.springframework.stereotype.Service;
@@ -29,6 +30,7 @@ import java.util.concurrent.Executors;
  * @Date: 2019-07-25
  * @Version: V1.0
  */
+@Slf4j
 @Service
 public class KuaiShouVideoGetServiceImpl extends ServiceImpl<KuaiShouVideoGetMapper, KuaiShouVideoGet> implements IKuaiShouVideoGetService {
     @Autowired
@@ -52,72 +54,62 @@ public class KuaiShouVideoGetServiceImpl extends ServiceImpl<KuaiShouVideoGetMap
      * @param
      */
     @Override
-    public void getKeyFrame(String token, Long accountId, String md5, String photoId) {
+    public void getKeyFrame(String token, Long accountId, String videoMd5, String photoId) {
         try {
-     /*       QueryWrapper<KuaiShouVideoGet> videoGetQueryWrapper = new QueryWrapper<>();
-            videoGetQueryWrapper.eq("account_id", token.getAccountId());
-            videoGetQueryWrapper.eq("channel_type", 1);
-            List<KuaiShouVideoGet> kuaiShouVideoGets = videoGetMapper.selectList(videoGetQueryWrapper);
-            if (Check.isNull(kuaiShouVideoGets)) {
+            if (Check.isNull(videoMd5)) {
                 return;
-            }*/
-            //   for (KuaiShouVideoGet videoGet : kuaiShouVideoGets) {
-            synchronized (this) {
-                QueryWrapper<MaterialCutFrame> cutFrameQueryWrapper = new QueryWrapper<>();
-                cutFrameQueryWrapper.eq("video_signature", md5);
-                cutFrameQueryWrapper.last("limit 1");
-                MaterialCutFrame one = materialCutFrameService.getOne(cutFrameQueryWrapper);
-                if (!Check.isNull(one)) {
-                    return;
-                }
-                executorService.submit(new Runnable() {
-                    @Override
-                    public void run() {
-                        String url = "https://ad.e.kuaishou.com/rest/openapi/v1/tool/key_frame";
-                        JSONArray photoArr = new JSONArray();
-                        photoArr.add(photoId);
-                        Map<String, String> headers = new HashMap<>();
-                        headers.put("Access-Token", token);
-                        headers.put("Content-Type", "application/json");
-                        JSONObject requestJson = new JSONObject();
-                        requestJson.put("advertiser_id", accountId);
-                        requestJson.put("photo_ids", photoArr);
-                        String result = HttpUtils.kuaiShouhttpPostRequest(url, requestJson.toJSONString(), headers);
-                        JSONObject resultJson = JSONObject.parseObject(result);
-                        if (!Check.isNull(resultJson)) {
-                            Integer code = resultJson.getInteger("code");
-                            if (code == 0) {
-                                JSONArray dataArr = resultJson.getJSONArray("data");
-                                if (!Check.isNull(dataArr)) {
-                                    for (int i = 0; i < dataArr.size(); i++) {
-                                        String imageUrl = dataArr.getString(i);
-                                        String localPath = LoadFileUtil.downLoadFromUrl(imageUrl, downloadUrl);
-                                        String md5 = null;
-                                        try {
-                                            md5 = LoadFileUtil.getMD5(localPath);
-                                        } catch (IOException e) {
-                                            e.printStackTrace();
-                                            continue;
-                                        }
-                                        Map<String, Object> deleteMap = new HashMap<>();
-                                        deleteMap.put("video_signature", md5);
-                                        deleteMap.put("signature", md5);
-                                        materialCutFrameService.removeByMap(deleteMap);
-                                        MaterialCutFrame materialCutFrame = new MaterialCutFrame();
-                                        materialCutFrame.setImageIndex(i);
-                                        materialCutFrame.setVideoSignature(md5);
-                                        materialCutFrame.setUrl(imageUrl);
-                                        materialCutFrame.setSignature(md5);
-                                        materialCutFrameService.save(materialCutFrame);
-                                        LoadFileUtil.delFile(localPath);
-                                    }
-                                }
+            }
+            QueryWrapper<MaterialCutFrame> cutFrameQueryWrapper = new QueryWrapper<>();
+            cutFrameQueryWrapper.eq("video_signature", videoMd5);
+            cutFrameQueryWrapper.last("limit 1");
+            MaterialCutFrame one = materialCutFrameService.getOne(cutFrameQueryWrapper);
+            if (!Check.isNull(one)) {
+                return;
+            }
+            log.info("开始视频抽帧,md5:{}", videoMd5);
+            String url = "https://ad.e.kuaishou.com/rest/openapi/v1/tool/key_frame";
+            JSONArray photoArr = new JSONArray();
+            photoArr.add(photoId);
+            Map<String, String> headers = new HashMap<>();
+            headers.put("Access-Token", token);
+            headers.put("Content-Type", "application/json");
+            JSONObject requestJson = new JSONObject();
+            requestJson.put("advertiser_id", accountId);
+            requestJson.put("photo_ids", photoArr);
+            String result = HttpUtils.kuaiShouhttpPostRequest(url, requestJson.toJSONString(), headers);
+            JSONObject resultJson = JSONObject.parseObject(result);
+            if (!Check.isNull(resultJson)) {
+                Integer code = resultJson.getInteger("code");
+                if (code == 0) {
+                    JSONArray dataArr = resultJson.getJSONArray("data");
+                    if (!Check.isNull(dataArr)) {
+                        for (int i = 0; i < dataArr.size(); i++) {
+                            String imageUrl = dataArr.getString(i);
+                            String localPath = LoadFileUtil.downLoadFromUrl(imageUrl, downloadUrl);
+                            String md5 = null;
+                            try {
+                                md5 = LoadFileUtil.getMD5(localPath);
+                            } catch (IOException e) {
+                                e.printStackTrace();
+                                continue;
                             }
+                            Map<String, Object> deleteMap = new HashMap<>();
+                            deleteMap.put("video_signature", videoMd5);
+                            deleteMap.put("signature", md5);
+                            materialCutFrameService.removeByMap(deleteMap);
+                            MaterialCutFrame materialCutFrame = new MaterialCutFrame();
+                            materialCutFrame.setImageIndex(i);
+                            materialCutFrame.setVideoSignature(videoMd5);
+                            materialCutFrame.setUrl(imageUrl);
+                            materialCutFrame.setSignature(md5);
+                            materialCutFrameService.save(materialCutFrame);
+                            LoadFileUtil.delFile(localPath);
                         }
                     }
-                });
+                }
             }
 
+
             // }
 
         } catch (Exception e) {

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

@@ -17,6 +17,7 @@ import cn.com.ctop.kuaishou.modules.report.entity.*;
 import cn.com.ctop.kuaishou.modules.report.mapper.KuaishouReportDailyAccountMapper;
 import cn.com.ctop.kuaishou.modules.report.mapper.KuaishouReportDailyCampaignMapper;
 import cn.com.ctop.kuaishou.modules.report.service.*;
+import com.alibaba.fastjson.JSON;
 import com.alibaba.fastjson.JSONArray;
 import com.alibaba.fastjson.JSONObject;
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
@@ -181,11 +182,11 @@ public class KuaishouInterfaceServiceImpl implements IKuaishouInterfaceService {
 
 
     @Override
-    public void getVideoList(CtopOauthToken token, String statDate) {
-        getVideoListByPage(token, statDate, 1);
+    public void getVideoList(CtopOauthToken token, String startDate, String endDate) {
+        getVideoListByPage(token, startDate, endDate, 1);
     }
 
-    private void getVideoListByPage(CtopOauthToken token, String statDate, int page) {
+    private void getVideoListByPage(CtopOauthToken token, String startDate, String endDate, int page) {
         try {
             log.info("获取视频数据,accountId:{}", token.getAccountId());
             String url = PropertiesUtils.getConfig("kuaishou_api_url") + KuaishouInterfaceConstant.VIDEO_LIST;
@@ -196,9 +197,9 @@ public class KuaishouInterfaceServiceImpl implements IKuaishouInterfaceService {
             param.put("advertiser_id", token.getAccountId());
             param.put("page_size", 500);
             param.put("page", page);
-            if (!Check.isNull(statDate)) {
-                param.put("start_date", statDate);
-                param.put("end_date", statDate);
+            if (!Check.isNull(startDate) && !Check.isNull(endDate)) {
+                param.put("start_date", startDate);
+                param.put("end_date", endDate);
             }
             String result = HttpUtils.httpPostRequest(url, param, headers);
             JSONObject resultJson = JSONObject.parseObject(result);
@@ -223,15 +224,24 @@ public class KuaishouInterfaceServiceImpl implements IKuaishouInterfaceService {
                 kuaiShouVideoGet.setId(token.getAccountId() + kuaiShouVideoGet.getPhotoId());
 
                 kuaiShouVideoGet.setAccountId(token.getAccountId());
-                kuaiShouVideoGet.setStatDate(DateUtils.parseDate(statDate, "yyyy-MM-dd"));
+                kuaiShouVideoGet.setStatDate(detailJson.getDate("upload_time"));
                 kuaiShouVideoGet.setUpdateTime(new Date());
                 Integer type = MaterialEnum.getTypeBySize(kuaiShouVideoGet.getWidth(), kuaiShouVideoGet.getHeight());
                 if (!Check.isNull(type)) {
                     kuaiShouVideoGet.setMaterialType(type);
                 }
                 kuaiShouVideoGetService.saveOrUpdate(kuaiShouVideoGet);
+
+                Thread thread = new Thread() {
+                    @Override
+                    public void run() {
+                        videoGetService.getKeyFrame(token.getAccessToken(), token.getAccountId(), kuaiShouVideoGet.getSignature(), kuaiShouVideoGet.getPhotoId());
+                    }
+                };
+                thread.start();
+
             }
-            getVideoListByPage(token, statDate, page + 1);
+            getVideoListByPage(token, startDate, endDate, page + 1);
         } catch (Exception e) {
             e.printStackTrace();
         }
@@ -285,17 +295,9 @@ public class KuaishouInterfaceServiceImpl implements IKuaishouInterfaceService {
                 detailJson.put("photo_comment", detailJson.getString("comment"));
                 detailJson.put("photo_like", detailJson.getString("like"));
                 detailJson.put("photo_show", detailJson.getString("show"));
-                detailJson.remove("share");
-                detailJson.remove("comment");
-                detailJson.remove("like");
-                detailJson.remove("show");
-                detailJson.remove("adScene");
-                detailJson.remove("stat_hour");
-                detailJson.remove("event_valid_clues");
-                detailJson.remove("event_valid_clues_cost");
-                KuaishouReportDailyAccount kuaishouReportDailyAccount = JsonUtil.jsonToObj(detailJson, KuaishouReportDailyAccount.class);
-                kuaishouReportDailyAccount.setAccountId(token.getAccountId());
-                dailyAccountMapper.insertSelective(kuaishouReportDailyAccount);
+                var KuaishouReportDailyAccount = JSONObject.toJavaObject(detailJson, KuaishouReportDailyAccount.class);
+                KuaishouReportDailyAccount.setAccountId(token.getAccountId());
+                dailyAccountMapper.insertSelective(KuaishouReportDailyAccount);
             }
         }
         getAccountDailyReportByPage(token, startDate, endDate, page + 1);
@@ -902,7 +904,8 @@ public class KuaishouInterfaceServiceImpl implements IKuaishouInterfaceService {
         String startDate = DateUtils.addMonth(endDateStr, -6);
 
         historyReportTaskService.createTask(token.getAccountId(), token.getAccessToken(), startDate, endDateStr, CtopAdConstant.KUAISHOU_LOAD_JOB_TYPE_HISTORY);
-
+        getVideoList(token, null, null);
+        getSuZaoList(token.getAccessToken(), token.getAccountId(), 1, null, null);
         String nowDate = DateUtils.getNowDate("yyyy-MM-dd");
         String videoEndDate = DateUtils.addDay(nowDate, -180);
         SimpleDateFormat simpleDateFormat = new SimpleDateFormat("yyyy-MM-dd");
@@ -911,7 +914,6 @@ public class KuaishouInterfaceServiceImpl implements IKuaishouInterfaceService {
         List<Date> dates = DateUtils.findDates(start, end);
         for (int i = 0; i < dates.size(); i++) {
             String formatDate = simpleDateFormat.format(dates.get(i));
-            getVideoList(token, formatDate);
             getImageList(token, formatDate);
         }
 
@@ -2868,7 +2870,7 @@ public class KuaishouInterfaceServiceImpl implements IKuaishouInterfaceService {
         param.put("advertiser_id", accountId);
         param.put("page", page);
         param.put("page_size", 200);
-        if (!Check.isNull(startDate) && !Check.isNull(startDate)) {
+        if (!Check.isNull(startDate) && !Check.isNull(endDate)) {
             param.put("start_date", startDate);
             param.put("end_date", endDate);
         }
@@ -2891,7 +2893,7 @@ public class KuaishouInterfaceServiceImpl implements IKuaishouInterfaceService {
                 if (!Check.isNull(jsonObject)) {
                     KuaiShouVideoGet kuaiShouVideoGet = new KuaiShouVideoGet();
                     Long photo_id = jsonObject.getLong("photo_id");
-                    kuaiShouVideoGet.setId(accountId + photo_id + "");
+                    kuaiShouVideoGet.setId(String.valueOf(accountId) + String.valueOf(photo_id));
                     kuaiShouVideoGet.setPhotoId(String.valueOf(photo_id));
                     kuaiShouVideoGet.setUrl(jsonObject.getString("watermark_url"));
                     kuaiShouVideoGet.setWidth(jsonObject.getInteger("width"));
@@ -2914,6 +2916,8 @@ public class KuaishouInterfaceServiceImpl implements IKuaishouInterfaceService {
                         }
                     };
                     thread.start();
+
+
                 }
             }
         }
@@ -3116,4 +3120,73 @@ public class KuaishouInterfaceServiceImpl implements IKuaishouInterfaceService {
         return null;
     }
 
+
+    /**
+     * 下载页
+     *
+     * @param accountId
+     * @param appId
+     * @param viewComp
+     * @return
+     */
+    @Override
+    public JSONArray getPageList(Long accountId, String token, Long appId, String viewComp) {
+        JSONArray returnArr = new JSONArray();
+        try {
+            String url = PropertiesUtils.getConfig("kuaishou_api_url") + KuaishouInterfaceConstant.PAGE_LIST;
+            Map<String, String> headers = new HashMap<>();
+            headers.put("Content-Type", "application/json");
+            headers.put("Access-Token", token);
+            Map<String, Object> param = new HashMap<>();
+            JSONArray viewComps = new JSONArray();
+            viewComps.add(viewComp);
+            param.put("advertiser_id", accountId);
+            param.put("page_size", 500);
+            String result = HttpUtils.httpPostRequest(url, param, headers);
+            JSONObject resultJson = JSON.parseObject(result);
+            if (!Check.isNull(resultJson)) {
+                Integer code = resultJson.getInteger("code");
+                if (code == 0) {
+                    JSONObject dataJson = resultJson.getJSONObject("data");
+                    if (!Check.isNull(dataJson)) {
+                        JSONArray details = dataJson.getJSONArray("details");
+                        if (!Check.isNull(details)) {
+                            for (int i = 0; i < details.size(); i++) {
+                                JSONObject jsonObject = details.getJSONObject(i);
+                                if (!Check.isNull(jsonObject)) {
+                                    JSONArray compsArr = jsonObject.getJSONArray("comps");
+                                    if (!Check.isNull(compsArr)) {
+                                        for (int j = 0; j < compsArr.size(); j++) {
+                                            JSONObject compJson = compsArr.getJSONObject(j);
+                                            if (!Check.isNull(compJson)) {
+                                                Integer type = compJson.getInteger("type");
+                                                if (type == 7) {
+                                                    JSONObject props = compJson.getJSONObject("props");
+                                                    if (!Check.isNull(props)) {
+                                                        Long returnAppId = props.getLong("appId");
+                                                        if (returnAppId.equals(appId)) {
+                                                            JSONObject returnJson = new JSONObject();
+                                                            returnJson.put("siteId", jsonObject.getString("id"));
+                                                            returnJson.put("name", jsonObject.getString("name"));
+                                                            returnJson.put("appId", returnAppId);
+                                                            returnArr.add(returnJson);
+                                                        }
+                                                    }
+                                                }
+                                            }
+                                        }
+                                    }
+                                }
+                            }
+                        }
+                    }
+                }
+            }
+        } catch (Exception e) {
+
+            e.printStackTrace();
+        }
+        return returnArr;
+    }
+
 }

+ 2 - 2
module-kuaishou/src/main/java/cn/com/ctop/kuaishou/modules/material/service/impl/KuaishouBidWarningServiceImpl.java

@@ -15,14 +15,15 @@ import cn.com.ctop.kuaishou.modules.material.service.IKuaishouBidWarningService;
 import cn.com.feishu.provider.MessageProvider;
 import com.alibaba.fastjson.JSON;
 import com.alibaba.fastjson.JSONArray;
-import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.xxl.job.core.log.XxlJobLogger;
 import org.jeecg.common.util.DateUtils;
 import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Service;
 
 import java.util.ArrayList;
 import java.util.List;
 
+@Service
 public class KuaishouBidWarningServiceImpl implements IKuaishouBidWarningService {
     @Autowired
     private IProjectService projectService;
@@ -43,7 +44,6 @@ public class KuaishouBidWarningServiceImpl implements IKuaishouBidWarningService
         XxlJobLogger.log("快手出价预警定时任务开始");
         long start = System.currentTimeMillis();
         try {
-            QueryWrapper<Project> projectQueryWrapper = new QueryWrapper<>();
             List<Project> projects = projectService.list();
             if (Check.isNull(projects)) {
                 return;

+ 259 - 0
module-toutiao/src/main/java/cn/com/ctop/toutiao/modules/batch/controller/BytedanceAreaInfoController.java

@@ -0,0 +1,259 @@
+package cn.com.ctop.toutiao.modules.batch.controller;
+
+import cn.com.ctop.toutiao.modules.batch.entity.BytedanceAreaInfo;
+import cn.com.ctop.toutiao.modules.batch.service.IBytedanceAreaInfoService;
+import com.alibaba.fastjson.JSON;
+import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
+import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiOperation;
+import lombok.extern.slf4j.Slf4j;
+import org.jeecg.common.api.vo.Result;
+import org.jeecg.common.aspect.annotation.AutoLog;
+import org.jeecg.common.system.query.QueryGenerator;
+import org.jeecg.common.util.oConvertUtils;
+import org.jeecgframework.poi.excel.ExcelImportUtil;
+import org.jeecgframework.poi.excel.def.NormalExcelConstants;
+import org.jeecgframework.poi.excel.entity.ExportParams;
+import org.jeecgframework.poi.excel.entity.ImportParams;
+import org.jeecgframework.poi.excel.view.JeecgEntityExcelView;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.web.bind.annotation.*;
+import org.springframework.web.multipart.MultipartFile;
+import org.springframework.web.multipart.MultipartHttpServletRequest;
+import org.springframework.web.servlet.ModelAndView;
+
+import javax.servlet.http.HttpServletRequest;
+import javax.servlet.http.HttpServletResponse;
+import java.io.IOException;
+import java.io.UnsupportedEncodingException;
+import java.net.URLDecoder;
+import java.util.ArrayList;
+import java.util.Arrays;
+import java.util.List;
+import java.util.Map;
+
+/**
+ * 省市县信息
+ *
+ * @author jeecg-boot
+ * @version V1.0
+ * @date 2019-09-17
+ */
+@Slf4j
+@Api(tags = "省市县信息")
+@RestController
+@RequestMapping("/ctop/bytedanceAreaInfo")
+public class BytedanceAreaInfoController {
+    @Autowired
+    private IBytedanceAreaInfoService bytedanceAreaInfoService;
+
+    /**
+     * 分页列表查询
+     *
+     * @param bytedanceAreaInfo
+     * @param pageNo
+     * @param pageSize
+     * @param req
+     * @return
+     */
+    @AutoLog(value = "省市县信息-分页列表查询")
+    @ApiOperation(value = "省市县信息-分页列表查询", notes = "省市县信息-分页列表查询")
+    @GetMapping(value = "/list")
+    public Result<IPage<BytedanceAreaInfo>> queryPageList(BytedanceAreaInfo bytedanceAreaInfo,
+                                                          @RequestParam(name = "pageNo", defaultValue = "1") Integer pageNo,
+                                                          @RequestParam(name = "pageSize", defaultValue = "1000") Integer pageSize,
+                                                          HttpServletRequest req) {
+        Result<IPage<BytedanceAreaInfo>> result = new Result<>();
+        QueryWrapper<BytedanceAreaInfo> queryWrapper = QueryGenerator.initQueryWrapper(bytedanceAreaInfo, req.getParameterMap());
+        Page<BytedanceAreaInfo> page = new Page<>(pageNo, pageSize);
+        IPage<BytedanceAreaInfo> pageList = bytedanceAreaInfoService.page(page, queryWrapper);
+        List<BytedanceAreaInfo> areaInfos = pageList.getRecords();
+        if(null!=areaInfos&&!areaInfos.isEmpty()){
+            List<BytedanceAreaInfo>setAreas = new ArrayList<>();
+            areaInfos.forEach(areaInfo->{
+                boolean hasChild = bytedanceAreaInfoService.hasChild(areaInfo);
+                areaInfo.setHasChild(hasChild);
+                setAreas.add(areaInfo);
+            });
+            pageList.setRecords(setAreas);
+        }
+        result.setSuccess(true);
+        result.setResult(pageList);
+        return result;
+    }
+
+    /**
+     * 添加
+     *
+     * @param bytedanceAreaInfo
+     * @return
+     */
+    @AutoLog(value = "省市县信息-添加")
+    @ApiOperation(value = "省市县信息-添加", notes = "省市县信息-添加")
+    @PostMapping(value = "/add")
+    public Result<BytedanceAreaInfo> add(@RequestBody BytedanceAreaInfo bytedanceAreaInfo) {
+        Result<BytedanceAreaInfo> result = new Result<BytedanceAreaInfo>();
+        try {
+            bytedanceAreaInfoService.save(bytedanceAreaInfo);
+            result.success("添加成功!");
+        } catch (Exception e) {
+            log.error(e.getMessage(), e);
+            result.error500("操作失败");
+        }
+        return result;
+    }
+
+    /**
+     * 编辑
+     *
+     * @param bytedanceAreaInfo
+     * @return
+     */
+    @AutoLog(value = "省市县信息-编辑")
+    @ApiOperation(value = "省市县信息-编辑", notes = "省市县信息-编辑")
+    @PutMapping(value = "/edit")
+    public Result<BytedanceAreaInfo> edit(@RequestBody BytedanceAreaInfo bytedanceAreaInfo) {
+        Result<BytedanceAreaInfo> result = new Result<BytedanceAreaInfo>();
+        BytedanceAreaInfo bytedanceAreaInfoEntity = bytedanceAreaInfoService.getById(bytedanceAreaInfo.getId());
+        if (bytedanceAreaInfoEntity == null) {
+            result.error500("未找到对应实体");
+        } else {
+            boolean ok = bytedanceAreaInfoService.updateById(bytedanceAreaInfo);
+            if (ok) {
+                result.success("修改成功!");
+            }
+        }
+
+        return result;
+    }
+
+    /**
+     * 通过id删除
+     *
+     * @param id
+     * @return
+     */
+    @AutoLog(value = "省市县信息-通过id删除")
+    @ApiOperation(value = "省市县信息-通过id删除", notes = "省市县信息-通过id删除")
+    @DeleteMapping(value = "/delete")
+    public Result<?> delete(@RequestParam(name = "id", required = true) String id) {
+        try {
+            bytedanceAreaInfoService.removeById(id);
+        } catch (Exception e) {
+            log.error("删除失败", e.getMessage());
+            return Result.error("删除失败!");
+        }
+        return Result.ok("删除成功!");
+    }
+
+    /**
+     * 批量删除
+     *
+     * @param ids
+     * @return
+     */
+    @AutoLog(value = "省市县信息-批量删除")
+    @ApiOperation(value = "省市县信息-批量删除", notes = "省市县信息-批量删除")
+    @DeleteMapping(value = "/deleteBatch")
+    public Result<BytedanceAreaInfo> deleteBatch(@RequestParam(name = "ids", required = true) String ids) {
+        Result<BytedanceAreaInfo> result = new Result<BytedanceAreaInfo>();
+        if (ids == null || "".equals(ids.trim())) {
+            result.error500("参数不识别!");
+        } else {
+            this.bytedanceAreaInfoService.removeByIds(Arrays.asList(ids.split(",")));
+            result.success("删除成功!");
+        }
+        return result;
+    }
+
+    /**
+     * 通过id查询
+     *
+     * @param id
+     * @return
+     */
+    @AutoLog(value = "省市县信息-通过id查询")
+    @ApiOperation(value = "省市县信息-通过id查询", notes = "省市县信息-通过id查询")
+    @GetMapping(value = "/queryById")
+    public Result<BytedanceAreaInfo> queryById(@RequestParam(name = "id", required = true) String id) {
+        Result<BytedanceAreaInfo> result = new Result<BytedanceAreaInfo>();
+        BytedanceAreaInfo bytedanceAreaInfo = bytedanceAreaInfoService.getById(id);
+        if (bytedanceAreaInfo == null) {
+            result.error500("未找到对应实体");
+        } else {
+            result.setResult(bytedanceAreaInfo);
+            result.setSuccess(true);
+        }
+        return result;
+    }
+
+    /**
+     * 导出excel
+     *
+     * @param request
+     * @param response
+     */
+    @RequestMapping(value = "/exportXls")
+    public ModelAndView exportXls(HttpServletRequest request, HttpServletResponse response) {
+        // Step.1 组装查询条件
+        QueryWrapper<BytedanceAreaInfo> queryWrapper = null;
+        try {
+            String paramsStr = request.getParameter("paramsStr");
+            if (oConvertUtils.isNotEmpty(paramsStr)) {
+                String deString = URLDecoder.decode(paramsStr, "UTF-8");
+                BytedanceAreaInfo bytedanceAreaInfo = JSON.parseObject(deString, BytedanceAreaInfo.class);
+                queryWrapper = QueryGenerator.initQueryWrapper(bytedanceAreaInfo, request.getParameterMap());
+            }
+        } catch (UnsupportedEncodingException e) {
+            e.printStackTrace();
+        }
+
+        //Step.2 AutoPoi 导出Excel
+        ModelAndView mv = new ModelAndView(new JeecgEntityExcelView());
+        List<BytedanceAreaInfo> pageList = bytedanceAreaInfoService.list(queryWrapper);
+        //导出文件名称
+        mv.addObject(NormalExcelConstants.FILE_NAME, "省市县信息列表");
+        mv.addObject(NormalExcelConstants.CLASS, BytedanceAreaInfo.class);
+        mv.addObject(NormalExcelConstants.PARAMS, new ExportParams("省市县信息列表数据", "导出人:Jeecg", "导出信息"));
+        mv.addObject(NormalExcelConstants.DATA_LIST, pageList);
+        return mv;
+    }
+
+    /**
+     * 通过excel导入数据
+     *
+     * @param request
+     * @param response
+     * @return
+     */
+    @RequestMapping(value = "/importExcel", method = RequestMethod.POST)
+    public Result<?> importExcel(HttpServletRequest request, HttpServletResponse response) {
+        MultipartHttpServletRequest multipartRequest = (MultipartHttpServletRequest) request;
+        Map<String, MultipartFile> fileMap = multipartRequest.getFileMap();
+        for (Map.Entry<String, MultipartFile> entity : fileMap.entrySet()) {
+            MultipartFile file = entity.getValue();
+            ImportParams params = new ImportParams();
+            params.setTitleRows(2);
+            params.setHeadRows(1);
+            params.setNeedSave(true);
+            try {
+                List<BytedanceAreaInfo> listBytedanceAreaInfos = ExcelImportUtil.importExcel(file.getInputStream(), BytedanceAreaInfo.class, params);
+                bytedanceAreaInfoService.saveBatch(listBytedanceAreaInfos);
+                return Result.ok("文件导入成功!数据行数:" + listBytedanceAreaInfos.size());
+            } catch (Exception e) {
+                log.error(e.getMessage(), e);
+                return Result.error("文件导入失败:" + e.getMessage());
+            } finally {
+                try {
+                    file.getInputStream().close();
+                } catch (IOException e) {
+                    e.printStackTrace();
+                }
+            }
+        }
+        return Result.ok("文件导入失败!");
+    }
+
+}

+ 171 - 0
module-toutiao/src/main/java/cn/com/ctop/toutiao/modules/batch/controller/BytedanceInterestCategoryController.java

@@ -0,0 +1,171 @@
+package cn.com.ctop.toutiao.modules.batch.controller;
+
+import cn.com.ctop.toutiao.modules.batch.entity.BytedanceInterestCategory;
+import cn.com.ctop.toutiao.modules.batch.service.IBytedanceInterestCategoryService;
+import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
+import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import io.swagger.annotations.ApiOperation;
+import lombok.extern.slf4j.Slf4j;
+import org.jeecg.common.api.vo.Result;
+import org.jeecg.common.aspect.annotation.AutoLog;
+import org.jeecg.common.system.query.QueryGenerator;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.web.bind.annotation.*;
+
+import javax.servlet.http.HttpServletRequest;
+import java.util.Arrays;
+
+@RestController
+@Slf4j
+public class BytedanceInterestCategoryController {
+    @Autowired
+    private IBytedanceInterestCategoryService bytedanceInterestCategoryService;
+
+    @GetMapping(value = "/listbycode")
+    public Result<IPage<BytedanceInterestCategory>> queryPageListByCode(@RequestParam(name = "parentCode", defaultValue = "0") String code,
+                                                                        @RequestParam(name = "pageNo", defaultValue = "1") Integer pageNo,
+                                                                        @RequestParam(name = "pageSize", defaultValue = "10") Integer pageSize,
+                                                                        HttpServletRequest req) {
+        Result<IPage<BytedanceInterestCategory>> result = new Result<>();
+        BytedanceInterestCategory category = new BytedanceInterestCategory();
+        QueryWrapper<BytedanceInterestCategory> queryWrapper = QueryGenerator.initQueryWrapper(category, req.getParameterMap());
+        queryWrapper.eq("parent_code", code);
+        Page<BytedanceInterestCategory> page = new Page<>(pageNo, pageSize);
+        IPage<BytedanceInterestCategory> pageList = bytedanceInterestCategoryService.page(page, queryWrapper);
+        result.setSuccess(true);
+        result.setResult(pageList);
+        return result;
+    }
+
+    /**
+     * 分页列表查询
+     *
+     * @param bytedanceInterestCategory
+     * @param pageNo
+     * @param pageSize
+     * @param req
+     * @return
+     */
+    @AutoLog(value = "兴趣分类信息-分页列表查询")
+    @ApiOperation(value = "兴趣分类信息-分页列表查询", notes = "兴趣分类信息-分页列表查询")
+    @GetMapping(value = "/list")
+    public Result<IPage<BytedanceInterestCategory>> queryPageList(BytedanceInterestCategory bytedanceInterestCategory,
+                                                                  @RequestParam(name = "pageNo", defaultValue = "1") Integer pageNo,
+                                                                  @RequestParam(name = "pageSize", defaultValue = "10") Integer pageSize,
+                                                                  HttpServletRequest req) {
+        Result<IPage<BytedanceInterestCategory>> result = new Result<>();
+        QueryWrapper<BytedanceInterestCategory> queryWrapper = QueryGenerator.initQueryWrapper(bytedanceInterestCategory, req.getParameterMap());
+        Page<BytedanceInterestCategory> page = new Page<>(pageNo, pageSize);
+        IPage<BytedanceInterestCategory> pageList = bytedanceInterestCategoryService.page(page, queryWrapper);
+        result.setSuccess(true);
+        result.setResult(pageList);
+        return result;
+    }
+
+    /**
+     * 添加
+     *
+     * @param bytedanceInterestCategory
+     * @return
+     */
+    @AutoLog(value = "兴趣分类信息-添加")
+    @ApiOperation(value = "兴趣分类信息-添加", notes = "兴趣分类信息-添加")
+    @PostMapping(value = "/add")
+    public Result<BytedanceInterestCategory> add(@RequestBody BytedanceInterestCategory bytedanceInterestCategory) {
+        Result<BytedanceInterestCategory> result = new Result<>();
+        try {
+            bytedanceInterestCategoryService.save(bytedanceInterestCategory);
+            result.success("添加成功!");
+        } catch (Exception e) {
+            log.error(e.getMessage(), e);
+            result.error500("操作失败");
+        }
+        return result;
+    }
+
+    /**
+     * 编辑
+     *
+     * @param bytedanceInterestCategory
+     * @return
+     */
+    @AutoLog(value = "兴趣分类信息-编辑")
+    @ApiOperation(value = "兴趣分类信息-编辑", notes = "兴趣分类信息-编辑")
+    @PutMapping(value = "/edit")
+    public Result<BytedanceInterestCategory> edit(@RequestBody BytedanceInterestCategory bytedanceInterestCategory) {
+        Result<BytedanceInterestCategory> result = new Result<>();
+        BytedanceInterestCategory bytedanceInterestCategoryEntity = bytedanceInterestCategoryService.getById(bytedanceInterestCategory.getId());
+        if (bytedanceInterestCategoryEntity == null) {
+            result.error500("未找到对应实体");
+        } else {
+            boolean ok = bytedanceInterestCategoryService.updateById(bytedanceInterestCategory);
+            if (ok) {
+                result.success("修改成功!");
+            }
+        }
+
+        return result;
+    }
+
+    /**
+     * 通过id删除
+     *
+     * @param id
+     * @return
+     */
+    @AutoLog(value = "兴趣分类信息-通过id删除")
+    @ApiOperation(value = "兴趣分类信息-通过id删除", notes = "兴趣分类信息-通过id删除")
+    @DeleteMapping(value = "/delete")
+    public Result<?> delete(@RequestParam(name = "id", required = true) String id) {
+        try {
+            bytedanceInterestCategoryService.removeById(id);
+        } catch (Exception e) {
+            log.error("删除失败", e.getMessage());
+            return Result.error("删除失败!");
+        }
+        return Result.ok("删除成功!");
+    }
+
+    /**
+     * 批量删除
+     *
+     * @param ids
+     * @return
+     */
+    @AutoLog(value = "兴趣分类信息-批量删除")
+    @ApiOperation(value = "兴趣分类信息-批量删除", notes = "兴趣分类信息-批量删除")
+    @DeleteMapping(value = "/deleteBatch")
+    public Result<BytedanceInterestCategory> deleteBatch(@RequestParam(name = "ids", required = true) String ids) {
+        Result<BytedanceInterestCategory> result = new Result<>();
+        if (ids == null || "".equals(ids.trim())) {
+            result.error500("参数不识别!");
+        } else {
+            this.bytedanceInterestCategoryService.removeByIds(Arrays.asList(ids.split(",")));
+            result.success("删除成功!");
+        }
+        return result;
+    }
+
+    /**
+     * 通过id查询
+     *
+     * @param id
+     * @return
+     */
+    @AutoLog(value = "兴趣分类信息-通过id查询")
+    @ApiOperation(value = "兴趣分类信息-通过id查询", notes = "兴趣分类信息-通过id查询")
+    @GetMapping(value = "/queryById")
+    public Result<BytedanceInterestCategory> queryById(@RequestParam(name = "id", required = true) String id) {
+        Result<BytedanceInterestCategory> result = new Result<>();
+        BytedanceInterestCategory bytedanceInterestCategory = bytedanceInterestCategoryService.getById(id);
+        if (bytedanceInterestCategory == null) {
+            result.error500("未找到对应实体");
+        } else {
+            result.setResult(bytedanceInterestCategory);
+            result.setSuccess(true);
+        }
+        return result;
+    }
+}
+

+ 72 - 0
module-toutiao/src/main/java/cn/com/ctop/toutiao/modules/batch/entity/BytedanceAreaInfo.java

@@ -0,0 +1,72 @@
+package cn.com.ctop.toutiao.modules.batch.entity;
+
+import com.baomidou.mybatisplus.annotation.IdType;
+import com.baomidou.mybatisplus.annotation.TableField;
+import com.baomidou.mybatisplus.annotation.TableId;
+import com.baomidou.mybatisplus.annotation.TableName;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+import lombok.experimental.Accessors;
+import org.jeecgframework.poi.excel.annotation.Excel;
+
+import java.util.Date;
+
+/**
+ * 省市县信息
+ *
+ * @author jeecg-boot
+ * @version V1.0
+ * @date 2019-09-17
+ */
+@Data
+@TableName("ctop_bytedance_area_info")
+@EqualsAndHashCode(callSuper = false)
+@Accessors(chain = true)
+@ApiModel(value = "ctop_bytedance_area_info对象", description = "省市县信息")
+public class BytedanceAreaInfo {
+    /**
+     * id
+     */
+    @TableId(type = IdType.UUID)
+    @ApiModelProperty(value = "id")
+    private Integer id;
+    /**
+     * name
+     */
+    @Excel(name = "name", width = 15)
+    @ApiModelProperty(value = "name")
+    private String name;
+    /**
+     * code
+     */
+    @Excel(name = "code", width = 15)
+    @ApiModelProperty(value = "code")
+    private String code;
+    /**
+     * parentCode
+     */
+    @Excel(name = "parentCode", width = 15)
+    @ApiModelProperty(value = "parentCode")
+    private String parentCode;
+    /**
+     * level
+     */
+    @Excel(name = "level", width = 15)
+    @ApiModelProperty(value = "level")
+    private Integer level;
+    /**
+     * createTime
+     */
+    @ApiModelProperty(value = "createTime")
+    private Date createTime;
+    /**
+     * updateTime
+     */
+    @ApiModelProperty(value = "updateTime")
+    private Date updateTime;
+
+    @TableField(exist = false)
+    private Boolean hasChild;
+}

+ 73 - 0
module-toutiao/src/main/java/cn/com/ctop/toutiao/modules/batch/entity/BytedanceInterestCategory.java

@@ -0,0 +1,73 @@
+package cn.com.ctop.toutiao.modules.batch.entity;
+
+import com.baomidou.mybatisplus.annotation.IdType;
+import com.baomidou.mybatisplus.annotation.TableField;
+import com.baomidou.mybatisplus.annotation.TableId;
+import com.baomidou.mybatisplus.annotation.TableName;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+import lombok.experimental.Accessors;
+import org.jeecgframework.poi.excel.annotation.Excel;
+
+import java.util.Date;
+
+/**
+ * 兴趣分类信息
+ *
+ * @author jeecg-boot
+ * @version V1.0
+ * @date 2019-09-18
+ */
+@Data
+@TableName("ctop_bytedance_interest_category")
+@EqualsAndHashCode(callSuper = false)
+@Accessors(chain = true)
+@ApiModel(value = "ctop_bytedance_interest_category对象", description = "兴趣分类信息")
+public class BytedanceInterestCategory {
+
+    /**
+     * id
+     */
+    @TableId(type = IdType.AUTO)
+    @ApiModelProperty(value = "id")
+    private Long id;
+    /**
+     * 名称
+     */
+    @Excel(name = "名称", width = 15)
+    @ApiModelProperty(value = "名称")
+    private String name;
+    /**
+     * code
+     */
+    @Excel(name = "code", width = 15)
+    @ApiModelProperty(value = "code")
+    private String code;
+    /**
+     * parentCode
+     */
+    @Excel(name = "parentCode", width = 15)
+    @ApiModelProperty(value = "parentCode")
+    private String parentCode;
+    /**
+     * level
+     */
+    @Excel(name = "level", width = 15)
+    @ApiModelProperty(value = "level")
+    private Integer level;
+    /**
+     * createTime
+     */
+    @ApiModelProperty(value = "createTime")
+    private Date createTime;
+    /**
+     * updateTime
+     */
+    @ApiModelProperty(value = "updateTime")
+    private Date updateTime;
+
+    @TableField(exist = false)
+    private Boolean hasChild;
+}

+ 15 - 0
module-toutiao/src/main/java/cn/com/ctop/toutiao/modules/batch/mapper/BytedanceAreaInfoMapper.java

@@ -0,0 +1,15 @@
+package cn.com.ctop.toutiao.modules.batch.mapper;
+
+import cn.com.ctop.toutiao.modules.batch.entity.BytedanceAreaInfo;
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+
+/**
+ * 省市县信息
+ *
+ * @author: jeecg-boot
+ * @date: 2019-09-17
+ * @cersion: V1.0
+ */
+public interface BytedanceAreaInfoMapper extends BaseMapper<BytedanceAreaInfo> {
+
+}

+ 7 - 0
module-toutiao/src/main/java/cn/com/ctop/toutiao/modules/batch/mapper/BytedanceInterestCategoryMapper.java

@@ -0,0 +1,7 @@
+package cn.com.ctop.toutiao.modules.batch.mapper;
+
+import cn.com.ctop.toutiao.modules.batch.entity.BytedanceInterestCategory;
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+
+public interface BytedanceInterestCategoryMapper extends BaseMapper<BytedanceInterestCategory> {
+}

+ 5 - 0
module-toutiao/src/main/java/cn/com/ctop/toutiao/modules/batch/mapper/xml/BytedanceAreaInfoMapper.xml

@@ -0,0 +1,5 @@
+<?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">
+<mapper namespace="cn.com.ctop.toutiao.modules.batch.mapper.BytedanceAreaInfoMapper">
+
+</mapper>

+ 5 - 0
module-toutiao/src/main/java/cn/com/ctop/toutiao/modules/batch/mapper/xml/BytedanceInterestCategoryMapper.xml

@@ -0,0 +1,5 @@
+<?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">
+<mapper namespace="cn.com.ctop.toutiao.modules.batch.mapper.BytedanceInterestCategoryMapper">
+
+</mapper>

+ 16 - 0
module-toutiao/src/main/java/cn/com/ctop/toutiao/modules/batch/service/IBytedanceAreaInfoService.java

@@ -0,0 +1,16 @@
+package cn.com.ctop.toutiao.modules.batch.service;
+
+import cn.com.ctop.toutiao.modules.batch.entity.BytedanceAreaInfo;
+import com.baomidou.mybatisplus.extension.service.IService;
+
+/**
+ * 省市县信息
+ *
+ * @author jeecg-boot
+ * @version V1.0
+ * @date 2019-09-17
+ */
+public interface IBytedanceAreaInfoService extends IService<BytedanceAreaInfo> {
+
+    boolean hasChild(BytedanceAreaInfo areaInfo);
+}

+ 1 - 0
module-toutiao/src/main/java/cn/com/ctop/toutiao/modules/batch/service/IBytedanceGroupApiService.java

@@ -10,4 +10,5 @@ import java.util.Map;
 public interface IBytedanceGroupApiService {
     List<ByteDanceCampaign> getGroupListByParams(CtopOauthToken token, JSONArray ids, String campaignName, String landingType, String status, String campaignCreateTime, Integer page, Integer pageSize);
     Map<String,Object>createGroup(CtopOauthToken token,String campaignName,String operation,String budgetMode,String budget,String landingType,String uniqueFk);
+    Map<String,Object>updateGroup(CtopOauthToken token, String campaignId, String campaignName, String modifyTime,String budget);
 }

+ 7 - 0
module-toutiao/src/main/java/cn/com/ctop/toutiao/modules/batch/service/IBytedanceInterestCategoryService.java

@@ -0,0 +1,7 @@
+package cn.com.ctop.toutiao.modules.batch.service;
+
+import cn.com.ctop.toutiao.modules.batch.entity.BytedanceInterestCategory;
+import com.baomidou.mybatisplus.extension.service.IService;
+
+public interface IBytedanceInterestCategoryService extends IService<BytedanceInterestCategory> {
+}

+ 33 - 0
module-toutiao/src/main/java/cn/com/ctop/toutiao/modules/batch/service/impl/BytedanceAreaInfoServiceImpl.java

@@ -0,0 +1,33 @@
+package cn.com.ctop.toutiao.modules.batch.service.impl;
+
+import cn.com.ctop.toutiao.modules.batch.entity.BytedanceAreaInfo;
+import cn.com.ctop.toutiao.modules.batch.mapper.BytedanceAreaInfoMapper;
+import cn.com.ctop.toutiao.modules.batch.service.IBytedanceAreaInfoService;
+import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import org.springframework.stereotype.Service;
+
+import java.util.List;
+
+/**
+ * 省市县信息
+ *
+ * @author jeecg-boot
+ * @version V1.0
+ * @date 2019-09-17
+ */
+@Service
+public class BytedanceAreaInfoServiceImpl extends ServiceImpl<BytedanceAreaInfoMapper, BytedanceAreaInfo> implements IBytedanceAreaInfoService {
+
+    @Override
+    public boolean hasChild(BytedanceAreaInfo areaInfo) {
+        QueryWrapper<BytedanceAreaInfo>queryWrapper = new QueryWrapper<>();
+        queryWrapper.eq("parent_code",areaInfo.getCode());
+        List<BytedanceAreaInfo>areaInfos = this.list(queryWrapper);
+        if(null == areaInfos||areaInfos.isEmpty()){
+            return false;
+        }else{
+            return true;
+        }
+    }
+}

+ 26 - 1
module-toutiao/src/main/java/cn/com/ctop/toutiao/modules/batch/service/impl/BytedanceGroupApiServiceImpl.java

@@ -20,7 +20,6 @@ import java.util.Map;
 @Service
 @Slf4j
 public class BytedanceGroupApiServiceImpl implements IBytedanceGroupApiService {
-
     @Override
     /**
      * 获取广告组数据
@@ -76,6 +75,17 @@ public class BytedanceGroupApiServiceImpl implements IBytedanceGroupApiService {
         return campaigns;
     }
 
+    /**
+     * 每个广告主账号下最多可允许创建500个广告组,如超出需要先删除一部分广告组后才可继续创建。
+     * @param token
+     * @param campaignName
+     * @param operation
+     * @param budgetMode
+     * @param budget
+     * @param landingType
+     * @param uniqueFk
+     * @return
+     */
     @Override
     public Map<String, Object> createGroup(CtopOauthToken token, String campaignName, String operation, String budgetMode, String budget, String landingType, String uniqueFk) {
         Map<String,Object>result = new HashMap<>();
@@ -114,4 +124,19 @@ public class BytedanceGroupApiServiceImpl implements IBytedanceGroupApiService {
         result.put("campaign_id",campaignId);
         return result;
     }
+
+    @Override
+    public Map<String, Object> updateGroup(CtopOauthToken token, String campaignId, String campaignName, String modifyTime,String budget) {
+        // 请求地址
+        String url = "https://ad.oceanengine.com/open_api/2/campaign/update/";
+        // 请求参数
+        JSONObject data = new JSONObject();
+        data.put("advertiser_id",token.getAccountId());
+        data.put("campaign_name",campaignName);
+        data.put("budget",budget);
+        data.put("campaign_id", campaignId);
+        data.put("modify_time", modifyTime);
+        JSONObject result = HttpUtils.bytedancePostRequest(token.getAccessToken(),url,data);
+        return new HashMap<>();
+    }
 }

+ 11 - 0
module-toutiao/src/main/java/cn/com/ctop/toutiao/modules/batch/service/impl/BytedanceInterestCategoryServiceImpl.java

@@ -0,0 +1,11 @@
+package cn.com.ctop.toutiao.modules.batch.service.impl;
+
+import cn.com.ctop.toutiao.modules.batch.entity.BytedanceInterestCategory;
+import cn.com.ctop.toutiao.modules.batch.mapper.BytedanceInterestCategoryMapper;
+import cn.com.ctop.toutiao.modules.batch.service.IBytedanceInterestCategoryService;
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import org.springframework.stereotype.Service;
+
+@Service
+public class BytedanceInterestCategoryServiceImpl extends ServiceImpl<BytedanceInterestCategoryMapper, BytedanceInterestCategory> implements IBytedanceInterestCategoryService {
+}

+ 4 - 1
module-toutiao/src/main/java/cn/com/ctop/toutiao/modules/material/service/impl/BytedanceBidWarningServiceImpl.java

@@ -56,11 +56,14 @@ public class BytedanceBidWarningServiceImpl implements IBytedanceBidWarningServi
                 }
                 Long maxBid = project.getMaxBid();
                 Long projectId = project.getId();
-                List<UserAllocation> userAllocations = userAllocationService.getByParams(projectId,null,1);
+                List<UserAllocation> userAllocations = userAllocationService.getByParams(projectId,null,null);
                 if (Check.isNull(userAllocations)) {
                     continue;
                 }
                 for (UserAllocation userAllocation : userAllocations) {
+                    if (userAllocation.getAccountStatus() == 1) {
+                        continue;
+                    }
                     Long accountId = userAllocation.getAccountId();
                     List<String> unitWarning = new ArrayList<>();
                     if ("1".equals(userAllocation.getMediaId())) {

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

@@ -683,7 +683,7 @@
         from ctop_bytedance_report_material_daily a
         left join (select * from ctop_user_allocation group by account_id) b on a.account_id = b.account_id
         left join user_company c on b.user_id = c.user_id
-        left join ctop_bytedance_video_info d on a.material_id = d.material_id
+        left join (select * from ctop_bytedance_video_info group by material_id) d on a.material_id = d.material_id
         left join (select code,url,material_name from ctop_material_info group by code) e on d.signature = e.code
         where c.company_id = #{companyId}      -- '6608ed13c0dd42de93c790dbdf124234'
         and a.image_mode in ('CREATIVE_IMAGE_MODE_VIDEO',

+ 7 - 0
module-toutiao/src/main/java/cn/com/ctop/toutiao/modules/report/service/IBytedanceReportDailyAgentService.java

@@ -0,0 +1,7 @@
+package cn.com.ctop.toutiao.modules.report.service;
+
+import com.baomidou.mybatisplus.extension.service.IService;
+
+public interface IBytedanceReportDailyAgentService {
+
+}

+ 111 - 0
module-toutiao/src/main/java/cn/com/ctop/toutiao/modules/report/service/impl/BytedanceReportDailyAgentServiceImpl.java

@@ -0,0 +1,111 @@
+package cn.com.ctop.toutiao.modules.report.service.impl;
+
+import cn.com.ctop.common.module.utils.ChaojiyingUtils;
+import cn.com.ctop.common.module.utils.HttpUtils2;
+import cn.com.ctop.toutiao.modules.report.service.IBytedanceReportDailyAgentService;
+import org.apache.http.impl.client.BasicCookieStore;
+import org.apache.http.impl.cookie.BasicClientCookie;
+import org.openqa.selenium.By;
+import org.openqa.selenium.Cookie;
+import org.openqa.selenium.WebDriver;
+import org.openqa.selenium.WebElement;
+import org.openqa.selenium.chrome.ChromeDriver;
+import org.openqa.selenium.chrome.ChromeOptions;
+import org.springframework.beans.factory.annotation.Value;
+
+import java.util.HashMap;
+import java.util.Iterator;
+import java.util.Map;
+import java.util.Set;
+
+public class BytedanceReportDailyAgentServiceImpl implements IBytedanceReportDailyAgentService {
+//    @Value("${jeecg.path.chrome-driver}")
+    private String chromeDriver = "D:/chromedriver.exe";
+    public static void main(String[] args){
+        BytedanceReportDailyAgentServiceImpl i = new BytedanceReportDailyAgentServiceImpl();
+        //账户列表 get
+        //https://agent.oceanengine.com/agent/optimize/adv-manage/adv-list/history/?beginDate=2020-07-03&endDate=2020-07-03&page=1&size=10&sortDir=descend&sortField=salesCost
+        //公司列表 post
+        //https://agent.oceanengine.com/agent/optimize/adv-company-manage/company-list/history/
+        /**
+         * Content-Disposition: form-data; name="page"
+         * 1
+         * Content-Disposition: form-data; name="size"
+         * 10
+         * Content-Disposition: form-data; name="sortField"
+         * advertiserCompanyCost
+         * Content-Disposition: form-data; name="sortDir"
+         * descend
+         * Content-Disposition: form-data; name="beginDate"
+         * 2020-07-01
+         */
+        i.loginAgent();
+    }
+    public boolean loginAgent() {
+        boolean loginStatus = false;
+        System.getProperties().setProperty("webdriver.chrome.driver", chromeDriver);
+        String url = "https://agent.oceanengine.com/login";
+        ChromeOptions chromeOptions = new ChromeOptions();
+        chromeOptions.addArguments("--headless");
+        chromeOptions.addArguments("--no-sandbox");
+        chromeOptions.addArguments("--disable-dev-shm-usage");
+        chromeOptions.addArguments("--incognito");
+        chromeOptions.addArguments("--disable-gpu");
+        chromeOptions.addArguments("--window-size=1920,1080");
+        chromeOptions.addArguments("--user-agent=" + HttpUtils2.USER_AGENT);
+        chromeOptions.setAcceptInsecureCerts(true);
+        WebDriver webDriver = new ChromeDriver(chromeOptions);
+        try {
+            Thread.sleep(3000L);
+            HttpUtils2.cookieStore = new BasicCookieStore();
+            webDriver.manage().deleteAllCookies();
+            //获取登录页面
+            webDriver.get(url);
+            Thread.sleep(3000L);
+            WebElement accountElement = webDriver.findElement(By.xpath("//input[@name='account']"));
+            accountElement.sendKeys("guoyanling@c-top.com.cn");
+            Thread.sleep(3000L);
+            WebElement passwordElement = webDriver.findElement(By.xpath("//input[@name='password']"));
+            passwordElement.sendKeys("HCST-hcst888");
+            WebElement captchaElement = webDriver.findElement(By.xpath("//div[contains(@class,'custom-toutiao-captcha')]"));
+            String bg = captchaElement.getCssValue("background-image");
+            System.out.println(bg.split("\"")[1]);
+            String result = ChaojiyingUtils.process(bg.split(",")[1],1004);
+            //{"err_no":0,"err_str":"OK","pic_id":"9109919322855101177","pic_str":"jdww","md5":"230db313e423211fcd989a9b4797fd87"}
+            WebElement captchaInputElement = webDriver.findElement(By.xpath("//input[@name='captcha']"));
+            System.out.println(result);
+            WebElement loginElement = webDriver.findElement(By.xpath("//div[contains(text(),'登录')]"));
+            Thread.sleep(3000L);
+            //点击登录
+            loginElement.click();
+            Thread.sleep(3000L);
+
+            Set<Cookie> cookies = webDriver.manage().getCookies();
+            Iterator iterator = cookies.iterator();
+            while (iterator.hasNext()) {
+                String cookieStr = iterator.next().toString();
+                String[] cookieArray = cookieStr.split(";");
+                Map<String, String> cookieMap = new HashMap<>();
+                for (String cookie : cookieArray) {
+                    String[] kv = cookie.split("=");
+                    if (kv.length > 1) {
+                        cookieMap.put(kv[0].trim(), kv[1].trim());
+                    }
+                }
+                BasicClientCookie clientCookie = new BasicClientCookie(cookieArray[0].split("=")[0],
+                        cookieArray[0].split("=")[1]);
+                clientCookie.setDomain("agent.oceanengine.com");
+                clientCookie.setPath(cookieMap.get("path"));
+                HttpUtils2.cookieStore.addCookie(clientCookie);
+            }
+            loginStatus = true;
+        } catch (Exception e) {
+            e.printStackTrace();
+            loginStatus = false;
+        } finally {
+            webDriver.manage().deleteAllCookies();
+            webDriver.quit();
+        }
+        return loginStatus;
+    }
+}