取消时间统一性

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

@@ -32,14 +32,13 @@ public class BiliBiliCreateTaskJob extends CreateTaskJob {
             liveJson = (Map<?, ?>) requireNonNull(liveJson.get("data"));
             final List<?> moduleList = (List<?>) liveJson.get("room_list");
             final String baseUrl = "https://live.bilibili.com";
-            final long currentTime = System.currentTimeMillis();
             moduleList.forEach(liveModule -> {
                 Map<?, ?> liveModuleMap = (Map<?, ?>) liveModule;
                 List<?> roomList = (List<?>) liveModuleMap.get("list");
                 roomList.forEach(room -> {
                     try {
                         Map<?, ?> roomMap = (Map<?, ?>) room;
-                        BarrageCollectionTestTask collectionTask = BiliBiliCreateTaskJob.super.createCollectionTask(baseUrl + roomMap.get("link"), currentTime);
+                        BarrageCollectionTestTask collectionTask = BiliBiliCreateTaskJob.super.createCollectionTask(baseUrl + roomMap.get("link"));
                         if (nonNull(collectionTask)) BiliBiliCreateTaskJob.super.createExportTask(collectionTask);
                     } catch (Exception e) {
                         log.error(e.getMessage(), e);

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

@@ -46,10 +46,9 @@ public abstract class CreateTaskJob implements Job {
      * 创建直播间的弹幕采集，和弹幕导出测试任务
      */
     protected final void createTasks(@NotNull Set<String> liveUrls) {
-        final long currentTime = System.currentTimeMillis();
         liveUrls.forEach(liveUrl -> {
             try {
-                BarrageCollectionTestTask collectionTask = this.createCollectionTask(liveUrl, currentTime);
+                BarrageCollectionTestTask collectionTask = this.createCollectionTask(liveUrl);
                 if (nonNull(collectionTask)) this.createExportTask(collectionTask);
             } catch (Exception e) {
                 log.error(e.getMessage(), e);
@@ -61,9 +60,9 @@ public abstract class CreateTaskJob implements Job {
      * 请求弹幕采集服务器创建采集任务
      */
     @Nullable
-    protected final BarrageCollectionTestTask createCollectionTask(String liveUrl, long currentTime) throws IOException {
+    protected final BarrageCollectionTestTask createCollectionTask(String liveUrl) throws IOException {
         final String liveName = UUID.randomUUID().toString();
-        BarrageCollectionTestTask collectionTask = new BarrageCollectionTestTask(liveUrl, liveName, currentTime);
+        BarrageCollectionTestTask collectionTask = new BarrageCollectionTestTask(liveUrl, liveName);
         if (log.isDebugEnabled()) {
             String startTime = STANDARD_DATE_FORMAT.format(collectionTask.getStartTime() * 1000L);
             String endTime = STANDARD_DATE_FORMAT.format(collectionTask.getEndTime() * 1000L);
@@ -75,7 +74,6 @@ public abstract class CreateTaskJob implements Job {
         HttpResponse response = HTTP_CLIENT.execute(post);
         ServerResponseMessage responseMessage = objectMapper.readValue(response.getEntity().getContent(), ServerResponseMessage.class);
         responseMessage.setName(collectionTask.getName());
-        if (responseMessage.getCode() != 200) return null;
 
         try (SqlSession session = SQL_SESSION_FACTORY.openSession(true)) {
             BarrageCollectionTestTaskMapper testTaskMapper = session.getMapper(BarrageCollectionTestTaskMapper.class);
@@ -83,7 +81,7 @@ public abstract class CreateTaskJob implements Job {
             ServerResponseMessageMapper messageMapper = session.getMapper(ServerResponseMessageMapper.class);
             messageMapper.insert(responseMessage);
         }
-        return collectionTask;
+        return responseMessage.getCode() != 200 ? null : collectionTask;
     }
 
     /**

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

@@ -43,12 +43,11 @@ public class BarrageCollectionTestTask {
     @JsonProperty(value = "endTime")
     private Integer endTime;
 
-    public BarrageCollectionTestTask(String liveUrl, String name, long currentTime) {
+    public BarrageCollectionTestTask(String liveUrl, String name) {
         this.url = liveUrl;
         this.name = name;
 
         Calendar calendar = Calendar.getInstance();
-        calendar.setTimeInMillis(currentTime);
         calendar.add(Calendar.MINUTE, 1);
         calendar.set(Calendar.SECOND, 0);
         calendar.set(Calendar.MILLISECOND, 0);

barrage-crawler-server/src/test/java/com/zhiweidata/automatictest/barragecrawlerserver/exporttasks/ExportTaskJobTest.java

@@ -16,7 +16,7 @@ class ExportTaskJobTest {
 
     public static void main(String[] args) throws SchedulerException, IOException {
         BarrageCollectionTestTask collectionTask = new BarrageCollectionTestTask(
-                "https://live.bilibili.com/12265?hotRank=0", "62aae6a3-e563-4f24-9e3a-135c6e74a8ac", System.currentTimeMillis()
+                "https://live.bilibili.com/12265?hotRank=0", "62aae6a3-e563-4f24-9e3a-135c6e74a8ac"
         );
 
         ExportTaskJob exportTaskJob = new ExportTaskJob();