Merge #22 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-bytedance/change/22

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

@@ -54,7 +54,8 @@ public class BytedanceReportRetryJob {
     private static ExecutorService productDailyRetrExecutor = Executors.newFixedThreadPool(2);
 
     private static ExecutorService flowDailyRetrExecutor = Executors.newFixedThreadPool(2);
-
+    private static ExecutorService changduExecutorService = Executors.newFixedThreadPool(1);
+    private static ExecutorService xingTuExecutorService = Executors.newFixedThreadPool(2);
 
     @XxlJob("retryReport")
     public void retryReport() throws Exception {
@@ -144,7 +145,6 @@ public class BytedanceReportRetryJob {
 
         List<JSONObject> changDuRetry = channelService.getChangDuRetry();
         if (!Check.isNull(changDuRetry)) {
-            ExecutorService executorService = Executors.newFixedThreadPool(1);
             for (int i = 0; i < changDuRetry.size(); i++) {
                 JSONObject jsonObject = changDuRetry.get(i);
                 Long id = jsonObject.getLong("id");
@@ -158,7 +158,7 @@ public class BytedanceReportRetryJob {
                 String appId = jsonObject.getString("channelAppId");
                 String appName = jsonObject.getString("channelAppName");
                 if ("changdu_order".equals(dataDimension)) {
-                    executorService.submit(new Runnable() {
+                    changduExecutorService.submit(new Runnable() {
                         @Override
                         public void run() {
                             channelService.getOrderList(startDate, endDate, appId, appName, channelAccountId, secretKey, 1, id, isSend);
@@ -172,7 +172,6 @@ public class BytedanceReportRetryJob {
 
         List<JSONObject> maEcpmRetryJob = miniAppService.getMaEcpmRetryJob();
         if (!Check.isNull(maEcpmRetryJob)) {
-            ExecutorService executorService = Executors.newFixedThreadPool(1);
             for (int i = 0; i < maEcpmRetryJob.size(); i++) {
                 JSONObject jsonObject = maEcpmRetryJob.get(i);
                 Long id = jsonObject.getLong("id");
@@ -182,7 +181,7 @@ public class BytedanceReportRetryJob {
                 Integer isSend = jsonObject.getInteger("isSend");
                 if (dataDimension != null && dataDimension.startsWith("ma_ecpm:")) {
                     String appId = dataDimension.split(":")[1];
-                    executorService.submit(new Runnable() {
+                    changduExecutorService.submit(new Runnable() {
                         @Override
                         public void run() {
                             miniAppService.getMaEcpm(startDate, endDate, appId, 1, id, isSend);
@@ -196,7 +195,6 @@ 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");
@@ -209,21 +207,21 @@ public class BytedanceReportRetryJob {
                 Long taskId = jsonObject.getJSONObject("msg").getLong("taskId");
 
                 if ("xingtu_task_list".equalsIgnoreCase(dataDimension)) {
-                    executorService.submit(new Runnable() {
+                    xingTuExecutorService.submit(new Runnable() {
                         @Override
                         public void run() {
                             bytedanceXingTuService.getXingTuTaskList(advertiserId, accessToken, startDate, endDate, 1, id, null, isSend);
                         }
                     });
                 } else if ("xingtu_task_info".equalsIgnoreCase(dataDimension)) {
-                    executorService.submit(new Runnable() {
+                    xingTuExecutorService.submit(new Runnable() {
                         @Override
                         public void run() {
                             bytedanceXingTuService.getXingTuTaskInfo(advertiserId, taskId, accessToken, id, null, isSend);
                         }
                     });
                 } else if ("xingtu_task_report".equalsIgnoreCase(dataDimension)) {
-                    executorService.submit(new Runnable() {
+                    xingTuExecutorService.submit(new Runnable() {
                         @Override
                         public void run() {
                             bytedanceXingTuService.getXingTuTaskReport(advertiserId, taskId, accessToken, 1, id, null, isSend);

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

@@ -17,6 +17,7 @@ import java.util.concurrent.Executors;
 @Slf4j
 @Component
 public class BytedanceXingTuJob {
+    private static final ExecutorService executorService = Executors.newFixedThreadPool(4);
     @Autowired
     private IBytedanceXingTuService bytedanceXingTuService;
 
@@ -37,7 +38,6 @@ public class BytedanceXingTuJob {
 
     @XxlJob("xingTuTaskInfo")
     public void taskInfo() {
-        ExecutorService executorService = Executors.newFixedThreadPool(4);
         List<JSONObject> xingTuTasks = bytedanceXingTuService.getXingTuActiveTask(null);
         for (JSONObject taskJson : xingTuTasks) {
             Long advId = taskJson.getLong("advertiser_id");
@@ -55,7 +55,6 @@ public class BytedanceXingTuJob {
 
     @XxlJob("xingTuTaskReport")
     public void taskReport() {
-        ExecutorService executorService = Executors.newFixedThreadPool(4);
         List<JSONObject> xingTuTasks = bytedanceXingTuService.getXingTuReportTask(null);
         for (JSONObject taskJson : xingTuTasks) {
             Long advId = taskJson.getLong("advertiser_id");