Sfoglia il codice sorgente

Merge branch 'test'

# Conflicts:
#	jeecg-boot-module-system/src/main/java/org/jeecg/modules/ctop/controller/TestController.java
yumeng 5 anni fa
parent
commit
cd81c83a02
21 ha cambiato i file con 441 aggiunte e 2086 eliminazioni
  1. 5 3
      jeecg-boot-module-system/src/main/java/org/jeecg/JeecgOneGui.java
  2. 7 21
      jeecg-boot-module-system/src/main/java/org/jeecg/modules/ctop/controller/ByteDanceAdvertiserPostController.java
  3. 125 257
      jeecg-boot-module-system/src/main/java/org/jeecg/modules/ctop/controller/TestController.java
  4. 0 40
      jeecg-boot-module-system/src/main/java/org/jeecg/modules/ctop/job/DeleteCreativeStaticJob.java
  5. 0 2
      jeecg-boot-module-system/src/main/java/org/jeecg/modules/ctop/job/KuaishouDailyAccountReportLoadJob.java
  6. 0 4
      jeecg-boot-module-system/src/main/java/org/jeecg/modules/ctop/job/KuaishouDailyCampaignReportLoadJob.java
  7. 0 3
      jeecg-boot-module-system/src/main/java/org/jeecg/modules/ctop/job/KuaishouDailyCreativeReportLoadJob.java
  8. 0 3
      jeecg-boot-module-system/src/main/java/org/jeecg/modules/ctop/job/KuaishouDailyGroupReportLoadJob.java
  9. 0 4
      jeecg-boot-module-system/src/main/java/org/jeecg/modules/ctop/job/KuaishouHourlyCreativeReportLoadJob.java
  10. 1 27
      jeecg-boot-module-system/src/test/java/org/jeecg/SampleTest.java
  11. 2 61
      module-kuaishou/src/main/java/cn/com/ctop/kuaishou/modules/batch/controller/KuaiShouController.java
  12. 0 91
      module-kuaishou/src/main/java/cn/com/ctop/kuaishou/modules/batch/controller/KuaiShouReportController.java
  13. 0 249
      module-kuaishou/src/main/java/cn/com/ctop/kuaishou/modules/batch/controller/KuaishouReportHourlyCreativeStatisticController.java
  14. 181 68
      module-kuaishou/src/main/java/cn/com/ctop/kuaishou/modules/batch/service/IKuaishouInterfaceService.java
  15. 2 2
      module-kuaishou/src/main/java/cn/com/ctop/kuaishou/modules/batch/service/impl/KuaiShouUpdateServiceImpl.java
  16. 118 1009
      module-kuaishou/src/main/java/cn/com/ctop/kuaishou/modules/batch/service/impl/KuaishouInterfaceServiceImpl.java
  17. 0 18
      module-kuaishou/src/main/java/cn/com/ctop/kuaishou/modules/report/mapper/KuaishouReportHourlyCreativeStatisticMapper.java
  18. 0 157
      module-kuaishou/src/main/java/cn/com/ctop/kuaishou/modules/report/mapper/xml/KuaishouReportHourlyCreativeStatisticMapper.xml
  19. 0 22
      module-kuaishou/src/main/java/cn/com/ctop/kuaishou/modules/report/service/IKuaishouReportHourlyCreativeStatisticService.java
  20. 0 44
      module-kuaishou/src/main/java/cn/com/ctop/kuaishou/modules/report/service/impl/KuaishouReportHourlyCreativeStatisticServiceImpl.java
  21. 0 1
      moudule-eureca/src/main/java/cn/com/ctop/eureca/server/ServerApplication.java

+ 5 - 3
jeecg-boot-module-system/src/main/java/org/jeecg/JeecgOneGui.java

@@ -10,9 +10,11 @@ import org.jeecgframework.codegenerate.window.CodeWindow;
  */
 public class JeecgOneGui {
 
-	/** 详细使用手册: http://jeecg-boot.mydoc.io/?t=338140 */
+    /**
+     * 详细使用手册: http://jeecg-boot.mydoc.io/?t=338140
+     */
     public static void main(String[] args) {
-    	new CodeWindow().pack();
-	}
+        new CodeWindow().pack();
+    }
 
 }

+ 7 - 21
jeecg-boot-module-system/src/main/java/org/jeecg/modules/ctop/controller/ByteDanceAdvertiserPostController.java

@@ -28,7 +28,6 @@ import org.springframework.web.bind.annotation.*;
 import javax.servlet.http.HttpServletRequest;
 import java.text.ParseException;
 import java.util.HashMap;
-import java.util.List;
 import java.util.Map;
 
 /**
@@ -53,6 +52,7 @@ public class ByteDanceAdvertiserPostController {
 
     /**
      * 1:获取广告主信息
+     *
      * @param accountId 本平台广告主id
      */
     @RequestMapping("/advertiser/info")
