瀏覽代碼

快手图片消耗,头条图片消耗数据报表

syh 4 年之前
父節點
當前提交
fbaff29e5d

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

@@ -56,7 +56,7 @@ public class ImageReportDailyServiceImpl implements IImageReportDailyService {
             pageSize = 10;
         }
         PageHelper.startPage(pageNumber,pageSize);
-        List<BytedanceImageCostVO> vos = bytedanceReportMaterialDailyMapper.bytedanceImageCost(startDate,endDate,accountList,code.trim());
+        List<BytedanceImageCostVO> vos = bytedanceReportMaterialDailyMapper.bytedanceImageCost(startDate,endDate,accountList,code);
         PageInfo<BytedanceImageCostVO> pageInfo = new PageInfo<>(vos);
         result.put("data",pageInfo);
         ResultMapUtils.setResultMap(result, StatusCode.COMMON_SUCCESS);
@@ -82,7 +82,7 @@ public class ImageReportDailyServiceImpl implements IImageReportDailyService {
         if(null == code||code.trim().equals("")){
             code = null;
         }
-        List<BytedanceImageCostVOEntity>details = bytedanceReportMaterialDailyMapper.bytedanceImageCostEntity(startDate,endDate,accountList,code.trim());
+        List<BytedanceImageCostVOEntity>details = bytedanceReportMaterialDailyMapper.bytedanceImageCostEntity(startDate,endDate,accountList,code);
         sheetInfoVo.setDetails(details);
         return sheetInfoVo;
     }
@@ -115,7 +115,7 @@ public class ImageReportDailyServiceImpl implements IImageReportDailyService {
             pageSize = 10;
         }
         PageHelper.startPage(pageNumber,pageSize);
-        List<KuaishouImageCostVO> vos = kuaishouReportDailyImageMapper.imageCost(startDate,endDate,accountList,code.trim());
+        List<KuaishouImageCostVO> vos = kuaishouReportDailyImageMapper.imageCost(startDate,endDate,accountList,code);
         PageInfo<KuaishouImageCostVO> pageInfo = new PageInfo<>(vos);
         result.put("data",pageInfo);
         ResultMapUtils.setResultMap(result, StatusCode.COMMON_SUCCESS);
@@ -142,7 +142,7 @@ public class ImageReportDailyServiceImpl implements IImageReportDailyService {
             code = null;
         }
         sheetInfoVo.setSheetName("快手图片消耗统计");
-        List<KuaishouImageCostVOEntity> details = kuaishouReportDailyImageMapper.imageCostEntity(startDate,endDate,accountList,code.trim());
+        List<KuaishouImageCostVOEntity> details = kuaishouReportDailyImageMapper.imageCostEntity(startDate,endDate,accountList,code);
         sheetInfoVo.setDetails(details);
         return sheetInfoVo;
     }

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

@@ -182,3 +182,6 @@ oss:
     replace-value: oss-cn-beijing-internal
     replace-old-value: oss-cn-beijing
     download: D://mnt//image//
+zip:
+  local:
+    download-path: D://mnt//data//

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

@@ -2,7 +2,6 @@ spring:
   profiles:
 #    active: wps
     active: @activatedProperties@
-
 swagger:
   production: false
   basic:

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

@@ -1,17 +1,10 @@
 package org.jeecg;
 
-import cn.com.ctop.check.component.execute.GroovyScriptExecutor;
-import cn.com.ctop.check.entity.CtopCheckTaskList;
-import cn.com.ctop.check.service.ICtopCheckTaskListService;
 import cn.com.ctop.common.module.entity.BindAccountLogin;
 import cn.com.ctop.common.module.entity.CtopOauthToken;
 import cn.com.ctop.common.module.entity.UserAllocation;
 import cn.com.ctop.common.module.message.handle.impl.EmailSendMsgHandle;
