Procházet zdrojové kódy

添加消耗核对逻辑

songyh před 4 roky
rodič
revize
2f06757376
21 změnil soubory, kde provedl 610 přidání a 122 odebrání
  1. 2 0
      jeecg-boot-module-system/src/main/java/org/jeecg/JeecgApplication.java
  2. 25 0
      jeecg-boot-module-system/src/main/java/org/jeecg/modules/ctop/controller/TestController.java
  3. 10 10
      jeecg-boot-module-system/src/main/resources/application-wps.yml
  4. 52 54
      jeecg-boot-module-system/src/test/java/org/jeecg/SampleTest.java
  5. 166 0
      module-toutiao/src/main/java/cn/com/ctop/toutiao/modules/report/controller/BytedanceCheckReportTaskInfoController.java
  6. 65 0
      module-toutiao/src/main/java/cn/com/ctop/toutiao/modules/report/entity/BytedanceCheckReportTaskInfo.java
  7. 7 4
      module-toutiao/src/main/java/cn/com/ctop/toutiao/modules/report/mapper/BytedanceCampaignDailyReportMapper.java
  8. 14 0
      module-toutiao/src/main/java/cn/com/ctop/toutiao/modules/report/mapper/BytedanceCheckReportTaskInfoMapper.java
  9. 5 4
      module-toutiao/src/main/java/cn/com/ctop/toutiao/modules/report/mapper/BytedanceReportMaterialDailyMapper.java
  10. 12 0
      module-toutiao/src/main/java/cn/com/ctop/toutiao/modules/report/mapper/xml/BytedanceCampaignDailyReportMapper.xml
  11. 5 0
      module-toutiao/src/main/java/cn/com/ctop/toutiao/modules/report/mapper/xml/BytedanceCheckReportTaskInfoMapper.xml
  12. 24 0
      module-toutiao/src/main/java/cn/com/ctop/toutiao/modules/report/mapper/xml/BytedanceReportMaterialDailyMapper.xml
  13. 2 0
      module-toutiao/src/main/java/cn/com/ctop/toutiao/modules/report/service/IBytedanceAdvertiserDailyReportService.java
  14. 2 0
      module-toutiao/src/main/java/cn/com/ctop/toutiao/modules/report/service/IBytedanceCampaignDailyReportService.java
  15. 24 0
      module-toutiao/src/main/java/cn/com/ctop/toutiao/modules/report/service/IBytedanceCheckReportTaskInfoService.java
  16. 5 0
      module-toutiao/src/main/java/cn/com/ctop/toutiao/modules/report/service/IBytedanceReportMaterialDailyService.java
  17. 11 39
      module-toutiao/src/main/java/cn/com/ctop/toutiao/modules/report/service/impl/BytedanceAdvertiserDailyReportServiceImpl.java
  18. 13 7
      module-toutiao/src/main/java/cn/com/ctop/toutiao/modules/report/service/impl/BytedanceCampaignDailyReportServiceImpl.java
  19. 151 0
      module-toutiao/src/main/java/cn/com/ctop/toutiao/modules/report/service/impl/BytedanceCheckReportTaskInfoServiceImpl.java
  20. 13 2
      module-toutiao/src/main/java/cn/com/ctop/toutiao/modules/report/service/impl/BytedanceReportMaterialDailyServiceImpl.java
  21. 2 2
      pom.xml

+ 2 - 0
jeecg-boot-module-system/src/main/java/org/jeecg/JeecgApplication.java

@@ -7,6 +7,8 @@ import org.apache.tomcat.util.scan.StandardJarScanner;
 import org.jeecg.common.constant.AccountReportConstants;
 import org.springframework.boot.SpringApplication;
 import org.springframework.boot.autoconfigure.SpringBootApplication;
+import org.springframework.boot.autoconfigure.data.mongo.MongoRepositoriesAutoConfiguration;
+import org.springframework.boot.autoconfigure.data.redis.RedisRepositoriesAutoConfiguration;
 import org.springframework.boot.web.embedded.tomcat.TomcatServletWebServerFactory;
 import org.springframework.context.ConfigurableApplicationContext;
 import org.springframework.context.annotation.Bean;

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

@@ -29,6 +29,7 @@ import cn.com.ctop.manage.modules.material.service.IMaterialUploadService;
 import cn.com.ctop.toutiao.modules.link.service.IETLReportBytedanceVideoService;
 import cn.com.ctop.toutiao.modules.material.service.IByteDanceAdvertiserDataService;
 import cn.com.ctop.toutiao.modules.material.service.IBytedanceEffectVideoInfoService;
+import cn.com.ctop.toutiao.modules.report.entity.BytedanceCheckReportTaskInfo;
 import cn.com.ctop.toutiao.modules.report.service.*;
 import com.alibaba.fastjson.JSONArray;
 import com.alibaba.fastjson.JSONObject;
@@ -1541,4 +1542,28 @@ public class TestController {
         ResultMapUtils.setResultMap(result, StatusCode.COMMON_SUCCESS);
         return result;
     }
+    @Autowired
+    private IBytedanceCheckReportTaskInfoService checkReportTaskInfoService;
+
+    @GetMapping("testInitCheckDataTask")
+    public Map<String, Object> testInitCheckDataTask(String date) throws ParseException {
+        Map<String, Object> result = new HashMap<>();
+        checkReportTaskInfoService.initTask(date);
+        ResultMapUtils.setResultMap(result, StatusCode.COMMON_SUCCESS);
+        return result;
+    }
+
+
+    @GetMapping("testCheckCost")
+    public Map<String, Object> testCheckCost(String date) throws ParseException {
+        Map<String, Object> result = new HashMap<>();
+        List<BytedanceCheckReportTaskInfo>taskInfos = checkReportTaskInfoService.getListByParams(null,"2021-06-01");
+        if(null!=taskInfos&&!taskInfos.isEmpty()){
+            for (BytedanceCheckReportTaskInfo taskInfo:taskInfos) {
+                checkReportTaskInfoService.checkCost(taskInfo);
+            }
+        }
+        ResultMapUtils.setResultMap(result, StatusCode.COMMON_SUCCESS);
+        return result;
+    }
 }

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

@@ -95,21 +95,21 @@ spring:
         # 通过connectProperties属性来打开mergeSql功能;慢SQL记录
         connectionProperties: druid.stat.mergeSql\=true;druid.stat.slowSqlMillis\=5000
       datasource:
-        master:
-          url: jdbc:mysql://139.186.27.96:4000/jiaoyang?characterEncoding=UTF-8&useUnicode=true&useSSL=false
-          username: data
-          password: hcst@2021
-          driver-class-name: com.mysql.jdbc.Driver
+#        master:
+#          url: jdbc:mysql://139.186.27.96:4000/jiaoyang?characterEncoding=UTF-8&useUnicode=true&useSSL=false
+#          username: data
+#          password: hcst@2021
+#          driver-class-name: com.mysql.jdbc.Driver
 #        master:
 #          url: jdbc:mysql://139.186.151.174:3306/jeecg-boot?characterEncoding=UTF-8&useUnicode=true
 #          username: hcst
 #          password: hcst@2020
 #          driver-class-name: com.mysql.jdbc.Driver
-#        master:
-#          url: jdbc:mysql://139.186.27.96:4000/jeecg-boot?characterEncoding=UTF-8&useUnicode=true&useSSL=false
-#          username: data
-#          password: hcst@2021
-#          driver-class-name: com.mysql.jdbc.Driver
+        master:
+          url: jdbc:mysql://139.186.27.96:4000/jeecg-boot?characterEncoding=UTF-8&useUnicode=true&useSSL=false
+          username: data
+          password: hcst@2021
+          driver-class-name: com.mysql.jdbc.Driver
   #redis 配置
   redis:
     database: 0

+ 52 - 54
jeecg-boot-module-system/src/test/java/org/jeecg/SampleTest.java

@@ -9,12 +9,12 @@ 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.EtlKuaishouAccountMaterialReportDailyMapper;
 import cn.com.ctop.kuaishou.modules.report.service.IKuaishouReportDailyImageService;
-import cn.com.ctop.oa.modules.service.IAppchatCreateService;
 import cn.com.ctop.oa.modules.service.IWechatNoListService;
 import cn.com.ctop.oa.modules.service.IWechatUserListService;
 import cn.com.ctop.toutiao.modules.link.service.IETLReportBytedanceVideoService;
 import cn.com.ctop.toutiao.modules.material.service.IByteDanceAdvertiserDataService;
 import cn.com.ctop.toutiao.modules.material.service.IByteDanceCampaignService;
+import cn.com.ctop.toutiao.modules.report.entity.BytedanceCheckReportTaskInfo;
 import cn.com.ctop.toutiao.modules.report.service.*;
 import lombok.extern.slf4j.Slf4j;
 import org.jeecg.common.util.DateUtils;
