修改作业调度方式

barrage-crawler-server/src/main/java/com/zhiweidata/automatictest/barragecrawlerserver/BarrageCrawlerServerTest.java

@@ -4,14 +4,8 @@ import com.zhiweidata.automatictest.barragecrawlerserver.createtasks.BiliBiliCre
 import com.zhiweidata.automatictest.barragecrawlerserver.createtasks.DouyuCreateTaskJob;
 import com.zhiweidata.automatictest.barragecrawlerserver.createtasks.HuyaCreateTaskJob;
 import lombok.extern.slf4j.Slf4j;
-import org.quartz.Job;
-import org.quartz.JobBuilder;
-import org.quartz.SchedulerException;
-import org.quartz.SimpleScheduleBuilder;
-import org.quartz.Trigger;
-import org.quartz.TriggerBuilder;
 
-import static com.zhiweidata.automatictest.publics.BeanContainer.SCHEDULER;
+import static com.zhiweidata.automatictest.barragecrawlerserver.createtasks.CreateTaskJob.createJob;
 
 /**
  * 弹幕采集自动化测试模块
@@ -28,25 +22,11 @@ public class BarrageCrawlerServerTest implements Runnable {
     public void run() {
         try {
             // 虎牙直播
-            this.createJob(HuyaCreateTaskJob.class, "虎牙直播", "huya");
-            this.createJob(BiliBiliCreateTaskJob.class, "BILIBILI直播", "bilibili");
-            this.createJob(DouyuCreateTaskJob.class, "斗鱼直播", "douyu");
+            createJob(HuyaCreateTaskJob.class, "虎牙直播", "huya");
+            createJob(BiliBiliCreateTaskJob.class, "BILIBILI直播", "bilibili");
+            createJob(DouyuCreateTaskJob.class, "斗鱼直播", "douyu");
         } catch (Exception e) {
             log.error(e.getMessage(), e);
         }
     }
-
-    private <T extends Job> void createJob(Class<T> tClass, String platform, String name) throws SchedulerException {
-        JobBuilder jobBuilder = JobBuilder.newJob(tClass);
-        String description = "定时从" + platform + "首页获得直播间地址，并发送到弹幕采集服务器进行测试。";
-        jobBuilder.withDescription(description);
-        final String group = "create-live-task";
-        jobBuilder.withIdentity(name, group);
-        TriggerBuilder<Trigger> triggerBuilder = TriggerBuilder.newTrigger();
-        triggerBuilder.withDescription(description);
-        triggerBuilder.withIdentity(name, group);
-        triggerBuilder.withSchedule(SimpleScheduleBuilder.repeatHourlyForever(5));
-        triggerBuilder.startNow();
-        SCHEDULER.scheduleJob(jobBuilder.build(), triggerBuilder.build());
-    }
 }

barrage-crawler-server/src/main/java/com/zhiweidata/automatictest/barragecrawlerserver/createtasks/BiliBiliCreateTaskJob.java

@@ -2,7 +2,6 @@ package com.zhiweidata.automatictest.barragecrawlerserver.createtasks;
 
 import com.fasterxml.jackson.databind.ObjectMapper;
 import com.zhiweidata.automatictest.barragecrawlerserver.entity.BarrageCollectionTestTask;
-import com.zhiweidata.automatictest.barragecrawlerserver.exporttasks.ExportTaskJob;
 import java.net.URL;
 import java.util.List;
 import java.util.Map;
@@ -28,6 +27,9 @@ public class BiliBiliCreateTaskJob extends CreateTaskJob {
     @Override
     public void execute(JobExecutionContext jobExecutionContext) {
         try {
+            // 创建下一个随机测试作业
+            createJob(BiliBiliCreateTaskJob.class, "BILIBILI直播", "bilibili");
+
             Map<?, ?> liveJson = new ObjectMapper().readValue(new URL("https://api.live.bilibili.com/xlive/web-interface/v1/index/getList?platform=web"), Map.class);
             liveJson = (Map<?, ?>) requireNonNull(liveJson.get("data"));
             final List<?> moduleList = (List<?>) liveJson.get("room_list");

barrage-crawler-server/src/main/java/com/zhiweidata/automatictest/barragecrawlerserver/createtasks/CreateTaskJob.java

@@ -43,6 +43,23 @@ import static java.util.Objects.nonNull;
 @SuppressWarnings({"JavaDoc"})
 public abstract class CreateTaskJob implements Job {
     /**
+     * 创建弹幕采集测试作业
+     */
+    public static <T extends Job> void createJob(Class<T> tClass, String platform, String name) throws SchedulerException {
+        JobBuilder jobBuilder = JobBuilder.newJob(tClass);
+        String description = "定时从" + platform + "首页获得直播间地址，并发送到弹幕采集服务器进行测试。";
+        jobBuilder.withDescription(description);
+        final String group = "create-live-task";
+        jobBuilder.withIdentity(name, group);
+        TriggerBuilder<Trigger> triggerBuilder = TriggerBuilder.newTrigger();
+        triggerBuilder.withDescription(description);
+        triggerBuilder.withIdentity(name, group);
+        triggerBuilder.startAt(TimeUtil.randmoDate(1));
+        triggerBuilder.startNow();
+        SCHEDULER.scheduleJob(jobBuilder.build(), triggerBuilder.build());
+    }
+
+    /**
      * 创建直播间的弹幕采集，和弹幕导出测试任务
      */
     protected final void createTasks(@NotNull Set<String> liveUrls) {

barrage-crawler-server/src/main/java/com/zhiweidata/automatictest/barragecrawlerserver/createtasks/DouyuCreateTaskJob.java

@@ -38,6 +38,9 @@ public class DouyuCreateTaskJob extends CreateTaskJob {
     @Override
     public void execute(JobExecutionContext jobExecutionContext) {
         try {
+            // 下一个随机测试作业
+            createJob(DouyuCreateTaskJob.class, "斗鱼直播", "douyu");
+
             HttpResponse response = HTTP_CLIENT.execute(new HttpGet("https://www.douyu.com/"));
             String html = EntityUtils.toString(response.getEntity());
             Set<String> liveUrls = this.getLiveUrl(html);

barrage-crawler-server/src/main/java/com/zhiweidata/automatictest/barragecrawlerserver/createtasks/HuyaCreateTaskJob.java

@@ -44,6 +44,9 @@ public class HuyaCreateTaskJob extends CreateTaskJob {
     @Override
     public void execute(JobExecutionContext jobExecutionContext) {
         try {
+            // 创建下一个随机测试作业
+            createJob(BiliBiliCreateTaskJob.class, "BILIBILI直播", "bilibili");
+
             HttpGet get = new HttpGet("https://www.huya.com/");
             HttpResponse response = HTTP_CLIENT.execute(get);
             StatusLine line = response.getStatusLine();

barrage-crawler-server/src/main/java/com/zhiweidata/automatictest/barragecrawlerserver/exporttasks/ExportTaskJob.java

@@ -26,6 +26,7 @@ import org.apache.http.entity.ContentType;
 import org.apache.http.util.EntityUtils;
 import org.apache.ibatis.session.SqlSession;
 import org.jetbrains.annotations.NotNull;
+import org.quartz.DisallowConcurrentExecution;
 import org.quartz.Job;
 import org.quartz.JobDataMap;
 import org.quartz.JobDetail;
@@ -52,6 +53,7 @@ import static java.util.Objects.requireNonNull;
  * @ide IntelliJ IDEA
  */
 @Slf4j
+@DisallowConcurrentExecution
 @SuppressWarnings({"JavaDoc", "GrazieInspection"})
 public class ExportTaskJob implements Job {
     /**