瀏覽代碼

Merge branch 'master' into test

yumeng 5 年之前
父節點
當前提交
685bbf60b2

+ 1 - 0
jeecg-boot-module-system/src/main/java/org/jeecg/modules/ctop/job/AccountCpaBidJob.java

@@ -58,6 +58,7 @@ public class AccountCpaBidJob implements Job {
 
 
                         });
                         });
                     }
                     }
+                    executorService.shutdown();
 
 
                 }
                 }
             }
             }

+ 8 - 8
jeecg-boot-module-system/src/main/java/org/jeecg/modules/ctop/job/KuaishouDailyLoadFileJob.java

@@ -31,8 +31,6 @@ public class KuaishouDailyLoadFileJob implements Job {
     static CountDownLatch countDownLatch = null;
     static CountDownLatch countDownLatch = null;
     @Autowired
     @Autowired
     private IKuaiShouDailyReportTaskService dailyReportTaskService;
     private IKuaiShouDailyReportTaskService dailyReportTaskService;
-    @Autowired
-    private IKuaiShouDailyReportTaskService kuaiShouDailyReportTaskService;
 
 
     @Override
     @Override
     public void execute(JobExecutionContext jobExecutionContext) throws JobExecutionException {
     public void execute(JobExecutionContext jobExecutionContext) throws JobExecutionException {
@@ -63,16 +61,18 @@ public class KuaishouDailyLoadFileJob implements Job {
                         }
                         }
                     });
                     });
                 }
                 }
-                try {
-                    countDownLatch.await();
-                } catch (InterruptedException e) {
-                    e.printStackTrace();
-                }
-                kuaiShouDailyReportTaskService.formatCreativeDailyReportData(null, statDate);
                 executorService.shutdown();
                 executorService.shutdown();
             }
             }
         };
         };
         thread.start();
         thread.start();
 
 
     }
     }
+
+
+    public static void main(String[] args) {
+        String nowDate = DateUtils.getDate("yyyy-MM-dd");
+        String statDate = getAnotherDay("yyyy-MM-dd", nowDate, -1);
+
+        System.err.println(statDate);
+    }
 }
 }

+ 2 - 0
module-kuaishou/src/main/java/cn/com/ctop/kuaishou/modules/batch/service/impl/KuaiShouDailyReportTaskServiceImpl.java

@@ -129,6 +129,8 @@ public class KuaiShouDailyReportTaskServiceImpl extends ServiceImpl<KuaiShouDail
 
 
                 } else if (task.getViewType() == 4) {
                 } else if (task.getViewType() == 4) {
                     reportDailyCreativeMapper.loadCreativeDailyReport(task.getAccountId(), localPath);
                     reportDailyCreativeMapper.loadCreativeDailyReport(task.getAccountId(), localPath);
+                    Thread.sleep(1 * 1000);
+                    reportDailyCreativeMapper.formatCreativeDailyReportData(task.getAccountId(), task.getStatDate());
                 }
                 }
             }
             }