소스 검색

Merge remote-tracking branch 'origin/master'

# Conflicts:
#	jeecg-boot-module-system/src/main/java/org/jeecg/modules/ctop/job/BytedanceSameDayCreativeLoadJob.java
syh 5 년 전
부모
커밋
a176ef1f57

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

@@ -624,4 +624,38 @@ public class TestController {
 
 
     }
+
+    @GetMapping(value = "/AccountReportByAccount")
+    public void AccountReportByAccount(Long accountId, String startDateStr, String endDateStr) {
+        QueryWrapper<CtopOauthToken> oauthTokenQueryWrapper = new QueryWrapper<>();
+        oauthTokenQueryWrapper.eq("media_id", 2);
+        oauthTokenQueryWrapper.eq("account_id", accountId);
+        oauthTokenQueryWrapper.last("limit 1");
+        CtopOauthToken token = oauthTokenMapper.selectOne(oauthTokenQueryWrapper);
+        executorService.submit(new Runnable() {
+            @Override
+            public void run() {
+                try {
+                    SimpleDateFormat simpleDateFormat = new SimpleDateFormat("yyyy-MM-dd");
+                    Date startDate = null;
+                    Date endDate = null;
+                    try {
+                        startDate = simpleDateFormat.parse(startDateStr);
+                        endDate = simpleDateFormat.parse(endDateStr);
+                    } catch (ParseException e) {
+                        e.printStackTrace();
+                    }
+                    System.err.println("获取广告主报表,accountId:" + token.getAccountId());
+                    kuaishouInterfaceService.getAdvertiserReportDaily(token, startDate, endDate);
+
+                    Thread.sleep(1 * 200);
+                    //  kuaishouInterfaceService.getAppList(token.getAccountId(), token.getAccessToken());
+                } catch (Exception e) {
+                    e.printStackTrace();
+                }
+            }
+        });
+
+
+    }
 }

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

@@ -18,7 +18,7 @@ import java.util.concurrent.ExecutorService;
 import java.util.concurrent.Executors;
 
 @Slf4j
-public class BytedanceCreativeLoadJob implements Job {
+public class BytedanceSameDayCreativeLoadJob implements Job {
     @Autowired
     private ICtopOauthTokenService tokenService;
     static ExecutorService executorService = null;
@@ -29,8 +29,9 @@ public class BytedanceCreativeLoadJob implements Job {
 
     @Override
     public void execute(JobExecutionContext jobExecutionContext) throws JobExecutionException {
+
         List<CtopOauthToken> tokens = tokenService.getTokenListByType(CtopAdConstant.PLATFORM_TYPE_BYTEDANCE);
-        executorService = Executors.newFixedThreadPool(4);
+        executorService = Executors.newFixedThreadPool(6);
         countDownLatch = new CountDownLatch(tokens.size());
         tokens.forEach(token -> {
             executorService.submit(new Runnable() {

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

@@ -390,8 +390,14 @@ public class KuaishouInterfaceServiceImpl implements IKuaishouInterfaceService {
         headers.put("Content-Type", "application/json");
         headers.put("Access-Token", accessToken);
         Map<String, Object> param = new HashMap<String, Object>();
-        param.put("start_date", startDate);
-        param.put("end_date", endDate);
+        if (!Check.isNull(startDate)) {
+            param.put("start_date", startDate);
+        }
+
+        if (!Check.isNull(endDate)) {
+            param.put("end_date", endDate);
+        }
+
         param.put("advertiser_id", advertiserId);
         param.put("temporal_granularity", "DAILY");
         param.put("page_size", pageSize);

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

@@ -13,7 +13,6 @@
 	`creative_id`,
 	`creative_name`,
 	`stat_date`,
-	`stat_date`,
 	`stat_hour`,
 	`charge`,
 	`photo_click`,

+ 1 - 1
module-toutiao/src/main/java/cn/com/ctop/toutiao/service/impl/ByteDanceAdvertiserDataServiceImpl.java

@@ -278,7 +278,7 @@ public class ByteDanceAdvertiserDataServiceImpl implements IByteDanceAdvertiserD
         param.put("page_size", 100);
         if (null != date && !date.trim().equals("")) {
             JSONObject filtering = new JSONObject();
-            filtering.put("creative_create_time", date);
+            filtering.put("creative_modify_time", date);
             param.put("filtering", filtering);
         }
         return HttpUtils.bytedanceGetRequest(token.getAccessToken(), url, param);