|
|
@@ -1,7 +1,9 @@
|
|
|
package cn.com.ctop.job.adq.data.service.impl;
|
|
|
|
|
|
+import cn.com.ctop.job.adq.data.entity.AdqErrorLog;
|
|
|
import cn.com.ctop.job.adq.data.entity.AdqFlowDetailsReportDaily;
|
|
|
import cn.com.ctop.job.adq.data.entity.AdvertiserAccount;
|
|
|
+import cn.com.ctop.job.adq.data.mapper.AdqErrorLogMapper;
|
|
|
import cn.com.ctop.job.adq.data.mapper.AdqFlowDetailsReportDailyMapper;
|
|
|
import cn.com.ctop.job.adq.data.service.IAdqFlowDetailsReportService;
|
|
|
import cn.com.ctop.job.adq.data.utils.Check;
|
|
|
@@ -11,6 +13,7 @@ import cn.com.ctop.job.adq.utils.RandomStringGenerator;
|
|
|
import com.alibaba.fastjson.JSONArray;
|
|
|
import com.alibaba.fastjson.JSONObject;
|
|
|
import lombok.extern.slf4j.Slf4j;
|
|
|
+import org.springframework.beans.factory.annotation.Autowired;
|
|
|
import org.springframework.stereotype.Service;
|
|
|
|
|
|
import javax.annotation.Resource;
|
|
|
@@ -32,13 +35,16 @@ public class AdqFlowDetailsReportServiceImpl implements IAdqFlowDetailsReportSer
|
|
|
@Resource
|
|
|
private AdqFlowDetailsReportDailyMapper adqFlowDetailsReportDailyMapper;
|
|
|
|
|
|
+ @Autowired
|
|
|
+ private AdqErrorLogMapper adqErrorLogMapper;
|
|
|
+
|
|
|
@Override
|
|
|
public List<AdvertiserAccount> getAdAccount() {
|
|
|
return adqFlowDetailsReportDailyMapper.getAdAccount();
|
|
|
}
|
|
|
|
|
|
@Override
|
|
|
- public void getAdqFlowDetailsDailyReport(Long advertiserId, String accessToken, String startDate, String endDate, Integer page) {
|
|
|
+ public void getAdqFlowDetailsDailyReport(Long advertiserId, String accessToken, String startDate, String endDate, Integer page, Long errorLogId) {
|
|
|
Map<String, Object> paramsMap = new HashMap<>();
|
|
|
paramsMap.put("access_token", accessToken);
|
|
|
long timestamp = Instant.now().getEpochSecond();
|
|
|
@@ -111,6 +117,17 @@ public class AdqFlowDetailsReportServiceImpl implements IAdqFlowDetailsReportSer
|
|
|
}
|
|
|
}
|
|
|
}
|
|
|
+ }else {
|
|
|
+ //add log
|
|
|
+ log.error("请求流水详情日报失败,account_id:{},返回信息:{}", advertiserId, jsonObject);
|
|
|
+ AdqErrorLog errorInfo = new AdqErrorLog();
|
|
|
+ errorInfo.setAdvertiserId(advertiserId);
|
|
|
+ errorInfo.setStartDate(startDate);
|
|
|
+ errorInfo.setEndDate(endDate);
|
|
|
+ errorInfo.setDataDimension("flow_details");
|
|
|
+ errorInfo.setDataType("daily");
|
|
|
+ adqErrorLogMapper.replaceErrorInfo(errorInfo);
|
|
|
+ return;
|
|
|
}
|
|
|
}
|
|
|
|
|
|
@@ -120,7 +137,12 @@ public class AdqFlowDetailsReportServiceImpl implements IAdqFlowDetailsReportSer
|
|
|
} catch (InterruptedException e) {
|
|
|
throw new RuntimeException(e);
|
|
|
}
|
|
|
- getAdqFlowDetailsDailyReport(advertiserId, accessToken, startDate, endDate, page + 1);
|
|
|
+ getAdqFlowDetailsDailyReport(advertiserId, accessToken, startDate, endDate, page + 1, null);
|
|
|
+ }else{
|
|
|
+ log.info("账户id:{},广告流水详情请求结果返回成功,入库完成", advertiserId);
|
|
|
+ if(errorLogId != null){
|
|
|
+ adqErrorLogMapper.deleteInfoByErrorId(errorLogId);
|
|
|
+ }
|
|
|
}
|
|
|
}
|
|
|
|