|
|
@@ -1,19 +1,14 @@
|
|
|
package cn.com.ctop.job.bytedance.controller;
|
|
|
|
|
|
-import cn.com.ctop.job.bytedance.data.entity.AdvertiserAccount;
|
|
|
import cn.com.ctop.job.bytedance.data.enums.AccountTypeEnum;
|
|
|
import cn.com.ctop.job.bytedance.data.service.*;
|
|
|
import cn.com.ctop.job.bytedance.data.utils.Check;
|
|
|
-import com.alibaba.fastjson.JSONArray;
|
|
|
import com.alibaba.fastjson.JSONObject;
|
|
|
import io.swagger.annotations.Api;
|
|
|
import lombok.extern.slf4j.Slf4j;
|
|
|
import org.springframework.beans.factory.annotation.Autowired;
|
|
|
import org.springframework.web.bind.annotation.*;
|
|
|
|
|
|
-import java.util.ArrayList;
|
|
|
-import java.util.Arrays;
|
|
|
-import java.util.List;
|
|
|
import java.util.concurrent.ExecutorService;
|
|
|
import java.util.concurrent.Executors;
|
|
|
|
|
|
@@ -42,7 +37,8 @@ public class HistoryDataController {
|
|
|
private IBytedancePromoterReportService promoterReportService;
|
|
|
|
|
|
@GetMapping("/getData")
|
|
|
- public void getData(Long advertiserId, String startDate, String endDate) {
|
|
|
+ public JSONObject getData(Long advertiserId, String startDate, String endDate) {
|
|
|
+ JSONObject json = new JSONObject();
|
|
|
dailyRetrExecutorService.submit(new Runnable() {
|
|
|
@Override
|
|
|
public void run() {
|
|
|
@@ -56,6 +52,9 @@ public class HistoryDataController {
|
|
|
byteDanceFlowDetailsReportService.getBytedanceFlowDetailsDailyReport(advertiserId, token, AccountTypeEnum.AD.getValue(), startDate, endDate, 1, null);
|
|
|
}
|
|
|
});
|
|
|
+ json.put("code", 200);
|
|
|
+ json.put("message", "成功");
|
|
|
+ return json;
|
|
|
}
|
|
|
|
|
|
|