@@ -41,19 +41,45 @@ import java.util.concurrent.Executors;
 @Slf4j
 public class SampleTest {
     @Autowired
+    private IBytedanceVideoEtlInfoService bytedanceVideoEtlInfoService;
+    @Autowired
+    IBytedanceVideoReportService bytedanceVideoReportService;
+    @Autowired
+    IETLReportBytedanceVideoService ietlReportBytedanceVideoService;
+    @Autowired
+    IKuaishouReportDailyImageService kuaishouReportDailyImageService;
+    @Autowired
+    IRuleByteDanceAccountService ruleByteDanceAccountService;
+    @Autowired
     private ICtopOauthTokenService tokenService;
     @Autowired
     private IBindAccountLoginService bindAccountLoginService;
     @Autowired
     private IKuaishouWebInterfaceService kuaishouWebInterfaceService;
     @Autowired
-    private IKuaishouInterfaceService kuaishouInterfaceService;
+    private IWechatUserListService wechatUserInfoService;
+    @Autowired
+    private IByteDanceAdvertiserDataService advertiserDataService;
     @Autowired
-    private RedisUtil redisUtil;
+    private IWechatNoListService wechatNoListService;
     @Autowired
-    private IAppchatCreateService appchatCreateService;
+    private IETLReportBytedanceVideoService bytedanceVideoService;
     @Autowired
-    private IWechatUserListService wechatUserInfoService;
+    private IByteDanceVideoReportDailyService videoReportDailyService;
+    @Resource
+    private EtlKuaishouAccountMaterialReportDailyMapper etlKuaishouAccountMaterialReportDailyMapper;
+    @Autowired
+    private IByteDanceCampaignService campaignService;
+    @Autowired
+    private IReportService reportService;
+    @Resource
+    private IBytedanceCheckReportTaskInfoService checkReportTaskInfoService;
+    @Autowired
+    private IEtlBytedanceReportVideoDailyService etlBytedanceReportVideoDailyService;
+    //    @Autowired
+    //    private IAppchatCreateService appchatCreateService;
+
+
 
 
     @Test
@@ -61,7 +87,7 @@ public class SampleTest {
         wechatUserInfoService.getUserList();
 
         // appchatCreateService.createAppChat(null, null, null);
-        appchatCreateService.getChatInfo(null);
+//        appchatCreateService.getChatInfo(null);
        /* redisUtil.set("11sdfhgjksdhfjksdhfjksdhfkjsjkfhkjsddhfjksdhfkjhsjkfhjkshfjksdhfjksdhfjkshdjkfhsjkdfhkjsd1","hahahaha",5);
         Object o = redisUtil.get("11sdfhgjksdhfjksdhfjksdhfkjsjkfhkjsddhfjksdhfkjhsjkfhjkshfjksdhfjksdhfjkshdjkfhsjkdfhkjsd1");
         System.err.println(o);*/
@@ -102,11 +128,11 @@ public class SampleTest {
         Date parse = dateFormat.parse("2021-04-02");
         kuaishouInterfaceService.getAdvertiserReportDaily(tokenByAccountId, parse, parse, null);*/
     }
-
-
     static ExecutorService executorService = null;
     static CountDownLatch countDownLatch = null;
 
+
+
     @Test
     public void deleteKuaishouComment() {
         Long start = System.currentTimeMillis();
@@ -133,11 +159,6 @@ public class SampleTest {
         }
     }
 
-    @Autowired
-    private IBytedanceReportService bytedanceReportService;
-
-    @Autowired
-    private IByteDanceAdvertiserDataService advertiserDataService;
 
     @Test
     public void loadBytedanceVideoReportData() {
@@ -145,10 +166,7 @@ public class SampleTest {
         advertiserDataService.getMaterialList(token);
     }
 
-    @Autowired
-    private IWechatNoListService wechatNoListService;
-    @Autowired
-    private IETLReportBytedanceVideoService bytedanceVideoService;
+
 
     @Test
     public void etlBytedanceVideoInfo() {
@@ -173,8 +191,6 @@ public class SampleTest {
     }
 
 
-    @Autowired
-    private IByteDanceVideoReportDailyService videoReportDailyService;
 
     @Test
     public void formatVideoReportData() {
@@ -185,17 +201,6 @@ public class SampleTest {
         }
     }
 
-    @Autowired
-    private IBytedanceVideoEtlInfoService bytedanceVideoEtlInfoService;
-    @Autowired
-    IBytedanceVideoReportService bytedanceVideoReportService;
-    @Autowired
-    IETLReportBytedanceVideoService ietlReportBytedanceVideoService;
-    @Autowired
-    IKuaishouReportDailyImageService kuaishouReportDailyImageService;
-    @Autowired
-    IRuleByteDanceAccountService ruleByteDanceAccountService;
-
     @Test
     public void loadBDAccoutData() {
         Date startDate = DateUtils.addDay(new Date(), -2000);
@@ -205,16 +210,12 @@ public class SampleTest {
         }
     }
 
-    @Resource
-    private EtlKuaishouAccountMaterialReportDailyMapper etlKuaishouAccountMaterialReportDailyMapper;
 
     @Test
     public void etlKuaishouVideoInfo() {
         etlKuaishouAccountMaterialReportDailyMapper.etlKuaishouAccountMaterialReportDailyData(DateUtils.formatDate());
     }
 
-    @Autowired
-    private IByteDanceCampaignService campaignService;
 
     @Test
     public void testLoadBytedanceCampaign() {
@@ -224,17 +225,12 @@ public class SampleTest {
         }
     }
 
-    @Autowired
-    private IEtlBytedanceReportVideoDailyService etlBytedanceReportVideoDailyService;
 
     @Test
     public void etlBytedanceVideoReportInfo() throws Exception {
         etlBytedanceReportVideoDailyService.etlBytedanceVideo();
     }
 
-    @Autowired
-    private IReportService reportService;
-
     @Test
     public void loadBytedanceAccountReport() {
         /**
@@ -243,20 +239,22 @@ public class SampleTest {
          * 1696734332089352
          * 1696734333251598
          */
-        CtopOauthToken token1 = tokenService.getTokenByAccountId(1692555408132110L);
-        reportService.getAdvertiserReport(token1, DateUtils.parseDate("2021-05-01", "yyyy-MM-dd"), DateUtils.parseDate("2021-05-12", "yyyy-MM-dd"), CtopAdConstant.BYTEDANCE_REPORT_TYPE_DAILY);
-        CtopOauthToken token2 = tokenService.getTokenByAccountId(1692555631713287L);
-        reportService.getAdvertiserReport(token2, DateUtils.parseDate("2021-05-01", "yyyy-MM-dd"), DateUtils.parseDate("2021-05-12", "yyyy-MM-dd"), CtopAdConstant.BYTEDANCE_REPORT_TYPE_DAILY);
-        CtopOauthToken token3 = tokenService.getTokenByAccountId(1696734332089352L);
-        reportService.getAdvertiserReport(token3, DateUtils.parseDate("2021-05-01", "yyyy-MM-dd"), DateUtils.parseDate("2021-05-12", "yyyy-MM-dd"), CtopAdConstant.BYTEDANCE_REPORT_TYPE_DAILY);
-        CtopOauthToken token4 = tokenService.getTokenByAccountId(1696734333251598L);
-        reportService.getAdvertiserReport(token4, DateUtils.parseDate("2021-05-01", "yyyy-MM-dd"), DateUtils.parseDate("2021-05-12", "yyyy-MM-dd"), CtopAdConstant.BYTEDANCE_REPORT_TYPE_DAILY);
-
-        CtopOauthToken token5 = tokenService.getTokenByAccountId(10129666L);
-        kuaishouInterfaceService.getAdvertiserReportDaily(token5, DateUtils.parseDate("2021-05-07", "yyyy-MM-dd"), DateUtils.parseDate("2021-05-11", "yyyy-MM-dd"), null);
-        CtopOauthToken token6 = tokenService.getTokenByAccountId(10097961L);
-        kuaishouInterfaceService.getAdvertiserReportDaily(token6, DateUtils.parseDate("2021-05-07", "yyyy-MM-dd"), DateUtils.parseDate("2021-05-11", "yyyy-MM-dd"), null);
-        CtopOauthToken token7 = tokenService.getTokenByAccountId(10098039L);
-        kuaishouInterfaceService.getAdvertiserReportDaily(token7, DateUtils.parseDate("2021-05-07", "yyyy-MM-dd"), DateUtils.parseDate("2021-05-11", "yyyy-MM-dd"), null);
+        CtopOauthToken token1 = tokenService.getTokenByAccountId(1693648201498637L);
+        reportService.getAdvertiserReport(token1, DateUtils.parseDate("2021-04-01", "yyyy-MM-dd"), DateUtils.parseDate("2021-04-12", "yyyy-MM-dd"), CtopAdConstant.BYTEDANCE_REPORT_TYPE_DAILY);
+    }
+
+    @Test
+    public void checkCostData(){
+        //1:初始化
+//        checkReportTaskInfoService.initTask("2021-06-01");
+        //2: checkCost
+        List<BytedanceCheckReportTaskInfo>taskInfos = checkReportTaskInfoService.getListByParams(null,"2021-06-01");
+        if(null!=taskInfos&&!taskInfos.isEmpty()){
+            for (BytedanceCheckReportTaskInfo task:taskInfos) {
+                checkReportTaskInfoService.checkCost(task);
+            }
+            System.out.println("数据获取完成");
+        }
+        //3:重复异常数据
     }
 }

+ 166 - 0
module-toutiao/src/main/java/cn/com/ctop/toutiao/modules/report/controller/BytedanceCheckReportTaskInfoController.java

@@ -0,0 +1,166 @@
+package cn.com.ctop.toutiao.modules.report.controller;
+
+import cn.com.ctop.common.module.utils.QueryGenerator;
+import cn.com.ctop.toutiao.modules.report.entity.BytedanceCheckReportTaskInfo;
+import cn.com.ctop.toutiao.modules.report.service.IBytedanceCheckReportTaskInfoService;
+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.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
+ * @date   2021-06-07
+ * @version V1.0
+ */
+@Slf4j
+@Api(tags="头条数据检查任务记录")
+@RestController
+@RequestMapping("/ctop/bytedanceCheckReportTaskInfo")
+public class BytedanceCheckReportTaskInfoController {
+	@Autowired
+	private IBytedanceCheckReportTaskInfoService bytedanceCheckReportTaskInfoService;
+
+	/**
+	  * 分页列表查询
+	 * @param bytedanceCheckReportTaskInfo
+	 * @param pageNo
+	 * @param pageSize
+	 * @param req
+	 * @return
+	 */
+	@ApiOperation(value="头条数据检查任务记录-分页列表查询", notes="头条数据检查任务记录-分页列表查询")
+	@GetMapping(value = "/list")
+	public Result<IPage<BytedanceCheckReportTaskInfo>> queryPageList(BytedanceCheckReportTaskInfo bytedanceCheckReportTaskInfo,
+																	 @RequestParam(name="pageNo", defaultValue="1") Integer pageNo,
+																	 @RequestParam(name="pageSize", defaultValue="10") Integer pageSize,
+																	 HttpServletRequest req) {
+		Result<IPage<BytedanceCheckReportTaskInfo>> result = new Result<>();
+		QueryWrapper<BytedanceCheckReportTaskInfo> queryWrapper = QueryGenerator.initQueryWrapper(bytedanceCheckReportTaskInfo, req.getParameterMap());
+		Page<BytedanceCheckReportTaskInfo> page = new Page<>(pageNo, pageSize);
+		IPage<BytedanceCheckReportTaskInfo> pageList = bytedanceCheckReportTaskInfoService.page(page, queryWrapper);
+		result.setSuccess(true);
+		result.setResult(pageList);
+		return result;
+	}
+
+	/**
+	  *   添加
+	 * @param bytedanceCheckReportTaskInfo
+	 * @return
+	 */
+	@ApiOperation(value="头条数据检查任务记录-添加", notes="头条数据检查任务记录-添加")
+	@PostMapping(value = "/add")
+	public Result<BytedanceCheckReportTaskInfo> add(@RequestBody BytedanceCheckReportTaskInfo bytedanceCheckReportTaskInfo) {
+		Result<BytedanceCheckReportTaskInfo> result = new Result<>();
+		try {
+			bytedanceCheckReportTaskInfoService.save(bytedanceCheckReportTaskInfo);
+			result.success("添加成功!");
+		} catch (Exception e) {
+			log.error(e.getMessage(),e);
+			result.error500("操作失败");
+		}
+		return result;
+	}
+
+	/**
+	  *  编辑
+	 * @param bytedanceCheckReportTaskInfo
+	 * @return
+	 */
+	@ApiOperation(value="头条数据检查任务记录-编辑", notes="头条数据检查任务记录-编辑")
+	@PutMapping(value = "/edit")
+	public Result<BytedanceCheckReportTaskInfo> edit(@RequestBody BytedanceCheckReportTaskInfo bytedanceCheckReportTaskInfo) {
+		Result<BytedanceCheckReportTaskInfo> result = new Result<BytedanceCheckReportTaskInfo>();
+		BytedanceCheckReportTaskInfo bytedanceCheckReportTaskInfoEntity = bytedanceCheckReportTaskInfoService.getById(bytedanceCheckReportTaskInfo.getId());
+		if(bytedanceCheckReportTaskInfoEntity==null) {
+			result.error500("未找到对应实体");
+		}else {
+			boolean ok = bytedanceCheckReportTaskInfoService.updateById(bytedanceCheckReportTaskInfo);
+			if(ok) {
+				result.success("修改成功!");
+			}
+		}
+
+		return result;
+	}
+
+	/**
+	  *   通过id删除
+	 * @param id
+	 * @return
+	 */
+	@ApiOperation(value="头条数据检查任务记录-通过id删除", notes="头条数据检查任务记录-通过id删除")
+	@DeleteMapping(value = "/delete")
+	public Result<?> delete(@RequestParam(name="id") String id) {
+		try {
+			bytedanceCheckReportTaskInfoService.removeById(id);
+		} catch (Exception e) {
+			log.error("删除失败",e.getMessage());
+			return Result.error("删除失败!");
+		}
+		return Result.ok("删除成功!");
+	}
+
+	/**
+	 *  批量删除
+	 * @param ids
+	 * @return
+	 */
+	@ApiOperation(value="头条数据检查任务记录-批量删除", notes="头条数据检查任务记录-批量删除")
+	@DeleteMapping(value = "/deleteBatch")
+	public Result<BytedanceCheckReportTaskInfo> deleteBatch(@RequestParam(name="ids") String ids) {
+		Result<BytedanceCheckReportTaskInfo> result = new Result<>();
+		if(ids==null || "".equals(ids.trim())) {
+			result.error500("参数不识别!");
+		}else {
+			this.bytedanceCheckReportTaskInfoService.removeByIds(Arrays.asList(ids.split(",")));
+			result.success("删除成功!");
+		}
+		return result;
+	}
+
+	/**
+	  * 通过id查询
+	 * @param id
+	 * @return
+	 */
+	@ApiOperation(value="头条数据检查任务记录-通过id查询", notes="头条数据检查任务记录-通过id查询")
+	@GetMapping(value = "/queryById")
+	public Result<BytedanceCheckReportTaskInfo> queryById(@RequestParam(name="id",required=true) String id) {
+		Result<BytedanceCheckReportTaskInfo> result = new Result<>();
+		BytedanceCheckReportTaskInfo bytedanceCheckReportTaskInfo = bytedanceCheckReportTaskInfoService.getById(id);
+		if(bytedanceCheckReportTaskInfo==null) {
+			result.error500("未找到对应实体");
+		}else {
+			result.setResult(bytedanceCheckReportTaskInfo);
+			result.setSuccess(true);
+		}
+		return result;
+	}
+}

+ 65 - 0
module-toutiao/src/main/java/cn/com/ctop/toutiao/modules/report/entity/BytedanceCheckReportTaskInfo.java

@@ -0,0 +1,65 @@
+package cn.com.ctop.toutiao.modules.report.entity;
+
+import java.io.Serializable;
+import java.math.BigDecimal;
+import java.util.Date;
+
+import cn.com.ctop.common.module.entity.CtopOauthToken;
+import com.baomidou.mybatisplus.annotation.IdType;
+import com.baomidou.mybatisplus.annotation.TableId;
+import com.baomidou.mybatisplus.annotation.TableName;
+import com.baomidou.mybatisplus.annotation.TableField;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+import lombok.experimental.Accessors;
+import com.fasterxml.jackson.annotation.JsonFormat;
+import org.springframework.format.annotation.DateTimeFormat;
+import org.jeecgframework.poi.excel.annotation.Excel;
+
+/**
+ * 头条数据检查任务记录
+ * @author jeecg-boot
+ * @date   2021-06-07
+ * @version V1.0
+ */
+@Data
+@TableName("ctop_bytedance_check_report_task_info")
+public class BytedanceCheckReportTaskInfo {
+    
+	/**id*/
+	@TableId(type = IdType.AUTO)
+	private Long id;
+	/**accountId*/
+	private Long accountId;
+	private BigDecimal accountCost;
+	private BigDecimal campaignCost;
+	private BigDecimal matCost;
+	private BigDecimal imageCost;
+	/**stateDate*/
+	private String stateDate;
+	/**status*/
+	private Integer status;
+	/**desc*/
+	private String description;
+	/**createTime*/
+	private Date createTime;
+	/**updateTime*/
+	private Date updateTime;
+
+	public BytedanceCheckReportTaskInfo(){
+
+	}
+	public BytedanceCheckReportTaskInfo(CtopOauthToken token, String date) {
+		this.accountId = token.getAccountId();
+		this.accountCost = BigDecimal.ZERO;
+		this.campaignCost = BigDecimal.ZERO;
+		this.matCost = BigDecimal.ZERO;
+		this.imageCost = BigDecimal.ZERO;
+		this.status = 1;
+		this.stateDate = date;
+		this.createTime = new Date();
+		this.updateTime = new Date();
+	}
+}

+ 7 - 4
module-toutiao/src/main/java/cn/com/ctop/toutiao/modules/report/mapper/BytedanceCampaignDailyReportMapper.java

@@ -1,14 +1,17 @@
 package cn.com.ctop.toutiao.modules.report.mapper;
 
 import cn.com.ctop.toutiao.modules.report.entity.BytedanceCampaignDailyReport;
+import cn.com.ctop.toutiao.modules.report.entity.BytedanceCheckReportTaskInfo;
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import org.apache.ibatis.annotations.Param;
 
 /**
- * @Description: 广告组日报表信息
- * @Author: jeecg-boot
- * @Date: 2019-09-11
- * @Version: V1.0
+ * 广告组日报表信息
+ * @author jeecg-boot
+ * 2019-09-11
+ * @version V1.0
  */
 public interface BytedanceCampaignDailyReportMapper extends BaseMapper<BytedanceCampaignDailyReport> {
 
+    BytedanceCheckReportTaskInfo checkCampaignCostByParams(@Param(value = "accountId") Long accountId, @Param(value = "stateDate")String stateDate);
 }

+ 14 - 0
module-toutiao/src/main/java/cn/com/ctop/toutiao/modules/report/mapper/BytedanceCheckReportTaskInfoMapper.java

@@ -0,0 +1,14 @@
+package cn.com.ctop.toutiao.modules.report.mapper;
+
+import cn.com.ctop.toutiao.modules.report.entity.BytedanceCheckReportTaskInfo;
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+
+/**
+ * 头条数据检查任务记录
+ * @author jeecg-boot
+ * 2021-06-07
+ * @version V1.0
+ */
+public interface BytedanceCheckReportTaskInfoMapper extends BaseMapper<BytedanceCheckReportTaskInfo> {
+
+}

+ 5 - 4
module-toutiao/src/main/java/cn/com/ctop/toutiao/modules/report/mapper/BytedanceReportMaterialDailyMapper.java

@@ -3,10 +3,7 @@ package cn.com.ctop.toutiao.modules.report.mapper;
 import cn.com.ctop.common.module.vo.BytedanceImageCostVO;
 import cn.com.ctop.common.module.vo.BytedanceImageCostVOEntity;
 import cn.com.ctop.toutiao.modules.material.vo.BytedanceVideoVo;
-import cn.com.ctop.toutiao.modules.report.entity.BytedanceReportMaterialDaily;
-import cn.com.ctop.toutiao.modules.report.entity.BytedanceReportMaterialRetry;
-import cn.com.ctop.toutiao.modules.report.entity.BytedanceReportVideoMaterialDaily;
-import cn.com.ctop.toutiao.modules.report.entity.BytedanceVideoEtlInfo;
+import cn.com.ctop.toutiao.modules.report.entity.*;
 import com.alibaba.fastjson.JSONArray;
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 import org.apache.ibatis.annotations.Param;
@@ -63,4 +60,8 @@ public interface BytedanceReportMaterialDailyMapper extends BaseMapper<Bytedance
     List<BytedanceVideoEtlInfo> getSignatureByDate(@Param(value = "date") String date);
 
     BytedanceVideoEtlInfo getEtlDataByParams(@Param("signature")String signature, @Param("date")String date);
+
+    BytedanceCheckReportTaskInfo checkMatCostByParams(@Param("accountId")Long accountId, @Param("stateDate")String stateDate);
+
+    BytedanceCheckReportTaskInfo checkImageCostByParams(@Param("accountId")Long accountId, @Param("stateDate")String stateDate);
 }

+ 12 - 0
module-toutiao/src/main/java/cn/com/ctop/toutiao/modules/report/mapper/xml/BytedanceCampaignDailyReportMapper.xml

@@ -2,4 +2,16 @@
 <!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.report.mapper.BytedanceCampaignDailyReportMapper">
 
+    <select id="checkCampaignCostByParams"
+            resultType="cn.com.ctop.toutiao.modules.report.entity.BytedanceCheckReportTaskInfo">
+        select
+               sum(cost) as campaign_cost,
+               stat_datetime as state_date
+        from
+             ctop_bytedance_report_campaign_daily
+        where
+              advertiser_id = #{accountId}
+          and
+              stat_datetime = #{stateDate}
+    </select>
 </mapper>

+ 5 - 0
module-toutiao/src/main/java/cn/com/ctop/toutiao/modules/report/mapper/xml/BytedanceCheckReportTaskInfoMapper.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.report.mapper.BytedanceCheckReportTaskInfoMapper">
+
+</mapper>

+ 24 - 0
module-toutiao/src/main/java/cn/com/ctop/toutiao/modules/report/mapper/xml/BytedanceReportMaterialDailyMapper.xml

@@ -450,6 +450,30 @@ where a.plane_id is not null and a.plane_name is null
             report.stat_datetime&lt;= #{date}
         group by video.signature;
     </select>
+    <select id="checkMatCostByParams"
+            resultType="cn.com.ctop.toutiao.modules.report.entity.BytedanceCheckReportTaskInfo">
+        select
+               sum(cost) as mat_cost,
+               stat_datetime as state_date
+        from
+             ctop_bytedance_report_material_daily
+        where
+              account_id = #{accountId}
+          and
+              stat_datetime = #{stateDate}
+    </select>
+    <select id="checkImageCostByParams"
+            resultType="cn.com.ctop.toutiao.modules.report.entity.BytedanceCheckReportTaskInfo">
+        select
+            sum(cost) as image_cost,
+            stat_datetime as state_date
+        from
+            ctop_bytedance_report_image_daily
+        where
+            account_id = #{accountId}
+          and
+            stat_datetime = #{stateDate}
+    </select>
 
     <insert id="replaceIntoVideoMaterialBatch">
         REPLACE INTO ctop_bytedance_report_video_material_daily

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

@@ -1,6 +1,7 @@
 package cn.com.ctop.toutiao.modules.report.service;
 
 import cn.com.ctop.toutiao.modules.report.entity.BytedanceAdvertiserDailyReport;
+import cn.com.ctop.toutiao.modules.report.entity.BytedanceCheckReportTaskInfo;
 import com.baomidou.mybatisplus.extension.service.IService;
 
 /**
@@ -11,4 +12,5 @@ import com.baomidou.mybatisplus.extension.service.IService;
  */
 public interface IBytedanceAdvertiserDailyReportService extends IService<BytedanceAdvertiserDailyReport> {
 
+    BytedanceAdvertiserDailyReport getByParams(Long accountId, String stateDate);
 }

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

@@ -1,6 +1,7 @@
 package cn.com.ctop.toutiao.modules.report.service;
 
 import cn.com.ctop.toutiao.modules.report.entity.BytedanceCampaignDailyReport;
+import cn.com.ctop.toutiao.modules.report.entity.BytedanceCheckReportTaskInfo;
 import com.baomidou.mybatisplus.extension.service.IService;
 
 /**
@@ -11,4 +12,5 @@ import com.baomidou.mybatisplus.extension.service.IService;
  */
 public interface IBytedanceCampaignDailyReportService extends IService<BytedanceCampaignDailyReport> {
 
+    BytedanceCheckReportTaskInfo checkCampaignCostByParams(Long accountId, String stateDate);
 }

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

@@ -0,0 +1,24 @@
+package cn.com.ctop.toutiao.modules.report.service;
+
+import cn.com.ctop.toutiao.modules.report.entity.BytedanceCheckReportTaskInfo;
+import com.baomidou.mybatisplus.extension.service.IService;
+
+import java.util.List;
+
+/**
+ * 头条数据检查任务记录
+ * @author jeecg-boot
+ * 2021-06-07
+ * @version V1.0
+ */
+public interface IBytedanceCheckReportTaskInfoService extends IService<BytedanceCheckReportTaskInfo> {
+    void initTask(String date);
+
+    BytedanceCheckReportTaskInfo getInfoByParams(Long accountId, String date);
+
+    List<BytedanceCheckReportTaskInfo> getListByParams(Long accountId, String date);
+
+    void checkCost(BytedanceCheckReportTaskInfo taskInfo);
+
+    void reloadData(BytedanceCheckReportTaskInfo taskInfo);
+}

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

@@ -1,6 +1,7 @@
 package cn.com.ctop.toutiao.modules.report.service;
 
 import cn.com.ctop.toutiao.modules.material.vo.BytedanceVideoVo;
+import cn.com.ctop.toutiao.modules.report.entity.BytedanceCheckReportTaskInfo;
 import cn.com.ctop.toutiao.modules.report.entity.BytedanceReportMaterialDaily;
 import cn.com.ctop.toutiao.modules.report.entity.BytedanceVideoEtlInfo;
 import com.baomidou.mybatisplus.extension.service.IService;
@@ -19,4 +20,8 @@ public interface IBytedanceReportMaterialDailyService extends IService<Bytedance
     List<BytedanceVideoEtlInfo> getSignatureByDate(String date);
 
     BytedanceVideoEtlInfo getEtlDataByParams(String signature, String date);
+
+    BytedanceCheckReportTaskInfo checkMatCostByParams(Long accountId, String stateDate);
+
+    BytedanceCheckReportTaskInfo checkImageCostByParams(Long accountId, String stateDate);
 }

+ 11 - 39
module-toutiao/src/main/java/cn/com/ctop/toutiao/modules/report/service/impl/BytedanceAdvertiserDailyReportServiceImpl.java

@@ -4,6 +4,7 @@ import cn.com.ctop.toutiao.modules.report.DTO.AccountReportDTO;
 import cn.com.ctop.toutiao.modules.report.entity.BytedanceAdvertiserDailyReport;
 import cn.com.ctop.toutiao.modules.report.mapper.BytedanceAdvertiserDailyReportMapper;
 import cn.com.ctop.toutiao.modules.report.service.IBytedanceAdvertiserDailyReportService;
+import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import org.springframework.context.annotation.Primary;
 import org.springframework.stereotype.Service;
@@ -21,45 +22,16 @@ import java.util.List;
 @Primary
 
 public class BytedanceAdvertiserDailyReportServiceImpl extends ServiceImpl<BytedanceAdvertiserDailyReportMapper, BytedanceAdvertiserDailyReport> implements IBytedanceAdvertiserDailyReportService {
-
-    public void bytedanceAccountReportStatistics(AccountReportDTO accountReportDTO){
-        String startDate = accountReportDTO.getStartDate();
-        String endDate = accountReportDTO.getEndDate();
-        BigDecimal discount = accountReportDTO.getDiscount();  //仅头条内广可用 折扣
-        BigDecimal point = accountReportDTO.getPoint();  //仅头条可用 返点
-        List<Long> accountIds = accountReportDTO.getAccountIds();
-        Integer statHour = accountReportDTO.getStatHour();
-        Integer type = accountReportDTO.getType();  //1今天  2昨天和其他单天 3近一周、15天、1月、3月按钮 4六个月、一年 5输入框输入的除了单天的时间段
-
-        //type=1分时操作
-        if(type == 1){
-
-        }else if(type == 2){
-
-        }else if(type == 3 || type == 5){
-
+    @Override
+    public BytedanceAdvertiserDailyReport getByParams(Long accountId, String stateDate) {
+        QueryWrapper<BytedanceAdvertiserDailyReport> queryWrapper = new QueryWrapper<>();
+        if(null!=accountId&&accountId!=0){
+            queryWrapper.eq("advertiser_id",accountId);
         }
-
-
-
-
-
-
-
-    }
-
-
-
-
-    public void bytedanceAccountReportListAndCollect(AccountReportDTO accountReportDTO){
-
-
-
-
-
-
-
+        if(null!=stateDate&&!"".equals(stateDate.trim())){
+            queryWrapper.eq("stat_datetime",stateDate+" 00:00:00");
+        }
+        queryWrapper.orderByDesc("id").last("limit 1");
+        return this.getOne(queryWrapper);
     }
-
-
 }

+ 13 - 7
module-toutiao/src/main/java/cn/com/ctop/toutiao/modules/report/service/impl/BytedanceCampaignDailyReportServiceImpl.java

@@ -1,21 +1,27 @@
 package cn.com.ctop.toutiao.modules.report.service.impl;
 
 import cn.com.ctop.toutiao.modules.report.entity.BytedanceCampaignDailyReport;
+import cn.com.ctop.toutiao.modules.report.entity.BytedanceCheckReportTaskInfo;
 import cn.com.ctop.toutiao.modules.report.mapper.BytedanceCampaignDailyReportMapper;
 import cn.com.ctop.toutiao.modules.report.service.IBytedanceCampaignDailyReportService;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import org.springframework.context.annotation.Primary;
 import org.springframework.stereotype.Service;
 
+import javax.annotation.Resource;
+
 /**
- * @Description: 广告组日报表信息
- * @Author: jeecg-boot
- * @Date: 2019-09-11
- * @Version: V1.0
+ * 广告组日报表信息
+ * @author jeecg-boot
+ * @date 2019-09-11
+ * @version V1.0
  */
 @Service
-@Primary
-
 public class BytedanceCampaignDailyReportServiceImpl extends ServiceImpl<BytedanceCampaignDailyReportMapper, BytedanceCampaignDailyReport> implements IBytedanceCampaignDailyReportService {
-
+    @Resource
+    private BytedanceCampaignDailyReportMapper campaignDailyReportMapper;
+    @Override
+    public BytedanceCheckReportTaskInfo checkCampaignCostByParams(Long accountId, String stateDate) {
+        return campaignDailyReportMapper.checkCampaignCostByParams(accountId,stateDate);
+    }
 }

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

@@ -0,0 +1,151 @@
+package cn.com.ctop.toutiao.modules.report.service.impl;
+
+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.toutiao.modules.report.entity.BytedanceAdvertiserDailyReport;
+import cn.com.ctop.toutiao.modules.report.entity.BytedanceCheckReportTaskInfo;
+import cn.com.ctop.toutiao.modules.report.mapper.BytedanceCheckReportTaskInfoMapper;
+import cn.com.ctop.toutiao.modules.report.service.*;
+import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import org.jeecg.common.util.DateUtils;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Service;
+
+import java.math.BigDecimal;
+import java.util.Date;
+import java.util.List;
+
+/**
+ * 头条数据检查任务记录
+ * @author jeecg-boot
+ * 2021-06-07
+ * @version V1.0
+ */
+@Service
+public class BytedanceCheckReportTaskInfoServiceImpl extends ServiceImpl<BytedanceCheckReportTaskInfoMapper, BytedanceCheckReportTaskInfo> implements IBytedanceCheckReportTaskInfoService {
+    @Autowired
+    private ICtopOauthTokenService tokenService;
+    @Autowired
+    private IBytedanceAdvertiserDailyReportService advertiserDailyReportService;
+    @Autowired
+    private IBytedanceCampaignDailyReportService campaignDailyReportService;
+    @Autowired
+    private IReportService reportService;
+    @Autowired
+    private IBytedanceReportMaterialDailyService materialDailyService;
+    @Autowired
+    private IBytedanceReportService bytedanceReportService;
+
+    @Override
+    public void initTask(String date) {
+        List<CtopOauthToken> tokens = tokenService.selectToutiaoToken();
+        if(null != tokens&&!tokens.isEmpty()){
+            tokens.forEach(token->{
+                this.saveOrUpdateTaskInfo(token,date);
+            });
+        }
+    }
+
+    private void saveOrUpdateTaskInfo(CtopOauthToken token, String date) {
+        BytedanceCheckReportTaskInfo taskInfo = this.getInfoByParams(token.getAccountId(),date);
+        if(null == taskInfo){
+            taskInfo = new BytedanceCheckReportTaskInfo(token,date);
+            this.save(taskInfo);
+        }
+    }
+
+    @Override
+    public BytedanceCheckReportTaskInfo getInfoByParams(Long accountId, String date) {
+        QueryWrapper<BytedanceCheckReportTaskInfo> queryWrapper = new QueryWrapper<>();
+        if(null!=accountId&&accountId!=0){
+            queryWrapper.eq("account_id",accountId);
+        }
+        if(null!=date&&!"".equals(date.trim())){
+            queryWrapper.eq("state_date",date);
+        }
+        queryWrapper.orderByDesc("id").last("limit 1");
+        return this.getOne(queryWrapper);
+    }
+
+    @Override
+    public List<BytedanceCheckReportTaskInfo> getListByParams(Long accountId, String date) {
+        QueryWrapper<BytedanceCheckReportTaskInfo> queryWrapper = new QueryWrapper<>();
+        if(null!=accountId&&accountId!=0){
+            queryWrapper.eq("account_id",accountId);
+        }
+        if(null!=date&&!"".equals(date.trim())){
+            queryWrapper.eq("state_date",date);
+        }
+        queryWrapper.orderByDesc("id");
+        return this.list(queryWrapper);
+    }
+
+    @Override
+    public void checkCost(BytedanceCheckReportTaskInfo taskInfo){
+        System.out.println(taskInfo.getAccountId()+"数据获取开始");
+        CtopOauthToken token = tokenService.getTokenByAccountId(taskInfo.getAccountId());
+        if(null == token){
+            taskInfo.setStatus(-1);
+            taskInfo.setDescription("token数据不存在!");
+            taskInfo.setUpdateTime(new Date());
+            this.saveOrUpdate(taskInfo);
+            return;
+        }
+        //1:获取账户消耗数据
+        BytedanceAdvertiserDailyReport dailyReport = advertiserDailyReportService.getByParams(taskInfo.getAccountId(),taskInfo.getStateDate());
+        if(null!=dailyReport){
+            taskInfo.setAccountCost(dailyReport.getCost());
+        }
+        //2:获取组消耗数据
+        BytedanceCheckReportTaskInfo campaignTaskInfo = campaignDailyReportService.checkCampaignCostByParams(taskInfo.getAccountId(),taskInfo.getStateDate());
+        if(null!=campaignTaskInfo){
+            taskInfo.setCampaignCost(campaignTaskInfo.getCampaignCost());
+        }
+        //3:获取素材消耗数据
+        BytedanceCheckReportTaskInfo matTaskInfo = materialDailyService.checkMatCostByParams(taskInfo.getAccountId(),taskInfo.getStateDate());
+        if(null!=matTaskInfo){
+            taskInfo.setMatCost(matTaskInfo.getMatCost());
+        }
+        //4:获取图片消耗数据
+        BytedanceCheckReportTaskInfo imageTaskInfo = materialDailyService.checkImageCostByParams(taskInfo.getAccountId(),taskInfo.getStateDate());
+        if(null!=imageTaskInfo){
+            taskInfo.setImageCost(imageTaskInfo.getImageCost());
+        }
+        if(taskInfo.getAccountCost().compareTo(taskInfo.getCampaignCost())!=0){
+            taskInfo.setDescription("账户消耗与组消耗不匹配");
+            taskInfo.setStatus(-1);
+            this.saveOrUpdate(taskInfo);
+        }
+        if(taskInfo.getImageCost().add(taskInfo.getMatCost()).subtract(taskInfo.getAccountCost()).compareTo(new BigDecimal("10"))>0){
+            taskInfo.setDescription("账户消耗与素材消耗不匹配");
+            taskInfo.setStatus(-2);
+            this.saveOrUpdate(taskInfo);
+        }
+
+        taskInfo.setDescription("消耗数据正常");
+        taskInfo.setStatus(0);
+        this.saveOrUpdate(taskInfo);
+    }
+
+    @Override
+    public void reloadData(BytedanceCheckReportTaskInfo taskInfo){
+        CtopOauthToken token = tokenService.getTokenByAccountId(taskInfo.getAccountId());
+        BigDecimal accountCost = taskInfo.getAccountCost();
+        BigDecimal campaignCost = taskInfo.getCampaignCost();
+        BigDecimal imageCost = taskInfo.getImageCost();
+        BigDecimal matCost = taskInfo.getMatCost();
+        //账户消耗!=组消耗
+        if(accountCost.compareTo(campaignCost)!=0){
+            reportService.getAdvertiserReport(token, DateUtils.parseDate(taskInfo.getStateDate(),"yyyy-MM-dd"),DateUtils.parseDate(taskInfo.getStateDate(),"yyyy-MM-dd"), CtopAdConstant.BYTEDANCE_REPORT_TYPE_DAILY);
+            reportService.getAdvertiserCampaignReport(token, DateUtils.parseDate(taskInfo.getStateDate(),"yyyy-MM-dd"),DateUtils.parseDate(taskInfo.getStateDate(),"yyyy-MM-dd"), CtopAdConstant.BYTEDANCE_REPORT_TYPE_DAILY);
+        }
+        if(imageCost.add(matCost).subtract(campaignCost).compareTo(new BigDecimal("10"))>0){
+            reportService.getAdvertiserReport(token, DateUtils.parseDate(taskInfo.getStateDate(),"yyyy-MM-dd"),DateUtils.parseDate(taskInfo.getStateDate(),"yyyy-MM-dd"), CtopAdConstant.BYTEDANCE_REPORT_TYPE_DAILY);
+            reportService.getAdvertiserCampaignReport(token, DateUtils.parseDate(taskInfo.getStateDate(),"yyyy-MM-dd"),DateUtils.parseDate(taskInfo.getStateDate(),"yyyy-MM-dd"), CtopAdConstant.BYTEDANCE_REPORT_TYPE_DAILY);
+            bytedanceReportService.bytedanceMaterialReport(token, taskInfo.getStateDate(), taskInfo.getStateDate());
+        }
+    }
+
+}

+ 13 - 2
module-toutiao/src/main/java/cn/com/ctop/toutiao/modules/report/service/impl/BytedanceReportMaterialDailyServiceImpl.java

@@ -1,16 +1,17 @@
 package cn.com.ctop.toutiao.modules.report.service.impl;
 
 import cn.com.ctop.toutiao.modules.material.vo.BytedanceVideoVo;
+import cn.com.ctop.toutiao.modules.report.entity.BytedanceCheckReportTaskInfo;
 import cn.com.ctop.toutiao.modules.report.entity.BytedanceReportMaterialDaily;
 import cn.com.ctop.toutiao.modules.report.entity.BytedanceVideoEtlInfo;
 import cn.com.ctop.toutiao.modules.report.mapper.BytedanceReportMaterialDailyMapper;
 import cn.com.ctop.toutiao.modules.report.service.IBytedanceReportMaterialDailyService;
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
-import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.context.annotation.Primary;
 import org.springframework.stereotype.Service;
 
+import javax.annotation.Resource;
 import java.util.List;
 
 /**
@@ -23,7 +24,7 @@ import java.util.List;
 @Primary
 
 public class BytedanceReportMaterialDailyServiceImpl extends ServiceImpl<BytedanceReportMaterialDailyMapper, BytedanceReportMaterialDaily> implements IBytedanceReportMaterialDailyService {
-    @Autowired
+    @Resource
     private BytedanceReportMaterialDailyMapper bytedanceReportMaterialDailyMapper;
     @Override
     public List<BytedanceReportMaterialDaily> getListByParams(String date) {
@@ -50,5 +51,15 @@ public class BytedanceReportMaterialDailyServiceImpl extends ServiceImpl<Bytedan
         return bytedanceReportMaterialDailyMapper.getEtlDataByParams(signature,date);
     }
 
+    @Override
+    public BytedanceCheckReportTaskInfo checkMatCostByParams(Long accountId, String stateDate) {
+        return bytedanceReportMaterialDailyMapper.checkMatCostByParams(accountId,stateDate);
+    }
+
+    @Override
+    public BytedanceCheckReportTaskInfo checkImageCostByParams(Long accountId, String stateDate) {
+        return bytedanceReportMaterialDailyMapper.checkImageCostByParams(accountId,stateDate);
+    }
+
 
 }

+ 2 - 2
pom.xml

@@ -416,7 +416,7 @@
             <artifactId>aliyun-java-sdk-mts</artifactId>
             <version>2.5.2</version>
         </dependency>
-        <dependency>
+        <!--<dependency>
             <groupId>org.bytedeco</groupId>
             <artifactId>javacv</artifactId>
             <version>1.4.2</version>
@@ -425,7 +425,7 @@
             <groupId>org.bytedeco</groupId>
             <artifactId>javacv-platform</artifactId>
             <version>1.4.2</version>
-        </dependency>
+        </dependency>-->
         <!--<dependency>
             <groupId>com.qcloud</groupId>
             <artifactId>cos_api</artifactId>