-import cn.com.ctop.common.module.service.IBindAccountLoginService;
-import cn.com.ctop.common.module.service.ICtopOauthTokenService;
-import cn.com.ctop.common.module.service.IUReportExportService;
-import cn.com.ctop.common.module.service.IUReportService;
-import cn.com.ctop.common.module.service.IUserAllocationService;
+import cn.com.ctop.common.module.service.*;
 import cn.com.ctop.common.module.utils.CtopAdConstant;
 import cn.com.ctop.kuaishou.modules.batch.service.IKuaiShouDailyReportTaskService;
 import cn.com.ctop.kuaishou.modules.batch.service.IKuaiShouHistoryReportTaskService;
@@ -33,7 +26,6 @@ import org.springframework.boot.test.context.SpringBootTest;
 import org.springframework.test.context.ActiveProfiles;
 import org.springframework.test.context.junit4.SpringRunner;
 
-import java.io.IOException;
 import java.util.Date;
 import java.util.HashMap;
 import java.util.List;
@@ -69,16 +61,9 @@ public class SampleTest {
         List<CtopOauthToken> list = oauthTokenService.list(queryWrapper);
         for (CtopOauthToken token : list) {
             kuaiShouHistoryReportTaskService.createTask(token.getAccountId(), token.getAccessToken(), "2020-09-20", "2020-09-20", "daily");
-
         }
     }
 
-    @Test
-    public void getTaskList() {
-        kuaiShouHistoryReportTaskService.getTaskList();
-    }
-
-
     @Autowired
     private IBindAccountLoginService bindAccountLoginService;
     @Autowired
@@ -142,11 +127,7 @@ public class SampleTest {
             for (int i = 0; i < 1; i++) {
                 CtopOauthToken token = oauthTokenService.getTokenByAccountId(allocation.getAccountId());
                 Date getDate = DateUtils.addDay(new Date(), -i);
-//                reportService.getAdvertiserReport(token, getDate, getDate, CtopAdConstant.BYTEDANCE_REPORT_TYPE_DAILY);
                 reportService.getAdvertiserReport(token, getDate, getDate, CtopAdConstant.BYTEDANCE_REPORT_TYPE_HOURLY);
-
-//                reportService.getAdvertiserCampaignReport(token, getDate, getDate, CtopAdConstant.BYTEDANCE_REPORT_TYPE_DAILY);
-//                reportService.getAdvertiserCampaignReport(token, getDate, getDate, CtopAdConstant.BYTEDANCE_REPORT_TYPE_HOURLY);
             }
         }
     }
@@ -223,20 +204,6 @@ public class SampleTest {
         }
     }
 
-    @Autowired
-    private GroovyScriptExecutor groovyScriptExecutor;
-
-    @Autowired
-    private ICtopCheckTaskListService checkTaskListService;
-
-    @Test
-    public void checkDataStateJobTest() {
-        //查询需要检查的任务列表
-        List<CtopCheckTaskList> ctopCheckTaskList = checkTaskListService.queryExecuteList("checkDataStateJob");
-        if (ctopCheckTaskList != null) {
-            ctopCheckTaskList.forEach(it -> groovyScriptExecutor.execute(it));
-        }
-    }
 
     @Test
     public void loadAccountData() {
@@ -272,15 +239,6 @@ public class SampleTest {
     @Autowired
     private IBytedanceReportService bytedanceReportService;
 
-    @Test
-    public void loaddata(){
-        for(int i=0;i<30;i++){
-            Date getDate = DateUtils.addDay(new Date(), -i);
-            String date = DateUtils.formatDate(getDate);
-            videoReportDailyService.videoInfoList(date, date);
-        }
-    }
-
     @Autowired
     private IByteDanceVideoReportDailyService videoReportDailyService;
     @Test

+ 3 - 3
module-crawler/src/main/java/cn/com/ctop/crawler/modules/douyin/service/DouyinMusicService.java

@@ -3,7 +3,7 @@ package cn.com.ctop.crawler.modules.douyin.service;
 import cn.com.ctop.common.module.entity.MusicInfo;
 
 public interface DouyinMusicService {
-    public void getHotMusicList();
-    public MusicInfo getMusicInfo(MusicInfo musicInfo);
-    public void parseTag(MusicInfo musicInfo);
+    void getHotMusicList();
+    MusicInfo getMusicInfo(MusicInfo musicInfo);
+    void parseTag(MusicInfo musicInfo);
 }