Jelajahi Sumber

Merge #7 into master from pingkang

微小 广告位收入

* pingkang: (2 commits)
  微小 广告位收入
  微小 广告位收入

Signed-off-by: 1129979389@qq.com <accounts_6361eaad7b63b44dd7833e63@mail.teambition.com>
Merged-by: 1129979389@qq.com <accounts_6361eaad7b63b44dd7833e63@mail.teambition.com>

CR-link: https://codeup.aliyun.com/60c06368dbbed34fe0f0c263/job/hr_job-adq/change/7
huangpingkang 1 tahun lalu
induk
melakukan
37ba8a8499

+ 6 - 5
job-adq/src/main/java/cn/com/ctop/job/adq/data/service/impl/AdqAdIncomeServiceImpl.java

@@ -48,7 +48,7 @@ public class AdqAdIncomeServiceImpl implements IAdqAdIncomeService {
                 log.error("微小广告细分数据拉取获取token为空 [{}] {}~{} {}", appId, startDt, endDt, appletId);
                 return;
             }
-            int pageSize = 1000;
+            int pageSize = 90;
             Map<String, Object> paramsMap = new HashMap<>();
             paramsMap.put("access_token", tokenObj.toString());
             paramsMap.put("action", "publisher_adunit_general");
@@ -59,7 +59,7 @@ public class AdqAdIncomeServiceImpl implements IAdqAdIncomeService {
             String s = HttpUtils.httpGet(url, paramsMap, null);
             JSONObject jsonObject = JSONObject.parseObject(s);
             List<AdqPublisherAdunitGeneral> reports = new ArrayList<>();
-            boolean hasMore = false;
+            int totalPage = 1;
             if (!Check.isNull(jsonObject)) {
                 Integer code = jsonObject.getInteger("ret");
                 if (code == 2009) {
@@ -67,8 +67,9 @@ public class AdqAdIncomeServiceImpl implements IAdqAdIncomeService {
                 }
                 if (code == 0) {
                     JSONArray list = jsonObject.getJSONArray("list");
+                    Integer totalNum = jsonObject.getInteger("total_num");
+                    totalPage = (int) Math.ceil(totalNum * 1.0 / pageSize);
                     if (!Check.isNull(list)) {
-                        hasMore = list.size() == pageSize;
                         for (int i = 0; i < list.size(); i++) {
                             JSONObject dataJson = list.getJSONObject(i);
                             JSONObject statItem = dataJson.getJSONObject("stat_item");
@@ -96,10 +97,10 @@ public class AdqAdIncomeServiceImpl implements IAdqAdIncomeService {
                 adqAdIncomeMapper.insertAdqAdIncome(reports);
             }
 
-            if (hasMore) {
+            if (totalPage > page) {
                 getAdqAdIncome(startDt, endDt, appId, appletId, page + 1, isLog, errId, isSend);
             } else {
-                log.info("微小广告细分数据拉取完成,app_id:{} {}~{}。", appId, startDt, endDt);
+                log.info("微小广告细分数据拉取完成,app_id:{} {}~{} page:{}。", appId, startDt, endDt,page);
                 if (errId != null) {
                     adqErrorLogMapper.deleteInfoByErrorId(errId);
                 }