@@ -110,6 +110,7 @@ public class ByteDanceAdvertiserPostController {
 
     /**
      * 6:获取广告主广告预算信息
+     *
      * @param accountId 本平台广告主id
      */
     @RequestMapping("/advertiser/budget/get/")
@@ -119,6 +120,7 @@ public class ByteDanceAdvertiserPostController {
 
     /**
      * 7:获取广告主广告组信息
+     *
      * @param accountId 本平台广告主id
      */
     @RequestMapping("/advertiser/campaign/get")
@@ -138,6 +140,7 @@ public class ByteDanceAdvertiserPostController {
 
     /**
      * 8:获取广告主广告创意信息
+     *
      * @param accountId 本平台广告主id
      */
     @RequestMapping("/advertiser/creative/get")
@@ -147,6 +150,7 @@ public class ByteDanceAdvertiserPostController {
 
     /**
      * 9:修改广告创意信息状态
+     *
      * @param accountId 本平台广告主id
      */
     @RequestMapping("/advertiser/update/status/")
@@ -156,7 +160,8 @@ public class ByteDanceAdvertiserPostController {
 
     /**
      * 10:获取广告主广告创意素材信息
-     * @param accountId 本平台广告主id
+     *
+     * @param accountId   本平台广告主id
      * @param creativeIds 广告创意id
      */
     @RequestMapping("/advertiser/creative/material/read")
@@ -263,14 +268,6 @@ public class ByteDanceAdvertiserPostController {
         return result;
     }
 
-    @GetMapping("loadAllData")
-    public Map<String, Object> loadAllData() {
-        Map<String, Object> result = new HashMap<>();
-        List<CtopOauthToken> kuaishouTokens = tokenService.getTokenListByType(CtopAdConstant.PLATFORM_TYPE_KUAISHOU);
-        kuaishouInterfaceService.loadAllKuaishouData(kuaishouTokens);
-        ResultMapUtils.setResultMap(result, StatusCode.COMMON_SUCCESS.getCode());
-        return result;
-    }
 
     @GetMapping("loadSingleData")
     public Map<String, Object> loadSingleData(Long accountId) {
@@ -289,17 +286,6 @@ public class ByteDanceAdvertiserPostController {
         return result;
     }
 
-    @GetMapping("loadData")
-    public Map<String, Object> loadData() {
-        Map<String, Object> result = new HashMap<>();
-        try {
-            kuaishouInterfaceService.loadData();
-        } catch (InterruptedException e) {
-            e.printStackTrace();
-        }
-        ResultMapUtils.setResultMap(result, StatusCode.COMMON_SUCCESS.getCode());
-        return result;
-    }
 
     @Autowired
     private ICtopOauthTokenService tokenService;

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

@@ -13,24 +13,19 @@ import cn.com.ctop.common.module.utils.Check;
 import cn.com.ctop.common.module.utils.CtopAdConstant;
 import cn.com.ctop.common.module.utils.ResultMapUtils;
 import cn.com.ctop.common.module.utils.StatusCode;
-import cn.com.ctop.kuaishou.modules.batch.entity.KuaiShouCampaign;
 import cn.com.ctop.kuaishou.modules.batch.service.IKuaiShouCampaignService;
 import cn.com.ctop.kuaishou.modules.batch.service.IKuaiShouDailyReportTaskService;
 import cn.com.ctop.kuaishou.modules.batch.service.IKuaiShouHistoryReportTaskService;
 import cn.com.ctop.kuaishou.modules.batch.service.IKuaishouInterfaceService;
 import cn.com.ctop.kuaishou.modules.graphql.service.IKuaishouWebInterfaceService;
-import cn.com.ctop.kuaishou.modules.report.mapper.KuaishouReportDailyCreativeMapper;
-import cn.com.ctop.kuaishou.modules.report.mapper.KuaishouReportDailyCreativeStatisticMapper;
 import cn.com.ctop.toutiao.service.IByteDanceAdvertiserDataService;
 import com.alibaba.fastjson.JSONObject;
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
-import lombok.SneakyThrows;
 import lombok.extern.slf4j.Slf4j;
 import org.jeecg.common.api.vo.Result;
 import org.jeecg.common.util.DateUtils;
 import org.jeecg.modules.ctop.service.ICleanMaterialService;
 import org.jeecg.modules.ctop.service.ICreateInternalService;
-import org.jeecg.modules.ctop.service.IKuaiShouDefectMaterialService;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.*;
 
@@ -99,19 +94,13 @@ public class TestController {
             String startDate = DateUtils.addMonth(endDateStr, -6);
             QueryWrapper<CtopOauthToken> tokenQueryWrapper = new QueryWrapper<>();
             tokenQueryWrapper.eq("media_id", 2);
-            System.err.println(startDate);
-            System.err.println(endDateStr);
-
-
-            //List<CtopOauthToken> ctopOauthTokens = oauthTokenMapper.selectList(tokenQueryWrapper);
-            //if (!Check.isNull(ctopOauthTokens)) {
-            //for (CtopOauthToken token : ctopOauthTokens) {
-            //if ("3768019".equals(token.getAccountId())) {
-            historyReportTaskService.createTask(3768019L, "0fb5f7dadd26b265979b1a8956950008", startDate, endDateStr, CtopAdConstant.KUAISHOU_LOAD_JOB_TYPE_HISTORY);
+            List<CtopOauthToken> ctopOauthTokens = oauthTokenMapper.selectList(tokenQueryWrapper);
+            if (!Check.isNull(ctopOauthTokens)) {
+                for (CtopOauthToken token : ctopOauthTokens) {
+                    historyReportTaskService.createTask(token.getAccountId(), token.getAccessToken(), startDate, endDateStr, CtopAdConstant.KUAISHOU_LOAD_JOB_TYPE_HISTORY);
+                }
 
-            //}
-            //}
-            //}
+            }
         } catch (Exception e) {
             e.printStackTrace();
             result.setSuccess(false);
@@ -128,13 +117,8 @@ public class TestController {
             String startDate = DateUtils.addMonth(endDateStr, -6);
             QueryWrapper<CtopOauthToken> tokenQueryWrapper = new QueryWrapper<>();
             tokenQueryWrapper.eq("media_id", 2);
-            System.err.println(startDate);
-            System.err.println(endDateStr);
-
-
             historyReportTaskService.getTaskList();
 
-
         } catch (Exception e) {
             e.printStackTrace();
             result.setSuccess(false);
@@ -175,26 +159,7 @@ public class TestController {
         return "Success";
     }
 
-    static ExecutorService executorService = Executors.newFixedThreadPool(5);
-
-    @GetMapping(value = "/getVideoAndImage")
-    public String getVideoAndImage() {
-        QueryWrapper<CtopOauthToken> tokenQueryWrapper = new QueryWrapper<>();
-        tokenQueryWrapper.eq("media_id", 2);
-        List<CtopOauthToken> ctopOauthTokens = tokenMapper.selectList(tokenQueryWrapper);
-        for (CtopOauthToken token : ctopOauthTokens) {
-            executorService.submit(new Runnable() {
-                @Override
-                public void run() {
-                    kuaishouInterfaceService.getVideoList2(token, null, null, 1);
-                    //kuaishouInterfaceService.getImageList2(token, null, null, 1);
-                    //   kuaishouInterfaceService.getCreativeList2(token, null, null, 1);
-                }
-            });
-
-        }
-        return "Success";
-    }
+    static ExecutorService executorService = Executors.newFixedThreadPool(10);
 
 
     @GetMapping(value = "/gerCreative")
@@ -207,7 +172,6 @@ public class TestController {
                 @Override
                 public void run() {
                     try {
-                        System.err.println("获取创意,accountId:" + token.getAccountId());
                         kuaishouInterfaceService.getCreativeList(token, null, null);
                         //  kuaishouInterfaceService.getVideoList2(token, null, null,1);
                         //3: 获取图片信息数据
@@ -247,118 +211,35 @@ public class TestController {
     @Autowired
     private IKuaiShouCampaignService campaignService;
 
-    @GetMapping(value = "/getCreativeReportByAccount")
-    public void gerCreativeReportByAccount(Long accountId, String startDateStr, String endDateStr) {
-        Thread thread = new Thread() {
-            @SneakyThrows
-            @Override
-            public void run() {
-                SimpleDateFormat sim = new SimpleDateFormat("yyyy-MM-dd");
-                Date startDate = sim.parse(startDateStr);
-                Date endDate = sim.parse(endDateStr);
-                //1:查询当日数据
-                //executorService = Executors.newFixedThreadPool(3);
-                QueryWrapper<CtopOauthToken> oauthTokenQueryWrapper = new QueryWrapper<>();
-                oauthTokenQueryWrapper.eq("media_id", 2);
-                oauthTokenQueryWrapper.eq("account_id", accountId);
-                CtopOauthToken ctopOauthToken = oauthTokenMapper.selectOne(oauthTokenQueryWrapper);
-
-                System.err.println("创意报表accountId:" + ctopOauthToken.getAccountId());
-                QueryWrapper<KuaiShouCampaign> campaignQueryWrapper = new QueryWrapper<>();
-                campaignQueryWrapper.eq("account_id", accountId);
-                List<KuaiShouCampaign> list = campaignService.list(campaignQueryWrapper);
-                if (!Check.isNull(list)) {
-                    for (KuaiShouCampaign campaign : list) {
-                        kuaishouInterfaceService.getAdvertiserCreativeReportDailyV2(campaign.getCampaignId(), ctopOauthToken, startDate, endDate);
 
+    @GetMapping("loadBytedanceHistoryData")
+    public Map<String, Object> loadBytedanceHistoryData() {
+        Map<String, Object> result = new HashMap<>();
+        //1:查询所有头条的token数据
+        List<CtopOauthToken> tokens = tokenService.getTokenListByType(CtopAdConstant.PLATFORM_TYPE_BYTEDANCE);
+        if (null != tokens && tokens.size() > 0) {
+            tokens.forEach(token -> {
+                //拉取往期数据
+                executorService.submit(new Runnable() {
+                    @Override
+                    public void run() {
+                        reportService.loadBytedanceHistoryData(token);
                     }
-
-                }
-
-
-            }
-        };
-        thread.start();
+                });
+            });
+        }
+        ResultMapUtils.setResultMap(result, StatusCode.COMMON_SUCCESS);
+        return result;
     }
 
 
     @Autowired
     private IUserAllocationService userAllocationService;
-    @Autowired
-    private KuaishouReportDailyCreativeStatisticMapper reportDailyCreativeStatisticMapper;
-
-
-    @Autowired
-    private KuaishouReportDailyCreativeMapper reportDailyCreativeMapper;
 
-    @GetMapping(value = "/getCreativeReportByProjectId")
-    public void getCreativeReportByProjectId(Long projectId) {
-
-        try {
-            Map<String, Object> deleteMap = new HashMap<>();
-            String date = DateUtils.getDate("yyyy-MM-dd");
-            String anotherDay = DateUtils.getAnotherDay("yyyy-MM-dd", date, -1);
-            SimpleDateFormat simpleDateFormat = new SimpleDateFormat("yyyy-MM-dd");
-            Date endDate = simpleDateFormat.parse(anotherDay);
-            QueryWrapper<UserAllocation> userAllocationQueryWrapper = new QueryWrapper<>();
-            userAllocationQueryWrapper.eq("project_id", projectId);
-            List<UserAllocation> list = userAllocationService.list(userAllocationQueryWrapper);
-            if (!Check.isNull(list)) {
-                for (UserAllocation allocation : list) {
-                    executorService.submit(new Runnable() {
-                        @Override
-                        public void run() {
-                            if (!Check.isNull(allocation)) {
-                                log.info("账号id:{}", allocation.getAccountId());
-
-                                QueryWrapper<CtopOauthToken> oauthTokenQueryWrapper = new QueryWrapper<>();
-                                oauthTokenQueryWrapper.eq("media_id", 2);
-                                oauthTokenQueryWrapper.eq("account_id", allocation.getAccountId());
-                                CtopOauthToken ctopOauthToken = oauthTokenMapper.selectOne(oauthTokenQueryWrapper);
-                                if (!Check.isNull(ctopOauthToken)) {
-                                    deleteMap.put("account_id", allocation.getAccountId());
-                                    deleteMap.put("stat_date", anotherDay);
-                                    //   reportDailyCreativeStatisticMapper.deleteByMap(deleteMap);
-                                    //  reportDailyCreativeMapper.deleteByMap(deleteMap);
-
-                                    // 1.计划数据
-                                    log.info("获取计划,账号id:{}", allocation.getAccountId());
-                                    kuaishouInterfaceService.getCampaignList(ctopOauthToken, null, null);
-                                    // 2:广告组数据
-                                    log.info("获取广告组,账号id:{}", allocation.getAccountId());
-                                    kuaishouInterfaceService.getGroupList(ctopOauthToken, null, null);
-                                    // 3:创意数据
-                                    log.info("获取创意,账号id:{}", allocation.getAccountId());
-                                    kuaishouInterfaceService.getCreativeList(ctopOauthToken, null, null);
-
-                                    QueryWrapper<KuaiShouCampaign> campaignQueryWrapper = new QueryWrapper<>();
-                                    campaignQueryWrapper.eq("account_id", ctopOauthToken.getAccountId());
-                                    log.info("获取创意报表,账号id:{}", allocation.getAccountId());
-                                    List<KuaiShouCampaign> campaigns = campaignService.list(campaignQueryWrapper);
-                                    if (!Check.isNull(campaigns)) {
-                                        for (KuaiShouCampaign campaign : campaigns) {
-                                            kuaishouInterfaceService.getAdvertiserCreativeReportDailyV2(campaign.getCampaignId(), ctopOauthToken, endDate, endDate);
-                                        }
-                                    }
-                                }
-                            }
-
-                        }
-                    });
-
-
-                }
-            }
-        } catch (ParseException e) {
-            e.printStackTrace();
-        }
-
-    }
 
     public static void main(String[] args) throws ParseException {
         String date = DateUtils.getDate("yyyy-MM-dd");
         String anotherDay = DateUtils.getAnotherDay("yyyy-MM-dd", date, -1);
-        System.err.println(anotherDay);
     }
 
 
@@ -370,11 +251,9 @@ public class TestController {
         oauthTokenQueryWrapper.last("limit 1");
         CtopOauthToken token = oauthTokenMapper.selectOne(oauthTokenQueryWrapper);
         try {
-            System.err.println("获取计划,广告组:" + accountId);
             kuaishouInterfaceService.getCampaignList(token, null, null);
             //1:获取全量广告组数据
             kuaishouInterfaceService.getGroupList(token, null, null);
-            System.err.println("获取计划,广告组:" + accountId);
         } catch (Exception e) {
             e.printStackTrace();
         }
@@ -392,9 +271,7 @@ public class TestController {
         CtopOauthToken token = oauthTokenMapper.selectOne(oauthTokenQueryWrapper);
 
         try {
-            System.err.println("获取创意,accountId:" + token.getAccountId());
             kuaishouInterfaceService.getCreativeList(token, null, null);
-            System.err.println("获取创意结束,accountId:" + token.getAccountId());
         } catch (Exception e) {
             e.printStackTrace();
         }
@@ -403,60 +280,6 @@ public class TestController {
     }
 
 
-    @GetMapping(value = "/getVideo")
-    public void getVideo(Long accountId) {
-        QueryWrapper<CtopOauthToken> oauthTokenQueryWrapper = new QueryWrapper<>();
-        oauthTokenQueryWrapper.eq("media_id", 2);
-        oauthTokenQueryWrapper.eq("account_id", accountId);
-        oauthTokenQueryWrapper.last("limit 1");
-        CtopOauthToken token = oauthTokenMapper.selectOne(oauthTokenQueryWrapper);
-
-        try {
-            System.err.println("获取视频,accountId:" + token.getAccountId());
-            kuaishouInterfaceService.getVideoList(token, null, null);
-            System.err.println("获取视频结束,accountId:" + token.getAccountId());
-        } catch (Exception e) {
-            e.printStackTrace();
-        }
-
-
-    }
-
-
-    @GetMapping(value = "/gerCreativeReportByAccount")
-    public void gerCreativeReportByAccount(Long accountId, String startDateStr, String endDateStr, QueryWrapper<CtopOauthToken> account_id) {
-        Thread thread = new Thread() {
-            @SneakyThrows
-            @Override
-            public void run() {
-                SimpleDateFormat sim = new SimpleDateFormat("yyyy-MM-dd");
-                Date startDate = sim.parse(startDateStr);
-                Date endDate = sim.parse(endDateStr);
-                //1:查询当日数据
-                //executorService = Executors.newFixedThreadPool(3);
-                QueryWrapper<CtopOauthToken> oauthTokenQueryWrapper = new QueryWrapper<>();
-                oauthTokenQueryWrapper.eq("media_id", 2);
-                oauthTokenQueryWrapper.eq("account_id", accountId);
-                CtopOauthToken ctopOauthToken = oauthTokenMapper.selectOne(oauthTokenQueryWrapper);
-                System.err.println("创意报表accountId:" + ctopOauthToken.getAccountId());
-
-
-                QueryWrapper<KuaiShouCampaign> campaignQueryWrapper = new QueryWrapper<>();
-                campaignQueryWrapper.eq("account_id", ctopOauthToken.getAccountId());
-
-                List<KuaiShouCampaign> campaigns = campaignService.list(campaignQueryWrapper);
-                if (!Check.isNull(campaigns)) {
-                    for (KuaiShouCampaign campaign : campaigns) {
-                        kuaishouInterfaceService.getAdvertiserCreativeReportDailyV2(campaign.getCampaignId(), ctopOauthToken, endDate, endDate);
-                    }
-                }
-
-            }
-        };
-        thread.start();
-    }
-
-
     @Autowired
     private IBytedancePlanDailyReportService planDailyReportService;
     @Autowired
@@ -473,61 +296,60 @@ public class TestController {
             e.printStackTrace();
         }
         //1:查询当日数据
-        List<CtopOauthToken> tokens = tokenService.getTokenListByType(CtopAdConstant.PLATFORM_TYPE_BYTEDANCE);
-        if (null == tokens || tokens.size() <= 0) {
-            log.info("定时获取头条数据异常:为获取到可用的token");
+        QueryWrapper<UserAllocation> queryWrapper = new QueryWrapper<>();
+        queryWrapper.eq("project_id", 215);
+        List<UserAllocation> allocations = userAllocationService.list(queryWrapper);
+        if (null == allocations || allocations.size() <= 0) {
+            log.info("定时获取头条数据异常:获取用户信息失败");
         }
         Date finalGetDate = getDate;
-        tokens.forEach(token -> {
+
+        allocations.forEach(allocation -> {
             //3:获取广告计划信息数据
+            CtopOauthToken token = oauthTokenMapper.selectByAccountId(allocation.getAccountId());
             reportService.getAdvertiserPlanReport(token, finalGetDate, finalGetDate, CtopAdConstant.BYTEDANCE_REPORT_TYPE_DAILY);
         });
 
         //清洗关于作业帮数据
         //1:查询作业帮相关的用户数据
-        QueryWrapper<UserAllocation> wrapper = new QueryWrapper<>();
-        wrapper.eq("project_id", 215);
-        List<UserAllocation> allocations = userAllocationService.list(wrapper);
-        if (null != allocations && allocations.size() > 0) {
-            allocations.forEach(allocation -> {
-                //根据accountId和时间,查询相关的日报表信息
-                QueryWrapper<BytedancePlanDailyReport> queryWrapper = new QueryWrapper<>();
-                SimpleDateFormat dateFormat = new SimpleDateFormat("yyyy-MM-dd");
-                String dateString = dateFormat.format(finalGetDate) + " 00:00:00";
-                queryWrapper.eq("advertiser_id", allocation.getAccountId())
-                        .eq("stat_datetime", dateString)
-                ;
-                List<BytedancePlanDailyReport> bytedancePlanDailyReports = planDailyReportService.list(queryWrapper);
-                if (null != bytedancePlanDailyReports && bytedancePlanDailyReports.size() > 0) {
-                    bytedancePlanDailyReports.forEach(report -> {
-                        String adName = report.getAdName();
-                        String[] tags = adName.split("-");
-                        report.setAdsense(tags[1]);
-                        report.setPlanCode(tags[2]);
-                        String materialName = tags[3];
-                        report.setMaterialName(materialName);
-                        if (materialName.contains("其他")) {
-                            report.setMaterialType("其他");
-                        } else if (materialName.contains("图片轮播")) {
-                            report.setMaterialType("图片轮播");
-                        } else if (materialName.contains("大字报")) {
-                            report.setMaterialType("大字报");
-                        } else if (materialName.contains("文字动画")) {
-                            report.setMaterialType("文字动画");
-                        } else if (materialName.contains("采访形式")) {
-                            report.setMaterialType("采访形式");
-                        } else if (materialName.contains("剧情")) {
-                            report.setMaterialType("剧情");
-                        } else if (materialName.contains("口播")) {
-                            report.setMaterialType("口播");
-                        } else {
-                            report.setMaterialType("其他");
-                        }
-                        planDailyReportService.updateById(report);
-                    });
-                }
-            });
-        }
+        allocations.forEach(allocation -> {
+            //根据accountId和时间,查询相关的日报表信息
+            QueryWrapper<BytedancePlanDailyReport> reportQueryWrapper = new QueryWrapper<>();
+            SimpleDateFormat dateFormat = new SimpleDateFormat("yyyy-MM-dd");
+            String dateString = dateFormat.format(finalGetDate) + " 00:00:00";
+            queryWrapper.eq("advertiser_id", allocation.getAccountId())
+                    .eq("stat_datetime", dateString)
+            ;
+            List<BytedancePlanDailyReport> bytedancePlanDailyReports = planDailyReportService.list(reportQueryWrapper);
+            if (null != bytedancePlanDailyReports && bytedancePlanDailyReports.size() > 0) {
+                bytedancePlanDailyReports.forEach(report -> {
+                    String adName = report.getAdName();
+                    String[] tags = adName.split("-");
+                    report.setAdsense(tags[1]);
+                    report.setPlanCode(tags[2]);
+                    String materialName = tags[3];
+                    report.setMaterialName(materialName);
+                    if (materialName.contains("其他")) {
+                        report.setMaterialType("其他");
+                    } else if (materialName.contains("图片轮播")) {
+                        report.setMaterialType("图片轮播");
+                    } else if (materialName.contains("大字报")) {
+                        report.setMaterialType("大字报");
+                    } else if (materialName.contains("文字动画")) {
+                        report.setMaterialType("文字动画");
+                    } else if (materialName.contains("采访形式")) {
+                        report.setMaterialType("采访形式");
+                    } else if (materialName.contains("剧情")) {
+                        report.setMaterialType("剧情");
+                    } else if (materialName.contains("口播")) {
+                        report.setMaterialType("口播");
+                    } else {
+                        report.setMaterialType("其他");
+                    }
+                    planDailyReportService.updateById(report);
+                });
+            }
+        });
         ResultMapUtils.setResultMap(result, StatusCode.COMMON_SUCCESS);
         return result;
     }
@@ -819,7 +641,6 @@ public class TestController {
             executorService.submit(new Runnable() {
                 @Override
                 public void run() {
-                    System.err.println(signature);
                     cleanMaterialService.calculationReport(signature);
                 }
             });
@@ -848,7 +669,6 @@ public class TestController {
                     } catch (ParseException e) {
                         e.printStackTrace();
                     }
-                    System.err.println("获取广告主报表,accountId:" + token.getAccountId());
                     kuaishouInterfaceService.getAdvertiserReportDaily(token, startDate, endDate);
 
                     Thread.sleep(1 * 200);
@@ -861,14 +681,62 @@ public class TestController {
     }
 
 
-    @Autowired
-    private IKuaiShouDefectMaterialService defectVideoService;
+    @GetMapping(value = "/getAllCreativeList")
+    public void getAllCreativeList() {
+
+        try {
+
+
+            QueryWrapper<CtopOauthToken> oauthTokenQueryWrapper = new QueryWrapper<>();
+            oauthTokenQueryWrapper.eq("media_id", 2);
+            List<CtopOauthToken> ctopOauthTokens = oauthTokenMapper.selectList(oauthTokenQueryWrapper);
+
+            if (!Check.isNull(ctopOauthTokens)) {
+                for (CtopOauthToken token : ctopOauthTokens) {
+                    executorService.submit(new Runnable() {
+                        @Override
+                        public void run() {
+                            if (!Check.isNull(token)) {
+                                log.info("获取创意,账号id:{}", token.getAccountId());
+                                kuaishouInterfaceService.getCreativeList(token, null, null);
+                            }
+                        }
+                    });
+
+                }
+            }
+        } catch (Exception e) {
+            e.printStackTrace();
+        }
+
+    }
+
+
+    @GetMapping(value = "/getAllGroupList")
+    public void getAllGroupList() {
+
+        try {
+
+            QueryWrapper<CtopOauthToken> oauthTokenQueryWrapper = new QueryWrapper<>();
+            oauthTokenQueryWrapper.eq("media_id", 2);
+            List<CtopOauthToken> ctopOauthTokens = oauthTokenMapper.selectList(oauthTokenQueryWrapper);
+            if (!Check.isNull(ctopOauthTokens)) {
+                for (CtopOauthToken token : ctopOauthTokens) {
+                    executorService.submit(new Runnable() {
+                        @Override
+                        public void run() {
+                            if (!Check.isNull(token)) {
+                                log.info("获取组,账号id:{}", token.getAccountId());
+                                kuaishouInterfaceService.getGroupList(token, null, null);
+                            }
+                        }
+                    });
+                }
+            }
+        } catch (Exception e) {
+            e.printStackTrace();
+        }
 
-    @GetMapping(value = "/getDefectVideo")
-    public void getDefectVideo(String startDate, String endDate) {
-        log.info("开始获取缺失视频数据");
-        defectVideoService.getDefectVideo(startDate, endDate);
-        log.info("获取缺失视频数据结束");
     }
 
 

+ 0 - 40
jeecg-boot-module-system/src/main/java/org/jeecg/modules/ctop/job/DeleteCreativeStaticJob.java

@@ -1,40 +0,0 @@
-package org.jeecg.modules.ctop.job;
-
-import cn.com.ctop.kuaishou.modules.report.service.IKuaishouReportHourlyCreativeStatisticService;
-import org.jeecg.common.util.DateUtils;
-import org.quartz.Job;
-import org.quartz.JobExecutionContext;
-import org.quartz.JobExecutionException;
-import org.springframework.beans.factory.annotation.Autowired;
-
-/**
- * 出价预警
- */
-public class DeleteCreativeStaticJob implements Job {
-    @Autowired
-    private IKuaishouReportHourlyCreativeStatisticService reportHourlyCreativeStatisticService;
-
-    /**
-     * 定时删除数据
-     *
-     * @param jobExecutionContext
-     * @throws JobExecutionException
-     */
-    @Override
-    public void execute(JobExecutionContext jobExecutionContext) {
-        Thread thread = new Thread() {
-            @Override
-            public void run() {
-                try {
-                    String nowDate = DateUtils.getNowDate("yyyy-MM-dd");
-                    String anotherDay = DateUtils.getAnotherDay("yyyy-MM-dd", nowDate, -2);
-                    reportHourlyCreativeStatisticService.deleteHourlyReportByStatDate(anotherDay);
-                } catch (Exception e) {
-                    e.printStackTrace();
-                }
-            }
-        };
-        thread.start();
-    }
-
-}

+ 0 - 2
jeecg-boot-module-system/src/main/java/org/jeecg/modules/ctop/job/KuaishouDailyAccountReportLoadJob.java

@@ -33,8 +33,6 @@ public class KuaishouDailyAccountReportLoadJob implements Job {
         Thread thread = new Thread() {
             @Override
             public void run() {
-                Date deleteDate = DateUtils.addDay(new Date(), -2);
-                kuaishouInterfaceService.deleteHourlyReport(deleteDate);
                 Date getDate = DateUtils.addDay(new Date(), -1);
                 //1:查询当日数据
                 List<CtopOauthToken> tokens = tokenService.selectKuaiShouToken();

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

@@ -2,7 +2,6 @@ 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 lombok.extern.slf4j.Slf4j;
 import org.jeecg.common.util.DateUtils;
@@ -34,8 +33,6 @@ public class KuaishouDailyCampaignReportLoadJob implements Job {
         Thread thread = new Thread() {
             @Override
             public void run() {
-                Date deleteDate = DateUtils.addDay(new Date(), -2);
-                kuaishouInterfaceService.deleteHourlyReport(deleteDate);
                 Date getDate = DateUtils.addDay(new Date(), -1);
                 //1:查询当日数据
                 List<CtopOauthToken> tokens = tokenService.selectKuaiShouToken();
@@ -50,7 +47,6 @@ public class KuaishouDailyCampaignReportLoadJob implements Job {
                         public void run() {
                             //获取广告计划信息数据
                             kuaishouInterfaceService.getAdvertiserCampaignReportDaily(token, getDate, getDate);
-
                         }
                     });
                 });

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

@@ -3,7 +3,6 @@ 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.Check;
-import cn.com.ctop.common.module.utils.CtopAdConstant;
 import cn.com.ctop.kuaishou.modules.batch.service.IKuaiShouCampaignService;
 import cn.com.ctop.kuaishou.modules.batch.service.IKuaishouInterfaceService;
 import com.alibaba.fastjson.JSONArray;
@@ -41,8 +40,6 @@ public class KuaishouDailyCreativeReportLoadJob implements Job {
         Thread thread = new Thread() {
             @Override
             public void run() {
-                Date deleteDate = DateUtils.addDay(new Date(), -2);
-                kuaishouInterfaceService.deleteHourlyReport(deleteDate);
                 Date getDate = DateUtils.addDay(new Date(), -1);
                 //1:查询当日数据
                 executorService = Executors.newFixedThreadPool(4);

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

@@ -2,7 +2,6 @@ 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 lombok.extern.slf4j.Slf4j;
 import org.jeecg.common.util.DateUtils;
@@ -34,8 +33,6 @@ public class KuaishouDailyGroupReportLoadJob implements Job {
         Thread thread = new Thread() {
             @Override
             public void run() {
-                Date deleteDate = DateUtils.addDay(new Date(), -2);
-                kuaishouInterfaceService.deleteHourlyReport(deleteDate);
                 Date getDate = DateUtils.addDay(new Date(), -1);
                 //1:查询当日数据
                 List<CtopOauthToken> tokens = tokenService.selectKuaiShouToken();

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

@@ -2,7 +2,6 @@ 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 lombok.extern.slf4j.Slf4j;
 import org.jeecg.common.util.DateUtils;
@@ -76,9 +75,6 @@ public class KuaishouHourlyCreativeReportLoadJob implements Job {
                     e.printStackTrace();
                 }
                 executorService.shutdown();
-                for (CtopOauthToken token : tokens) {
-                    kuaishouInterfaceService.updateCreativeReportHourlyStatistic(token, getDate);
-                }
             }
 
         };

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

@@ -138,6 +138,7 @@ public class SampleTest {
 
     @Autowired
     private IBytedanceFundDailyService fundDailyService;
+
     @Test
     public void testLoadJob() {
         String endDate = "2020-04-07";
@@ -278,33 +279,6 @@ public class SampleTest {
     @Autowired
     private IPerformanceSaleService performanceSaleService;
 
-
-    @Test
-    public void suZhao() {
-
-
-        Long accountId = 3917130L;
-        String token = "0a42e23921e486108105263e75561404";
-        kuaishouInterfaceService.getVideoList("e91c778d7de1bd0e9d8f3213d1e0e57c",3820093L, null,null,1);
-
-      /*  String url = "https://ad.e.kuaishou.com/rest/openapi/v1/file/ad/video/su_zao/list";
-
-
-        Map<String, String> headers = new HashMap<String, String>();
-        headers.put("Content-Type", "application/json");
-        headers.put("Access-Token", token);
-        Map<String, Object> param = new HashMap<String, Object>();
-
-        param.put("advertiser_id", accountId);
-        param.put("temporal_granularity", "HOURLY");
-        param.put("page", 1);
-        String result = HttpUtils.httpPostRequest(url, param, headers);
-        System.err.println(result);*/
-
-
-    }
-
-
 }
 
 

+ 2 - 61
module-kuaishou/src/main/java/cn/com/ctop/kuaishou/modules/batch/controller/KuaiShouController.java

@@ -3,18 +3,12 @@ package cn.com.ctop.kuaishou.modules.batch.controller;
 import cn.com.ctop.common.module.entity.CtopOauthToken;
 import cn.com.ctop.common.module.service.ICtopOauthTokenService;
 import cn.com.ctop.kuaishou.modules.batch.service.IKuaishouInterfaceService;
-import com.alibaba.fastjson.JSON;
 import com.alibaba.fastjson.JSONObject;
-import org.jeecg.common.util.DateUtils;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.RequestMapping;
-import org.springframework.web.bind.annotation.RequestParam;
 import org.springframework.web.bind.annotation.RestController;
-import org.springframework.web.multipart.MultipartFile;
 
-import javax.servlet.http.HttpServletRequest;
 import java.io.IOException;
-import java.util.Date;
 import java.util.HashMap;
 import java.util.Map;
 
@@ -74,29 +68,6 @@ public class KuaiShouController {
     }
 
 
-    @RequestMapping("/getCampaignList")
-    public void getCampaignList() {
-        String accessToken = "18cf38d50da314dcbd9cb6db9c43bcbf";
-        Long advertiserId = 1595407L;
-        kuaishouInterfaceService.getCampaignList(accessToken, advertiserId, DateUtils.addDay(new Date(),-1), new Date(), 1);
-
-    }
-
-    @RequestMapping("/getGroupList")
-    public void getGroupList() {
-        String accessToken = "604d2f2ffe5573c3500ffee358ba9b3c";
-        Long advertiserId = 1595407L;
-        kuaishouInterfaceService.getGroupList(accessToken, advertiserId, DateUtils.addDay(new Date(),-1), new Date(), 1);
-
-    }
-
-    @RequestMapping("/getCreativeList")
-    public void getCreativeList() {
-        String accessToken = "604d2f2ffe5573c3500ffee358ba9b3c";
-        Long advertiserId = 1595407L;
-        kuaishouInterfaceService.getCreativeList(accessToken, advertiserId, DateUtils.addDay(new Date(),-1), new Date(), 1);
-    }
-
     @RequestMapping("/getDeepConversionInfos")
     public void getDeepConversionInfos() {
         String accessToken = "cbe9caeffcc2c5ccd97a05bf909896da";
@@ -105,11 +76,6 @@ public class KuaiShouController {
     }
 
 
-
-
-
-
-
     @RequestMapping("/image/get")
     public void imageGet() {
         String accessToken = "360d43b49553684a011d6607322582b1";
@@ -135,15 +101,7 @@ public class KuaiShouController {
         kuaishouInterfaceService.getAppList(advertiserId, accessToken);
 
     }
-
-    @RequestMapping(value = "/app/update", consumes = "multipart/form-data;charset=utf-8")
-    public void appUpdate(@RequestParam("multipartFile") MultipartFile multipartFile, HttpServletRequest request) throws IOException {
-        String accessToken = "360d43b49553684a011d6607322582b1";
-        Long advertiserId = 23212L;
-        JSONObject requestJson = new JSONObject();
-        kuaishouInterfaceService.appUpdate(advertiserId, accessToken, requestJson, multipartFile, request);
-    }
-
+    
 
     @Autowired
     private ICtopOauthTokenService tokenService;
@@ -161,11 +119,7 @@ public class KuaiShouController {
         if (null != type) {
             if (type == 1) {
                 //广告主
-                if (null != temporalGranularity && "hourly".equals(temporalGranularity)) {
-                    result.put("data", kuaishouInterfaceService.getAccountHourlyReport(token.getAccessToken(), token.getAccountId(), startDate, endDate, 500, 1));
-                } else {
-                    result.put("data", kuaishouInterfaceService.getAccountDailyReport(token.getAccessToken(), token.getAccountId(), startDate, endDate, 500, 1));
-                }
+
             } else if (type == 2) {
                 //广告组
                 if (null != temporalGranularity && "hourly".equals(temporalGranularity)) {
@@ -197,18 +151,5 @@ public class KuaiShouController {
         kuaishouInterfaceService.advertiserInfo(23212L, "10b6ad966b7e958d1510a78a5315ec5c");
     }
 
-    @RequestMapping("getImageList")
-    public void getImageList() {
-        String accessToken = "604d2f2ffe5573c3500ffee358ba9b3c";
-        Long advertiserId = 1595407L;
-        kuaishouInterfaceService.getImageList(accessToken, advertiserId, new Date(), new Date(), 1);
-    }
-
-    @RequestMapping("getVideoList")
-    public void getVideoList() {
-        String accessToken = "e8959cf08e59e78b91b22aa4ed593c00";
-        Long advertiserId = 1022694L;
-        kuaishouInterfaceService.getVideoList(accessToken, advertiserId, DateUtils.addDay(new Date(), -1), new Date(), 1);
-    }
 
 }

+ 0 - 91
module-kuaishou/src/main/java/cn/com/ctop/kuaishou/modules/batch/controller/KuaiShouReportController.java

@@ -1,91 +0,0 @@
-package cn.com.ctop.kuaishou.modules.batch.controller;
-
-import cn.com.ctop.common.module.entity.CtopOauthToken;
-import cn.com.ctop.common.module.entity.UserAllocation;
-import cn.com.ctop.common.module.mapper.CtopOauthTokenMapper;
-import cn.com.ctop.common.module.mapper.UserAllocationMapper;
-import cn.com.ctop.common.module.utils.Check;
-import cn.com.ctop.kuaishou.modules.batch.service.IKuaishouInterfaceService;
-import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
-import lombok.extern.slf4j.Slf4j;
-import org.jeecg.common.util.DateUtils;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.web.bind.annotation.RequestMapping;
-import org.springframework.web.bind.annotation.RestController;
-
-import java.text.ParseException;
-import java.util.List;
-
-/**
- * @Description: 快手-本地图片保存
- * @Author: jeecg-boot
- * @Date: 2019-08-14
- * @Version: V1.0
- */
-@Slf4j
-
-@RestController
-@RequestMapping("/kuaishou/getReport")
-public class KuaiShouReportController {
-    @Autowired
-    private UserAllocationMapper userAllocationMapper;
-    @Autowired
-    private CtopOauthTokenMapper ctopOauthTokenMapper;
-    @Autowired
-    private IKuaishouInterfaceService kuaishouInterfaceService;
-
-    @RequestMapping(value = "/historyData")
-    public String queryPageList() throws ParseException {
-        QueryWrapper<UserAllocation> queryWrapper = new QueryWrapper<>();
-        queryWrapper.eq("media_id", 2);
-        queryWrapper.groupBy("account_id");
-        List<UserAllocation> userAllocations = userAllocationMapper.selectList(queryWrapper);
-        String nowDate = DateUtils.getNowDate("yyyy-MM-dd");
-        String anotherDay = DateUtils.getAnotherDay("yyyy-MM-dd", nowDate, -1);
-        if (!Check.isNull(userAllocations)) {
-            for (UserAllocation allocation : userAllocations) {
-                String beginDate = null;
-                String hourDate = null;
-                Long accountId = allocation.getAccountId();
-                if (!Check.isNull(accountId)) {
-                    QueryWrapper<CtopOauthToken> tokenQueryWrapper = new QueryWrapper<>();
-                    tokenQueryWrapper.eq("account_id", accountId);
-                    tokenQueryWrapper.eq("media_id", 2);
-                    tokenQueryWrapper.orderByDesc("create_time");
-                    tokenQueryWrapper.last("limit 1");
-                    CtopOauthToken ctopOauthToken = ctopOauthTokenMapper.selectOne(tokenQueryWrapper);
-                    if (!Check.isNull(ctopOauthToken)) {
-                        String accessToken = ctopOauthToken.getAccessToken();
-                        Long advertiserId = ctopOauthToken.getAccountId();
-                        for (int i = 0; i < 6; i++) {
-                            if (i == 0) {
-                                String monthBefore = DateUtils.getMonthBefore("yyyy-MM-dd", nowDate, -1);
-                                kuaishouInterfaceService.getAccountDailyReport(accessToken, advertiserId, monthBefore, anotherDay, 500, 1);
-                                beginDate = monthBefore;
-                            } else if (i > 0) {
-                                String startDate = DateUtils.getAnotherDay("yyyy-MM-dd", beginDate, -1);
-                                String monthBefore = DateUtils.getMonthBefore("yyyy-MM-dd", beginDate, -1);
-                                if (i == 5) {
-                                    monthBefore = DateUtils.getAnotherDay("yyyy-MM-dd", monthBefore, 4);
-                                }
-                                kuaishouInterfaceService.getAccountDailyReport(accessToken, advertiserId, monthBefore, startDate, 500, 1);
-                                beginDate = monthBefore;
-                            }
-                        }
-                        for (int i = 0; i < 7; i++) {
-                            if (i == 0) {
-                                kuaishouInterfaceService.getAccountHourlyReport(accessToken, advertiserId, nowDate, nowDate, 500, 1);
-                                hourDate = nowDate;
-                            } else if (i > 0) {
-                                String hourAnotherDay = DateUtils.getAnotherDay("yyyy-MM-dd", hourDate, -1);
-                                kuaishouInterfaceService.getAccountHourlyReport(accessToken, advertiserId, hourAnotherDay, hourAnotherDay, 500, 1);
-                                hourDate = hourAnotherDay;
-                            }
-                        }
-                    }
-                }
-            }
-        }
-        return null;
-    }
-}

+ 0 - 249
module-kuaishou/src/main/java/cn/com/ctop/kuaishou/modules/batch/controller/KuaishouReportHourlyCreativeStatisticController.java

@@ -1,249 +0,0 @@
-package cn.com.ctop.kuaishou.modules.batch.controller;
-
-import cn.com.ctop.common.module.utils.StringUtils;
-import cn.com.ctop.kuaishou.modules.report.entity.KuaishouReportHourlyCreativeStatistic;
-import cn.com.ctop.kuaishou.modules.report.service.IKuaishouReportHourlyCreativeStatisticService;
-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.Arrays;
-import java.util.List;
-import java.util.Map;
-
-/**
- * 时报清洗数据
- *
- * @author jeecg-boot
- * @version V1.0
- * @date 2019-11-01
- */
-@Slf4j
-@Api(tags = "时报清洗数据")
-@RestController
-@RequestMapping("/ctop/kuaishouReportHourlyCreativeStatistic")
-public class KuaishouReportHourlyCreativeStatisticController {
-    @Autowired
-    private IKuaishouReportHourlyCreativeStatisticService kuaishouReportHourlyCreativeStatisticService;
-
-    /**
-     * 分页列表查询
-     *
-     * @param kuaishouReportHourlyCreativeStatistic
-     * @param pageNo
-     * @param pageSize
-     * @param req
-     * @return
-     */
-    @AutoLog(value = "时报清洗数据-分页列表查询")
-    @ApiOperation(value = "时报清洗数据-分页列表查询", notes = "时报清洗数据-分页列表查询")
-    @GetMapping(value = "/list")
-    public Result<IPage<KuaishouReportHourlyCreativeStatistic>> queryPageList(KuaishouReportHourlyCreativeStatistic kuaishouReportHourlyCreativeStatistic,
-                                                                              @RequestParam(name = "pageNo", defaultValue = "1") Integer pageNo,
-                                                                              @RequestParam(name = "pageSize", defaultValue = "10") Integer pageSize,
-                                                                              HttpServletRequest req) {
-        Result<IPage<KuaishouReportHourlyCreativeStatistic>> result = new Result<IPage<KuaishouReportHourlyCreativeStatistic>>();
-        QueryWrapper<KuaishouReportHourlyCreativeStatistic> queryWrapper = QueryGenerator.initQueryWrapper(kuaishouReportHourlyCreativeStatistic, req.getParameterMap());
-        Page<KuaishouReportHourlyCreativeStatistic> page = new Page<KuaishouReportHourlyCreativeStatistic>(pageNo, pageSize);
-        IPage<KuaishouReportHourlyCreativeStatistic> pageList = kuaishouReportHourlyCreativeStatisticService.page(page, queryWrapper);
-        result.setSuccess(true);
-        result.setResult(pageList);
-        return result;
-    }
-
-    /**
-     * 添加
-     *
-     * @param kuaishouReportHourlyCreativeStatistic
-     * @return
-     */
-    @AutoLog(value = "时报清洗数据-添加")
-    @ApiOperation(value = "时报清洗数据-添加", notes = "时报清洗数据-添加")
-    @PostMapping(value = "/add")
-    public Result<KuaishouReportHourlyCreativeStatistic> add(@RequestBody KuaishouReportHourlyCreativeStatistic kuaishouReportHourlyCreativeStatistic) {
-        Result<KuaishouReportHourlyCreativeStatistic> result = new Result<KuaishouReportHourlyCreativeStatistic>();
-        try {
-            kuaishouReportHourlyCreativeStatisticService.save(kuaishouReportHourlyCreativeStatistic);
-            result.success("添加成功!");
-        } catch (Exception e) {
-            log.error(e.getMessage(), e);
-            result.error500("操作失败");
-        }
-        return result;
-    }
-
-    /**
-     * 编辑
-     *
-     * @param kuaishouReportHourlyCreativeStatistic
-     * @return
-     */
-    @AutoLog(value = "时报清洗数据-编辑")
-    @ApiOperation(value = "时报清洗数据-编辑", notes = "时报清洗数据-编辑")
-    @PutMapping(value = "/edit")
-    public Result<KuaishouReportHourlyCreativeStatistic> edit(@RequestBody KuaishouReportHourlyCreativeStatistic kuaishouReportHourlyCreativeStatistic) {
-        Result<KuaishouReportHourlyCreativeStatistic> result = new Result<KuaishouReportHourlyCreativeStatistic>();
-        KuaishouReportHourlyCreativeStatistic kuaishouReportHourlyCreativeStatisticEntity = kuaishouReportHourlyCreativeStatisticService.getById(kuaishouReportHourlyCreativeStatistic.getId());
-        if (kuaishouReportHourlyCreativeStatisticEntity == null) {
-            result.error500("未找到对应实体");
-        } else {
-            boolean ok = kuaishouReportHourlyCreativeStatisticService.updateById(kuaishouReportHourlyCreativeStatistic);
-            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 {
-            kuaishouReportHourlyCreativeStatisticService.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<KuaishouReportHourlyCreativeStatistic> deleteBatch(@RequestParam(name = "ids", required = true) String ids) {
-        Result<KuaishouReportHourlyCreativeStatistic> result = new Result<KuaishouReportHourlyCreativeStatistic>();
-        if (ids == null || "".equals(ids.trim())) {
-            result.error500("参数不识别!");
-        } else {
-            this.kuaishouReportHourlyCreativeStatisticService.removeByIds(Arrays.asList(ids.split(StringUtils.COMMA)));
-            result.success("删除成功!");
-        }
-        return result;
-    }
-
-    /**
-     * 通过id查询
-     *
-     * @param id
-     * @return
-     */
-    @AutoLog(value = "时报清洗数据-通过id查询")
-    @ApiOperation(value = "时报清洗数据-通过id查询", notes = "时报清洗数据-通过id查询")
-    @GetMapping(value = "/queryById")
-    public Result<KuaishouReportHourlyCreativeStatistic> queryById(@RequestParam(name = "id", required = true) String id) {
-        Result<KuaishouReportHourlyCreativeStatistic> result = new Result<KuaishouReportHourlyCreativeStatistic>();
-        KuaishouReportHourlyCreativeStatistic kuaishouReportHourlyCreativeStatistic = kuaishouReportHourlyCreativeStatisticService.getById(id);
-        if (kuaishouReportHourlyCreativeStatistic == null) {
-            result.error500("未找到对应实体");
-        } else {
-            result.setResult(kuaishouReportHourlyCreativeStatistic);
-            result.setSuccess(true);
-        }
-        return result;
-    }
-
-    /**
-     * 导出excel
-     *
-     * @param request
-     * @param response
-     */
-    @RequestMapping(value = "/exportXls")
-    public ModelAndView exportXls(HttpServletRequest request, HttpServletResponse response) {
-        // Step.1 组装查询条件
-        QueryWrapper<KuaishouReportHourlyCreativeStatistic> queryWrapper = null;
-        try {
-            String paramsStr = request.getParameter("paramsStr");
-            if (oConvertUtils.isNotEmpty(paramsStr)) {
-                String deString = URLDecoder.decode(paramsStr, "UTF-8");
-                KuaishouReportHourlyCreativeStatistic kuaishouReportHourlyCreativeStatistic = JSON.parseObject(deString, KuaishouReportHourlyCreativeStatistic.class);
-                queryWrapper = QueryGenerator.initQueryWrapper(kuaishouReportHourlyCreativeStatistic, request.getParameterMap());
-            }
-        } catch (UnsupportedEncodingException e) {
-            e.printStackTrace();
-        }
-
-        //Step.2 AutoPoi 导出Excel
-        ModelAndView mv = new ModelAndView(new JeecgEntityExcelView());
-        List<KuaishouReportHourlyCreativeStatistic> pageList = kuaishouReportHourlyCreativeStatisticService.list(queryWrapper);
-        //导出文件名称
-        mv.addObject(NormalExcelConstants.FILE_NAME, "时报清洗数据列表");
-        mv.addObject(NormalExcelConstants.CLASS, KuaishouReportHourlyCreativeStatistic.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<KuaishouReportHourlyCreativeStatistic> listKuaishouReportHourlyCreativeStatistics = ExcelImportUtil.importExcel(file.getInputStream(), KuaishouReportHourlyCreativeStatistic.class, params);
-                kuaishouReportHourlyCreativeStatisticService.saveBatch(listKuaishouReportHourlyCreativeStatistics);
-                return Result.ok("文件导入成功!数据行数:" + listKuaishouReportHourlyCreativeStatistics.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("文件导入失败!");
-    }
-
-}

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

@@ -7,12 +7,9 @@ import cn.com.ctop.kuaishou.modules.material.entity.KuaishouResultToken;
 import cn.com.ctop.kuaishou.modules.report.entity.*;
 import com.alibaba.fastjson.JSONArray;
 import com.alibaba.fastjson.JSONObject;
-import org.springframework.web.multipart.MultipartFile;
 
-import javax.servlet.http.HttpServletRequest;
 import java.text.ParseException;
 import java.util.Date;
-import java.util.List;
 import java.util.Map;
 
 /**
@@ -20,24 +17,92 @@ import java.util.Map;
  * 2019年11月12日11:08:52
  */
 public interface IKuaishouInterfaceService {
-    KuaishouResult<KuaishouReportHourlyAccount> getAccountHourlyReport(String accessToken, Long advertiserId, String startDate, String endDate, int pageSize, int pageNum);
-
-    KuaishouResult<KuaishouReportDailyAccount> getAccountDailyReport(String accessToken, Long advertiserId, String startDate, String endDate, int pageSize, int pageNum);
 
+    /**
+     * 计划日报
+     *
+     * @param accessToken
+     * @param advertiserId
+     * @param startDate
+     * @param endDate
+     * @param pageSize
+     * @param pageNum
+     * @return
+     */
     KuaishouResult<KuaishouReportDailyCampaign> getCampaignDailyReport(String accessToken, Long advertiserId, String startDate, String endDate, int pageSize, int pageNum);
 
+    /**
+     * 计划时报
+     *
+     * @param accessToken
+     * @param advertiserId
+     * @param startDate
+     * @param endDate
+     * @param pageSize
+     * @param pageNum
+     * @return
+     */
     KuaishouResult<KuaishouReportHourlyCampaign> getCampaignHourlyReport(String accessToken, Long advertiserId, String startDate, String endDate, int pageSize, int pageNum);
 
+    /**
+     * 组日报
+     *
+     * @param accessToken
+     * @param advertiserId
+     * @param startDate
+     * @param endDate
+     * @param pageSize
+     * @param pageNum
+     * @return
+     */
     KuaishouResult<KuaishouReportDailyGroup> getGroupDailyReport(String accessToken, Long advertiserId, String startDate, String endDate, int pageSize, int pageNum);
 
+    /**
+     * 组时报
+     *
+     * @param accessToken
+     * @param advertiserId
+     * @param startDate
+     * @param endDate
+     * @param pageSize
+     * @param pageNum
+     * @return
+     */
     KuaishouResult<KuaishouReportHourlyGroup> getGroupHourlyReport(String accessToken, Long advertiserId, String startDate, String endDate, int pageSize, int pageNum);
 
+    /**
+     * 创意日报 暂停使用
+     *
+     * @param accessToken
+     * @param advertiserId
+     * @param startDate
+     * @param endDate
+     * @param pageSize
+     * @param pageNum
+     * @return
+     */
     KuaishouResult<KuaishouReportDailyCreative> getCreativeDailyReport(String accessToken, Long advertiserId, String startDate, String endDate, int pageSize, int pageNum);
 
+    /**
+     * 创意时报 暂停使用
+     *
+     * @param accessToken
+     * @param advertiserId
+     * @param startDate
+     * @param endDate
+     * @param pageSize
+     * @param pageNum
+     * @return
+     */
     KuaishouResult<KuaishouReportHourlyCreative> getCreativeHourlyReport(String accessToken, Long advertiserId, String startDate, String endDate, int pageSize, int pageNum);
 
-    void loadAllKuaishouData(List<CtopOauthToken> tokens);
 
+    /**
+     * 获取历史数据
+     *
+     * @param token
+     * @throws ParseException
+     */
     void loadKuaishouDataSingle(CtopOauthToken token) throws ParseException;
 
     /**
@@ -63,15 +128,6 @@ public interface IKuaishouInterfaceService {
 
 
     /**
-     * 获取广告计划信息  全量
-     *
-     * @param accessToken
-     * @param advertiserId
-     */
-    void getCampaignList(String accessToken, Long advertiserId, Date startDate, Date endDate, Integer page);
-
-
-    /**
      * 获取广告计划信息  单条
      *
      * @param accessToken
@@ -79,14 +135,6 @@ public interface IKuaishouInterfaceService {
      */
     void getCampaign(String accessToken, Long advertiserId, Long campaignId);
 
-    /**
-     * 获取广告组信息 全量
-     *
-     * @param accessToken
-     * @param advertiserId
-     * @param page
-     */
-    void getGroupList(String accessToken, Long advertiserId, Date startDate, Date endDate, Integer page);
 
     /**
      * 获取广告组信息 单条
@@ -98,17 +146,24 @@ public interface IKuaishouInterfaceService {
     void getGroup(String accessToken, Long advertiserId, Long unitId);
 
 
+    /**
+     * 获取创意列表
+     *
+     * @param token
+     * @param startDate
+     * @param endDate
+     */
     void getCreativeList(CtopOauthToken token, Date startDate, Date endDate);
 
-    void getVideoInfo(String accessToken, Long advertiserId, String photoId);
-
     /**
-     * 获取创意信息
+     * 获取视频信息
      *
      * @param accessToken
      * @param advertiserId
+     * @param photoId
      */
-    void getCreativeList(String accessToken, Long advertiserId, Date startDate, Date endDate, Integer page);
+    void getVideoInfo(String accessToken, Long advertiserId, String photoId);
+
 
     /**
      * 获取token
@@ -127,6 +182,13 @@ public interface IKuaishouInterfaceService {
      */
     Map<String, Object> getDeepConversionInfos(Long advertiserId, String accessToken);
 
+    /**
+     * 取可选的深度转化类型
+     *
+     * @param advertiserId
+     * @param accessToken
+     * @return
+     */
     JSONObject getDeepConversionInfosV2(Long advertiserId, String accessToken);
 
 
@@ -139,7 +201,14 @@ public interface IKuaishouInterfaceService {
      */
     Map<String, Object> creativeCreate(String accessToken, Long advertiserId, JSONObject requestJson);
 
-    void getCreativeByCreativeId(String accessToken, Long advertiserId, Date startDate, Date endDate, Integer page, Long creativeId);
+    /**
+     * 根据创意id 获取创意信息
+     *
+     * @param accessToken
+     * @param advertiserId
+     * @param creativeId
+     */
+    void getCreativeByCreativeId(String accessToken, Long advertiserId, Long creativeId);
 
     /**
      * 文件上传
@@ -216,17 +285,6 @@ public interface IKuaishouInterfaceService {
 
 
     /**
-     * 修改应用
-     *
-     * @param advertiserId
-     * @param accessToken
-     * @param requestJson
-     * @param multipartFile
-     * @param request
-     */
-    void appUpdate(Long advertiserId, String accessToken, JSONObject requestJson, MultipartFile multipartFile, HttpServletRequest request);
-
-    /**
      * 创建 url应用
      *
      * @param accountId
@@ -245,59 +303,117 @@ public interface IKuaishouInterfaceService {
      */
     Map<String, Object> advertiserInfo(Long accountId, String accessToken);
 
+    /**
+     * 获取视频列表
+     *
+     * @param token
+     * @param startDate
+     * @param endDate
+     */
     void getVideoList(CtopOauthToken token, Date startDate, Date endDate);
 
-    void getVideoList(String token, Long advertiserId, Date startDate, Date endDate, int page);
 
+    /**
+     * 获取广告主分天报表
+     *
+     * @param token
+     * @param startDate
+     * @param endDate
+     */
     void getAdvertiserReportDaily(CtopOauthToken token, Date startDate, Date endDate);
 
+    /**
+     * 获取计划分天报表
+     *
+     * @param token
+     * @param startDate
+     * @param endDate
+     */
     void getAdvertiserCampaignReportDaily(CtopOauthToken token, Date startDate, Date endDate);
 
+    /**
+     * 获取广告计划分天报表 暂停使用
+     *
+     * @param token
+     * @param startDate
+     * @param endDate
+     */
     void getAdvertiserGroupReportDaily(CtopOauthToken token, Date startDate, Date endDate);
 
+    /**
+     * 获取创意分天报表 暂停使用
+     *
+     * @param token
+     * @param startDate
+     * @param endDate
+     * @param campaignIds
+     */
     void getAdvertiserCreativeReportDaily(CtopOauthToken token, Date startDate, Date endDate, JSONArray campaignIds);
 
+    /**
+     * 获取广告主时报
+     *
+     * @param token
+     * @param startDate
+     * @param endDate
+     */
     void getAdvertiserReportHourly(CtopOauthToken token, Date startDate, Date endDate);
 
+    /**
+     * 获取计划时报
+     *
+     * @param token
+     * @param startDate
+     * @param endDate
+     */
     void getAdvertiserCampaignReportHourly(CtopOauthToken token, Date startDate, Date endDate);
 
+    /**
+     * 获取组时报
+     *
+     * @param token
+     * @param startDate
+     * @param endDate
+     */
     void getAdvertiserGroupReportHourly(CtopOauthToken token, Date startDate, Date endDate);
 
+    /**
+     * 获取创意时报 暂停使用
+     *
+     * @param token
+     * @param startDate
+     * @param endDate
+     */
     void getAdvertiserCreativeReportHourly(CtopOauthToken token, Date startDate, Date endDate);
 
+    /**
+     * 获取计划列表
+     *
+     * @param token
+     * @param startDate
+     * @param endDate
+     */
     void getCampaignList(CtopOauthToken token, Date startDate, Date endDate);
 
-    void getGroupList(CtopOauthToken token, Date startDate, Date endDate);
-
-    void loadData() throws InterruptedException;
-
-    void updateCreativeReportHourlyStatistic(CtopOauthToken token, Date getDate);
-
-    void deleteHourlyReport(Date deleteDate);
-
     /**
-     * 获取快手图片列表
+     * 获取组列表
      *
      * @param token
      * @param startDate
      * @param endDate
      */
-    void getImageList(CtopOauthToken token, Date startDate, Date endDate);
-
-
-    void getImageList2(CtopOauthToken token, Date startDate, Date endDate, Integer page);
+    void getGroupList(CtopOauthToken token, Date startDate, Date endDate);
 
 
     /**
-     * 获取快手图片列表--测试使用
+     * 获取快手图片列表
      *
      * @param token
-     * @param accountId
      * @param startDate
      * @param endDate
-     * @param page
      */
-    void getImageList(String token, Long accountId, Date startDate, Date endDate, int page);
+    void getImageList(CtopOauthToken token, Date startDate, Date endDate);
+
 
     /**
      * 获取账户余额
@@ -346,16 +462,13 @@ public interface IKuaishouInterfaceService {
     JSONArray getAppSearch(Long accountId, String accessToken, String appName);
 
 
-    void getVideoList2(CtopOauthToken token, Date startDate, Date endDate, Integer page);
-
-    void getCreativeList2(CtopOauthToken token, Date startDate, Date endDate, Integer page);
-
-    void getCreative(String token, Long advertiserId, Long creativeId);
-
-
-    void getAdvertiserCreativeReportDailyV2(Long campaignId, CtopOauthToken ctopOauthToken, Date startDate, Date endDate);
-
-
+    /**
+     * 获取素造素材列表
+     *
+     * @param token
+     * @param accountId
+     * @param page
+     */
     void getSuZaoList(String token, Long accountId, int page);
 
 

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

@@ -434,7 +434,7 @@ public class KuaiShouUpdateServiceImpl implements IKuaiShouUpdateService {
                         deleteMap.put("creative_id", creativeId);
                         creativeMapper.deleteByMap(deleteMap);
                     } else {
-                        interfaceService.getCreative(token, advertiserId, creativeId);
+                        interfaceService.getCreativeByCreativeId(token, advertiserId, creativeId);
                     }
 
                     returnMap.put("code", 0);
@@ -646,7 +646,7 @@ public class KuaiShouUpdateServiceImpl implements IKuaiShouUpdateService {
 
                         try {
                             Thread.sleep(500);
-                            interfaceService.getCreative(accessToken, creativeJson.getLong("advertiser_id"), data.getLong("creative_id"));
+                            interfaceService.getCreativeByCreativeId(accessToken, creativeJson.getLong("advertiser_id"), data.getLong("creative_id"));
                         } catch (InterruptedException e) {
                             e.printStackTrace();
                         }

File diff suppressed because it is too large
+ 118 - 1009
module-kuaishou/src/main/java/cn/com/ctop/kuaishou/modules/batch/service/impl/KuaishouInterfaceServiceImpl.java


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

@@ -1,18 +0,0 @@
-package cn.com.ctop.kuaishou.modules.report.mapper;
-
-import cn.com.ctop.kuaishou.modules.report.entity.KuaishouReportHourlyCreativeStatistic;
-import com.baomidou.mybatisplus.core.mapper.BaseMapper;
-import org.apache.ibatis.annotations.Param;
-
-/**
- * 时报清洗数据
- *
- * @author: jeecg-boot
- * @date: 2019-11-01
- * @cersion: V1.0
- */
-public interface KuaishouReportHourlyCreativeStatisticMapper extends BaseMapper<KuaishouReportHourlyCreativeStatistic> {
-    void updateCreativeReportHourlyStatistic(@Param(value = "accountId") Long accountId, @Param(value = "date") String dateString);
-
-    void deleteHourlyReport(@Param(value = "date") String dateString);
-}

+ 0 - 157
module-kuaishou/src/main/java/cn/com/ctop/kuaishou/modules/report/mapper/xml/KuaishouReportHourlyCreativeStatisticMapper.xml

@@ -1,157 +0,0 @@
-<?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.kuaishou.modules.report.mapper.KuaishouReportHourlyCreativeStatisticMapper">
-	<insert id="updateCreativeReportHourlyStatistic">
-        REPLACE INTO `ctop_kuaishou_report_hourly_creative_statistic` (
-	`id`,
-	`account_id`,
-	`account_name`,
-	`unit_id`,
-	`unit_name`,
-	`campaign_id`,
-	`campaign_name`,
-	`creative_id`,
-	`creative_name`,
-	`stat_date`,
-	`stat_hour`,
-	`charge`,
-	`photo_click`,
-	`photo_show`,
-	`aclick`,
-	`bclick`,
-	`photo_click_ratio`,
-	`action_ratio`,
-	`impression_1k_cost`,
-	`event_credit_grant_landing_page_cost`,
-	`event_credit_grant_landing_page`,
-	`event_jin_jian_landing_page_cost`,
-	`event_jin_jian_landing_page`,
-	`form_action_ratio`,
-	`form_cost`,
-	`form_count`,
-	`event_order_paid_cost`,
-	`event_order_paid_purchase_amount`,
-	`event_order_paid`,
-	`event_credit_grant_app_ratio`,
-	`event_credit_grant_app_cost`,
-	`event_credit_grant_app`,
-	`event_pay_purchase_amount_first_day`,
-	`event_jin_jian_app_cost`,
-	`event_jin_jian_app`,
-	`event_register_cost`,
-	`event_register`,
-	`event_pay_roi`,
-	`event_pay_purchase_amount`,
-	`event_pay`,
-	`event_pay_first_day_roi`,
-	`event_pay_first_day`,
-	`photo_click_cost`,
-	`action_cost`,
-	`share`,
-	`comment`,
-	`photo_like`,
-	`follow`,
-	`report`,
-	`block`,
-	`negative`,
-	`activation`,
-	`submit`,
-	`cancel_follow`,
-	`download_started`,
-	`download_completed`,
-	`create_time`,
-	`update_time`,
-	`signature`,
-	`url`
-) SELECT
-	*
-FROM
-	(
-		SELECT
-			ckrhc.`id`,
-			ckrhc.`account_id`,
-			cua.account_name,
-			ckg.unit_id,
-			ckg.unit_name,
-			ckc.campaign_id,
-			ckc.campaign_name,
-			ckrhc.`creative_id`,
-			ckr.creative_name,
-			ckrhc.`stat_date`,
-			ckrhc.`stat_hour`,
-			ckrhc.`charge`,
-			ckrhc.`photo_click`,
-			ckrhc.`photo_show`,
-			ckrhc.`aclick`,
-			ckrhc.`bclick`,
-			ckrhc.`photo_click_ratio`,
-			ckrhc.`action_ratio`,
-			ckrhc.`impression_1k_cost`,
-			ckrhc.`event_credit_grant_landing_page_cost`,
-			ckrhc.`event_credit_grant_landing_page`,
-			ckrhc.`event_jin_jian_landing_page_cost`,
-			ckrhc.`event_jin_jian_landing_page`,
-			ckrhc.`form_action_ratio`,
-			ckrhc.`form_cost`,
-			ckrhc.`form_count`,
-			ckrhc.`event_order_paid_cost`,
-			ckrhc.`event_order_paid_purchase_amount`,
-			ckrhc.`event_order_paid`,
-			ckrhc.`event_credit_grant_app_ratio`,
-			ckrhc.`event_credit_grant_app_cost`,
-			ckrhc.`event_credit_grant_app`,
-			ckrhc.`event_pay_purchase_amount_first_day`,
-			ckrhc.`event_jin_jian_app_cost`,
-			ckrhc.`event_jin_jian_app`,
-			ckrhc.`event_register_cost`,
-			ckrhc.`event_register`,
-			ckrhc.`event_pay_roi`,
-			ckrhc.`event_pay_purchase_amount`,
-			ckrhc.`event_pay`,
-			ckrhc.`event_pay_first_day_roi`,
-			ckrhc.`event_pay_first_day`,
-			ckrhc.`photo_click_cost`,
-			ckrhc.`action_cost`,
-			ckrhc.`share`,
-			ckrhc.`comment`,
-			ckrhc.`photo_like`,
-			ckrhc.`follow`,
-			ckrhc.`report`,
-			ckrhc.`block`,
-			ckrhc.`negative`,
-			ckrhc.`activation`,
-			ckrhc.`submit`,
-			ckrhc.`cancel_follow`,
-			ckrhc.`download_started`,
-			ckrhc.`download_completed`,
-			ckrhc.`create_time`,
-			ckrhc.`update_time`,
-			ckvg.signature,
-			ckvg.url
-		FROM
-			(
-				SELECT
-					*
-				FROM
-					ctop_kuaishou_report_hourly_creative
-				WHERE
-					account_id = #{accountId} and stat_date = #{date}) ckrhc,
-					ctop_kuaishou_creative ckr,
-					ctop_user_allocation cua,
-					ctop_kuaishou_campaign ckc,
-					ctop_kuaishou_group ckg,
-					ctop_kuaishou_video_get ckvg
-				WHERE
-					ckrhc.creative_id = ckr.creative_id
-				AND ckr.account_id = cua.account_id
-				AND ckr.campaign_id = ckc.campaign_id
-				AND ckr.unit_id = ckg.unit_id
-				AND ckr.photo_id = ckvg.photo_id
-				AND ckr.account_id = ckvg.account_id
-			) t
-    </insert>
-
-	<delete id="deleteHourlyReport">
-		delete from ctop_kuaishou_report_hourly_creative where stat_date &lt;= #{date}
-	</delete>
-</mapper>

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

@@ -1,22 +0,0 @@
-package cn.com.ctop.kuaishou.modules.report.service;
-
-import cn.com.ctop.common.module.entity.CtopOauthToken;
-import cn.com.ctop.kuaishou.modules.report.entity.KuaishouReportHourlyCreativeStatistic;
-import com.baomidou.mybatisplus.extension.service.IService;
-
-import java.util.Date;
-
-/**
- * 时报清洗数据
- *
- * @author jeecg-boot
- * @version V1.0
- * @date 2019-11-01
- */
-public interface IKuaishouReportHourlyCreativeStatisticService extends IService<KuaishouReportHourlyCreativeStatistic> {
-
-    void updateCreativeReportHourlyStatistic(CtopOauthToken token, Date getDate);
-
-    void deleteHourlyReport(Date deleteDate);
-    void deleteHourlyReportByStatDate(String deleteDate);
-}

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

@@ -1,44 +0,0 @@
-package cn.com.ctop.kuaishou.modules.report.service.impl;
-
-import cn.com.ctop.common.module.entity.CtopOauthToken;
-import cn.com.ctop.kuaishou.modules.report.entity.KuaishouReportHourlyCreativeStatistic;
-import cn.com.ctop.kuaishou.modules.report.mapper.KuaishouReportHourlyCreativeStatisticMapper;
-import cn.com.ctop.kuaishou.modules.report.service.IKuaishouReportHourlyCreativeStatisticService;
-import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.stereotype.Service;
-
-import java.text.SimpleDateFormat;
-import java.util.Date;
-
-/**
- * 时报清洗数据
- *
- * @author jeecg-boot
- * @version V1.0
- * @date 2019-11-01
- */
-@Service
-public class KuaishouReportHourlyCreativeStatisticServiceImpl extends ServiceImpl<KuaishouReportHourlyCreativeStatisticMapper, KuaishouReportHourlyCreativeStatistic> implements IKuaishouReportHourlyCreativeStatisticService {
-    @Autowired
-    private KuaishouReportHourlyCreativeStatisticMapper statisticMapper;
-
-    @Override
-    public void updateCreativeReportHourlyStatistic(CtopOauthToken token, Date getDate) {
-        SimpleDateFormat format = new SimpleDateFormat("yyyy-MM-dd");
-        String dateString = format.format(getDate);
-        statisticMapper.updateCreativeReportHourlyStatistic(token.getAccountId(), dateString);
-    }
-
-    @Override
-    public void deleteHourlyReport(Date deleteDate) {
-        SimpleDateFormat format = new SimpleDateFormat("yyyy-MM-dd");
-        String dateString = format.format(deleteDate);
-        statisticMapper.deleteHourlyReport(dateString);
-    }
-
-    @Override
-    public void deleteHourlyReportByStatDate(String deleteDate) {
-        statisticMapper.deleteHourlyReport(deleteDate);
-    }
-}

+ 0 - 1
moudule-eureca/src/main/java/cn/com/ctop/eureca/server/ServerApplication.java

@@ -11,5 +11,4 @@ public class ServerApplication {
     public static void main(String[] args) {
         SpringApplication.run(ServerApplication.class, args);
     }
-
 }