Merge branch 'pingkang'

job-adq/src/main/java/cn/com/ctop/job/adq/controller/AdqController.java

@@ -4,6 +4,7 @@ import cn.com.ctop.job.adq.data.entity.AdvertiserAccount;
 import cn.com.ctop.job.adq.data.service.*;
 import cn.com.ctop.job.adq.data.utils.Check;
 import cn.com.ctop.job.adq.data.utils.DateUtils;
+import cn.com.ctop.job.adq.handler.AdqRetryReportJob;
 import com.alibaba.fastjson.JSONObject;
 import io.swagger.annotations.Api;
 import lombok.extern.slf4j.Slf4j;
@@ -56,6 +57,13 @@ public class AdqController {
     private IMovieLevelService movieLevelService;
     @Autowired
     private IRefreshTokenService refreshTokenService;
+    @Autowired
+    private AdqRetryReportJob adqRetryReportJob;
+
+    @GetMapping("/adqRetryReportJob")
+    public void adqRetryReportJob() throws Exception {
+        adqRetryReportJob.promoterReport();
+    }
 
     @GetMapping("/refreshToken")
     public JSONObject refreshToken() throws InterruptedException {

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

@@ -275,12 +275,12 @@ public class AdqAdIncomeServiceImpl implements IAdqAdIncomeService {
 
                 } else {
                     log.error("微小获取小程序广告汇总数据失败，app_id:{} {}~{},返回信息:{}", appId, startDt, endDt, jsonObject);
-                    insertErrorLog(isLog, System.currentTimeMillis(), "adq_publisher_adpos_general", startDt, endDt,
+                    insertErrorLog(isLog, System.currentTimeMillis(), "adq_ma_publisher_adpos_general", startDt, endDt,
                             jsonObject.fluentPut("app_id", appId).fluentPut("applet_id", appletId).toJSONString());
                 }
             } else {
                 log.error("微小获取小程序广告汇总数据失败，app_id:{} {}~{},返回为空。", appId, startDt, endDt);
-                insertErrorLog(isLog, System.currentTimeMillis(), "adq_publisher_adpos_general", startDt, endDt,
+                insertErrorLog(isLog, System.currentTimeMillis(), "adq_ma_publisher_adpos_general", startDt, endDt,
                         new JSONObject().fluentPut("app_id", appId).fluentPut("applet_id", appletId).fluentPut("msg", "返回为空").toJSONString());
             }
             if (!Check.isNull(reports)) {

job-adq/src/main/java/cn/com/ctop/job/adq/handler/AdqRetryReportJob.java

@@ -207,7 +207,7 @@ public class AdqRetryReportJob {
                             adqAdIncomeService.getAdqAdIncome(startDate, endDate, appId, appletId, 1, null, id, isSend);
                         }
                     });
-                } else if ("adq_publisher_adpos_general".equals(dataDimension)) {
+                } else if ("adq_ma_publisher_adpos_general".equals(dataDimension)) {
                     adIncomeExecutorService.submit(new Runnable() {
                         @Override
                         public void run() {