Merge #12 into master from pingkang

Merge branch 'master' of codeup.aliyun.com:60c06368dbbed34fe0f0c263/job/hr_job-...

* pingkang: (2 commits)
  星图
  Merge branch 'master' of codeup.aliyun.com:60c06368dbbed34fe0f0c263/job/hr_job-...

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-bytedance/change/12

job-bytedance/src/main/java/cn/com/ctop/job/bytedance/handler/BytedanceReportRetryJob.java

@@ -144,6 +144,7 @@ public class BytedanceReportRetryJob {
 
         List<JSONObject> changDuRetry = channelService.getChangDuRetry();
         if (!Check.isNull(changDuRetry)) {
+            ExecutorService executorService = Executors.newFixedThreadPool(2);
             for (int i = 0; i < changDuRetry.size(); i++) {
                 JSONObject jsonObject = changDuRetry.get(i);
                 Long id = jsonObject.getLong("id");
@@ -157,7 +158,12 @@ public class BytedanceReportRetryJob {
                 String appId = jsonObject.getString("channelAppId");
                 String appName = jsonObject.getString("channelAppName");
                 if ("changdu_order".equals(dataDimension)) {
-                    channelService.getOrderList(startDate, endDate, appId, appName, channelAccountId, secretKey, 1, id, isSend);
+                    executorService.submit(new Runnable() {
+                        @Override
+                        public void run() {
+                            channelService.getOrderList(startDate, endDate, appId, appName, channelAccountId, secretKey, 1, id, isSend);
+                        }
+                    });
                 }
             }
         } else {
@@ -166,6 +172,7 @@ public class BytedanceReportRetryJob {
 
         List<JSONObject> maEcpmRetryJob = miniAppService.getMaEcpmRetryJob();
         if (!Check.isNull(maEcpmRetryJob)) {
+            ExecutorService executorService = Executors.newFixedThreadPool(2);
             for (int i = 0; i < maEcpmRetryJob.size(); i++) {
                 JSONObject jsonObject = maEcpmRetryJob.get(i);
                 Long id = jsonObject.getLong("id");
@@ -175,7 +182,12 @@ public class BytedanceReportRetryJob {
                 Integer isSend = jsonObject.getInteger("isSend");
                 if (dataDimension != null && dataDimension.startsWith("ma_ecpm:")) {
                     String appId = dataDimension.split(":")[1];
-                    miniAppService.getMaEcpm(startDate, endDate, appId, 1, id, isSend);
+                    executorService.submit(new Runnable() {
+                        @Override
+                        public void run() {
+                            miniAppService.getMaEcpm(startDate, endDate, appId, 1, id, isSend);
+                        }
+                    });
                 }
             }
         } else {
@@ -184,6 +196,7 @@ public class BytedanceReportRetryJob {
 
         List<JSONObject> xingTuRetryJob = bytedanceXingTuService.getXingTuRetryJob();
         if (!Check.isNull(xingTuRetryJob)) {
+            ExecutorService executorService = Executors.newFixedThreadPool(2);
             for (int i = 0; i < xingTuRetryJob.size(); i++) {
                 JSONObject jsonObject = xingTuRetryJob.get(i);
                 Long id = jsonObject.getLong("id");
@@ -196,11 +209,26 @@ public class BytedanceReportRetryJob {
                 Long taskId = jsonObject.getJSONObject("msg").getLong("taskId");
 
                 if ("xingtu_task_list".equalsIgnoreCase(dataDimension)) {
-                    bytedanceXingTuService.getXingTuTaskList(advertiserId, accessToken, startDate, endDate, 1, id, null, isSend);
+                    executorService.submit(new Runnable() {
+                        @Override
+                        public void run() {
+                            bytedanceXingTuService.getXingTuTaskList(advertiserId, accessToken, startDate, endDate, 1, id, null, isSend);
+                        }
+                    });
                 } else if ("xingtu_task_info".equalsIgnoreCase(dataDimension)) {
-                    bytedanceXingTuService.getXingTuTaskInfo(advertiserId, taskId, accessToken, id, null, isSend);
+                    executorService.submit(new Runnable() {
+                        @Override
+                        public void run() {
+                            bytedanceXingTuService.getXingTuTaskInfo(advertiserId, taskId, accessToken, id, null, isSend);
+                        }
+                    });
                 } else if ("xingtu_task_report".equalsIgnoreCase(dataDimension)) {
-                    bytedanceXingTuService.getXingTuTaskReport(advertiserId, taskId, accessToken, 1, id, null, isSend);
+                    executorService.submit(new Runnable() {
+                        @Override
+                        public void run() {
+                            bytedanceXingTuService.getXingTuTaskReport(advertiserId, taskId, accessToken, 1, id, null, isSend);
+                        }
+                    });
                 }
             }
         } else {

job-bytedance/src/main/java/cn/com/ctop/job/bytedance/handler/BytedanceXingTuJob.java

@@ -8,9 +8,10 @@ import com.xxl.job.core.handler.annotation.XxlJob;
 import lombok.extern.slf4j.Slf4j;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Component;
-import org.springframework.web.bind.annotation.RequestParam;
 
 import java.util.List;
+import java.util.concurrent.ExecutorService;
+import java.util.concurrent.Executors;
 
 
 @Slf4j
@@ -34,24 +35,36 @@ public class BytedanceXingTuJob {
 
     @XxlJob("xingTuTaskInfo")
     public void taskInfo() {
+        ExecutorService executorService = Executors.newFixedThreadPool(2);
         List<JSONObject> xingTuTasks = bytedanceXingTuService.getXingTuActiveTask(null);
         for (JSONObject taskJson : xingTuTasks) {
             Long advId = taskJson.getLong("advertiser_id");
             Long taskId = taskJson.getLong("task_id");
             String accessToken = taskJson.getString("access_token");
-            bytedanceXingTuService.getXingTuTaskInfo(advId, taskId, accessToken, null, 1, null);
+            executorService.submit(new Runnable() {
+                @Override
+                public void run() {
+                    bytedanceXingTuService.getXingTuTaskInfo(advId, taskId, accessToken, null, 1, null);
+                }
+            });
         }
 
     }
 
     @XxlJob("xingTuTaskReport")
     public void taskReport() {
+        ExecutorService executorService = Executors.newFixedThreadPool(2);
         List<JSONObject> xingTuTasks = bytedanceXingTuService.getXingTuReportTask(null);
         for (JSONObject taskJson : xingTuTasks) {
             Long advId = taskJson.getLong("advertiser_id");
             Long taskId = taskJson.getLong("task_id");
             String accessToken = taskJson.getString("access_token");
-            bytedanceXingTuService.getXingTuTaskReport(advId, taskId, accessToken, 1, null, 1, null);
+            executorService.submit(new Runnable() {
+                @Override
+                public void run() {
+                    bytedanceXingTuService.getXingTuTaskReport(advId, taskId, accessToken, 1, null, 1, null);
+                }
+            });
         }
 
     }