|
@@ -70,8 +70,6 @@ public class TestController {
|
|
|
@Autowired
|
|
|
private IKuaishouWebInterfaceService kuaishouWebInterfaceService;
|
|
|
@Autowired
|
|
|
- private CtopOauthTokenMapper oauthTokenMapper;
|
|
|
- @Autowired
|
|
|
private IKuaiShouHistoryReportTaskService historyReportTaskService;
|
|
|
@Autowired
|
|
|
private IMaterialInfoService materialInfoService;
|
|
@@ -84,8 +82,6 @@ public class TestController {
|
|
|
@Autowired
|
|
|
private IMaterialImageInfoService iMaterialImageInfoService;
|
|
|
@Autowired
|
|
|
- private IBytedanceReportService bytedanceReportService;
|
|
|
- @Autowired
|
|
|
private IKuaishouInterfaceService2 kuaishouInterfaceService2;
|
|
|
@Autowired
|
|
|
private IUserAllocationService userAllocationService;
|
|
@@ -229,15 +225,13 @@ public class TestController {
|
|
|
|
|
|
@GetMapping("/getBytedanceMatReport")
|
|
|
public Map<String,Object>getData(){
|
|
|
- List<BytedanceAccountReportTaskRecord> records = reportTaskRecordService.listByParams(100,"ACCOUNT_DAILY");
|
|
|
- executorService = Executors.newFixedThreadPool(1);
|
|
|
- CountDownLatch countDownLatch = new CountDownLatch(records.size());
|
|
|
- records.forEach(record -> executorService.submit(() -> {
|
|
|
+ List<CtopOauthToken> tokens = tokenService.selectToutiaoToken();
|
|
|
+ executorService = Executors.newFixedThreadPool(10);
|
|
|
+ CountDownLatch countDownLatch = new CountDownLatch(tokens.size());
|
|
|
+ tokens.forEach(record -> executorService.submit(() -> {
|
|
|
try {
|
|
|
-// reportService.getAdvertiserReport(record, CtopAdConstant.BYTEDANCE_REPORT_TYPE_DAILY);
|
|
|
-// log.info("账户数据获取完成:account:{},时间:{}-{}",record.getAccountId(),record.getStartDate(),record.getEndDate());
|
|
|
- bytedanceReportService.bytedanceMaterialReportV2(record);
|
|
|
- log.info("素材数据获取完成:account:{},时间:{}-{}",record.getAccountId(),record.getStartDate(),record.getEndDate());
|
|
|
+ reportService.getAdvertiserReport(record, DateUtils.parseDate("2021-01-01","yyyy-MM-dd"), DateUtils.parseDate("2021-01-31","yyyy-MM-dd"),CtopAdConstant.BYTEDANCE_REPORT_TYPE_DAILY);
|
|
|
+ log.info("账户数据获取完成:account:{},时间:{}-{}",record.getAccountId(),"2021-01-01","2020-01-31");
|
|
|
} catch (Exception e) {
|
|
|
|
|
|
} finally {
|
|
@@ -250,11 +244,11 @@ public class TestController {
|
|
|
e.printStackTrace();
|
|
|
}
|
|
|
System.out.println("数据获取完成");
|
|
|
- bytedanceReportMaterialDailyMapper.updateImageReportCode();
|
|
|
- bytedanceReportMaterialDailyMapper.updateImageReportProjectId();
|
|
|
- bytedanceReportMaterialDailyMapper.updateImageReportProjectName();
|
|
|
- bytedanceReportMaterialDailyMapper.updateImageReportPlaneId();
|
|
|
- bytedanceReportMaterialDailyMapper.updateImageReportPlaneName();
|
|
|
+// bytedanceReportMaterialDailyMapper.updateImageReportCode();
|
|
|
+// bytedanceReportMaterialDailyMapper.updateImageReportProjectId();
|
|
|
+// bytedanceReportMaterialDailyMapper.updateImageReportProjectName();
|
|
|
+// bytedanceReportMaterialDailyMapper.updateImageReportPlaneId();
|
|
|
+// bytedanceReportMaterialDailyMapper.updateImageReportPlaneName();
|
|
|
Map<String,Object> result = new HashMap<>();
|
|
|
ResultMapUtils.setResultMap(new HashMap<>(),StatusCode.COMMON_SUCCESS);
|
|
|
return result;
|
|
@@ -316,7 +310,7 @@ public class TestController {
|
|
|
QueryWrapper<CtopOauthToken> tokenQueryWrapper = new QueryWrapper<>();
|
|
|
tokenQueryWrapper.eq("media_id", 2);
|
|
|
tokenQueryWrapper.eq("account_id", accountId);
|
|
|
- CtopOauthToken token = oauthTokenMapper.selectOne(tokenQueryWrapper);
|
|
|
+ CtopOauthToken token = tokenMapper.selectOne(tokenQueryWrapper);
|
|
|
if (!Check.isNull(token)) {
|
|
|
suzhaoService.submit(new Runnable() {
|
|
|
@Override
|
|
@@ -526,7 +520,7 @@ public class TestController {
|
|
|
QueryWrapper<CtopOauthToken> tokenQueryWrapper = new QueryWrapper<>();
|
|
|
tokenQueryWrapper.eq("media_id", 2);
|
|
|
tokenQueryWrapper.eq("account_id", accountId);
|
|
|
- CtopOauthToken ctopOauthTokens = oauthTokenMapper.selectOne(tokenQueryWrapper);
|
|
|
+ CtopOauthToken ctopOauthTokens = tokenMapper.selectOne(tokenQueryWrapper);
|
|
|
if (!Check.isNull(ctopOauthTokens)) {
|
|
|
historyReportTaskService.createTask(ctopOauthTokens.getAccountId(), ctopOauthTokens.getAccessToken(), startDate, endDate, CtopAdConstant.KUAISHOU_LOAD_JOB_TYPE_DAILY);
|
|
|
|
|
@@ -559,7 +553,7 @@ public class TestController {
|
|
|
QueryWrapper<CtopOauthToken> tokenQueryWrapper = new QueryWrapper<>();
|
|
|
tokenQueryWrapper.eq("media_id", 2);
|
|
|
tokenQueryWrapper.eq("account_id", accountId);
|
|
|
- CtopOauthToken ctopOauthTokens = oauthTokenMapper.selectOne(tokenQueryWrapper);
|
|
|
+ CtopOauthToken ctopOauthTokens = tokenMapper.selectOne(tokenQueryWrapper);
|
|
|
if (!Check.isNull(ctopOauthTokens)) {
|
|
|
historyReportTaskService.createTask(ctopOauthTokens.getAccountId(), ctopOauthTokens.getAccessToken(), startDate, endDate, CtopAdConstant.KUAISHOU_LOAD_JOB_TYPE_HISTORY);
|
|
|
|
|
@@ -586,7 +580,7 @@ public class TestController {
|
|
|
QueryWrapper<CtopOauthToken> tokenQueryWrapper = new QueryWrapper<>();
|
|
|
tokenQueryWrapper.eq("media_id", 2);
|
|
|
tokenQueryWrapper.eq("account_id", accountId);
|
|
|
- CtopOauthToken ctopOauthTokens = oauthTokenMapper.selectOne(tokenQueryWrapper);
|
|
|
+ CtopOauthToken ctopOauthTokens = tokenMapper.selectOne(tokenQueryWrapper);
|
|
|
if (!Check.isNull(ctopOauthTokens)) {
|
|
|
historyReportTaskService.createTask(ctopOauthTokens.getAccountId(), ctopOauthTokens.getAccessToken(), statDate, statDate, CtopAdConstant.KUAISHOU_LOAD_JOB_TYPE_DAILY);
|
|
|
|
|
@@ -847,7 +841,7 @@ public class TestController {
|
|
|
oauthTokenQueryWrapper.eq("media_id", 2);
|
|
|
oauthTokenQueryWrapper.eq("account_id", accountId);
|
|
|
oauthTokenQueryWrapper.last("limit 1");
|
|
|
- CtopOauthToken token = oauthTokenMapper.selectOne(oauthTokenQueryWrapper);
|
|
|
+ CtopOauthToken token = tokenMapper.selectOne(oauthTokenQueryWrapper);
|
|
|
SimpleDateFormat sim = new SimpleDateFormat("yyyy-MM-dd");
|
|
|
Date date1 = sim.parse(startDate);
|
|
|
Date date2 = sim.parse(endDate);
|
|
@@ -865,7 +859,7 @@ public class TestController {
|
|
|
Date date2 = sim.parse(endDate);
|
|
|
QueryWrapper<CtopOauthToken> tokenQueryWrapper = new QueryWrapper<>();
|
|
|
tokenQueryWrapper.eq("media_id", 2);
|
|
|
- List<CtopOauthToken> ctopOauthTokens = oauthTokenMapper.selectList(tokenQueryWrapper);
|
|
|
+ List<CtopOauthToken> ctopOauthTokens = tokenMapper.selectList(tokenQueryWrapper);
|
|
|
if (!Check.isNull(ctopOauthTokens)) {
|
|
|
for (CtopOauthToken token : ctopOauthTokens) {
|
|
|
kuaishouInterfaceService.getAdvertiserReportDaily(token, date1, date2);
|
|
@@ -943,7 +937,7 @@ public class TestController {
|
|
|
oauthTokenQueryWrapper.eq("media_id", 2);
|
|
|
oauthTokenQueryWrapper.eq("account_id", accountId);
|
|
|
oauthTokenQueryWrapper.last("limit 1");
|
|
|
- CtopOauthToken token = oauthTokenMapper.selectOne(oauthTokenQueryWrapper);
|
|
|
+ CtopOauthToken token = tokenMapper.selectOne(oauthTokenQueryWrapper);
|
|
|
String endDateStr = DateUtils.getDate("yyyy-MM-dd");
|
|
|
String startDate = DateUtils.addMonth(endDateStr, -6);
|
|
|
historyReportTaskService.createTask(token.getAccountId(), token.getAccessToken(), startDate, endDateStr, CtopAdConstant.KUAISHOU_LOAD_JOB_TYPE_HISTORY);
|
|
@@ -964,7 +958,7 @@ public class TestController {
|
|
|
String startDate = DateUtils.addMonth(endDateStr, -6);
|
|
|
QueryWrapper<CtopOauthToken> tokenQueryWrapper = new QueryWrapper<>();
|
|
|
tokenQueryWrapper.eq("media_id", 2);
|
|
|
- List<CtopOauthToken> ctopOauthTokens = oauthTokenMapper.selectList(tokenQueryWrapper);
|
|
|
+ List<CtopOauthToken> ctopOauthTokens = tokenMapper.selectList(tokenQueryWrapper);
|
|
|
if (!Check.isNull(ctopOauthTokens)) {
|
|
|
for (CtopOauthToken token : ctopOauthTokens) {
|
|
|
historyReportTaskService.createTask(token.getAccountId(), token.getAccessToken(), "2020-09-01", "2020-10-01", CtopAdConstant.KUAISHOU_LOAD_JOB_TYPE_HISTORY);
|
|
@@ -988,7 +982,7 @@ public class TestController {
|
|
|
QueryWrapper<CtopOauthToken> tokenQueryWrapper = new QueryWrapper<>();
|
|
|
tokenQueryWrapper.eq("media_id", 2);
|
|
|
tokenQueryWrapper.eq("account_id", accountId);
|
|
|
- CtopOauthToken ctopOauthTokens = oauthTokenMapper.selectOne(tokenQueryWrapper);
|
|
|
+ CtopOauthToken ctopOauthTokens = tokenMapper.selectOne(tokenQueryWrapper);
|
|
|
if (!Check.isNull(ctopOauthTokens)) {
|
|
|
historyReportTaskService.createTask(ctopOauthTokens.getAccountId(), ctopOauthTokens.getAccessToken(), startDate, endDateStr, CtopAdConstant.KUAISHOU_LOAD_JOB_TYPE_HISTORY);
|
|
|
|
|
@@ -1052,7 +1046,7 @@ public class TestController {
|
|
|
public void gerCreative() {
|
|
|
QueryWrapper<CtopOauthToken> oauthTokenQueryWrapper = new QueryWrapper<>();
|
|
|
oauthTokenQueryWrapper.eq("media_id", 2);
|
|
|
- List<CtopOauthToken> ctopOauthTokens = oauthTokenMapper.selectList(oauthTokenQueryWrapper);
|
|
|
+ List<CtopOauthToken> ctopOauthTokens = tokenMapper.selectList(oauthTokenQueryWrapper);
|
|
|
for (CtopOauthToken token : ctopOauthTokens) {
|
|
|
executorService.submit(new Runnable() {
|
|
|
@Override
|
|
@@ -1125,7 +1119,7 @@ public class TestController {
|
|
|
oauthTokenQueryWrapper.eq("media_id", 2);
|
|
|
oauthTokenQueryWrapper.eq("account_id", accountId);
|
|
|
oauthTokenQueryWrapper.last("limit 1");
|
|
|
- CtopOauthToken token = oauthTokenMapper.selectOne(oauthTokenQueryWrapper);
|
|
|
+ CtopOauthToken token = tokenMapper.selectOne(oauthTokenQueryWrapper);
|
|
|
try {
|
|
|
// kuaishouInterfaceService.getCampaignList(token, null, null);
|
|
|
//1:获取全量广告组数据
|
|
@@ -1178,7 +1172,7 @@ public class TestController {
|
|
|
oauthTokenQueryWrapper.eq("media_id", 2);
|
|
|
oauthTokenQueryWrapper.eq("account_id", accountId);
|
|
|
oauthTokenQueryWrapper.last("limit 1");
|
|
|
- CtopOauthToken token = oauthTokenMapper.selectOne(oauthTokenQueryWrapper);
|
|
|
+ CtopOauthToken token = tokenMapper.selectOne(oauthTokenQueryWrapper);
|
|
|
executorService.submit(new Runnable() {
|
|
|
@Override
|
|
|
public void run() {
|
|
@@ -1212,7 +1206,7 @@ public class TestController {
|
|
|
|
|
|
QueryWrapper<CtopOauthToken> oauthTokenQueryWrapper = new QueryWrapper<>();
|
|
|
oauthTokenQueryWrapper.eq("media_id", 2);
|
|
|
- List<CtopOauthToken> ctopOauthTokens = oauthTokenMapper.selectList(oauthTokenQueryWrapper);
|
|
|
+ List<CtopOauthToken> ctopOauthTokens = tokenMapper.selectList(oauthTokenQueryWrapper);
|
|
|
|
|
|
if (!Check.isNull(ctopOauthTokens)) {
|
|
|
for (CtopOauthToken token : ctopOauthTokens) {
|
|
@@ -1242,7 +1236,7 @@ public class TestController {
|
|
|
|
|
|
QueryWrapper<CtopOauthToken> oauthTokenQueryWrapper = new QueryWrapper<>();
|
|
|
oauthTokenQueryWrapper.eq("media_id", 2);
|
|
|
- List<CtopOauthToken> ctopOauthTokens = oauthTokenMapper.selectList(oauthTokenQueryWrapper);
|
|
|
+ List<CtopOauthToken> ctopOauthTokens = tokenMapper.selectList(oauthTokenQueryWrapper);
|
|
|
if (!Check.isNull(ctopOauthTokens)) {
|
|
|
for (CtopOauthToken token : ctopOauthTokens) {
|
|
|
executorService.submit(new Runnable() {
|