backup

Dockerfile

-FROM openjdk:8
+FROM openjdk:8u292
 WORKDIR /root
 COPY bootstrap/target/automatic-test-jar-with-dependencies.jar automatic-test-jar-with-dependencies.jar
 ENV TZ=Asia/Shanghai

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

 package com.zhiweidata.automatictest.barragecrawlerserver.entity;
 
 import com.fasterxml.jackson.annotation.JsonProperty;
+import com.fasterxml.jackson.databind.annotation.JsonDeserialize;
 import com.zhiweidata.automatictest.barragecrawlerserver.enums.BarrageStatusEnums;
 import com.zhiweidata.automatictest.barragecrawlerserver.enums.PlatformEnum;
+import com.zhiweidata.automatictest.barragecrawlerserver.jsonhandler.BarrageStatusEnumJsonHandler;
 import java.io.Serializable;
 import lombok.Data;
 
@@ -50,6 +52,7 @@ public class BarrageCollectionInfo implements Serializable {
      * 任务执行状态
      */
     @JsonProperty(value = "status")
+    @JsonDeserialize(using = BarrageStatusEnumJsonHandler.class)
     private BarrageStatusEnums status;
     /**
      * 直播间平台

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

 package com.zhiweidata.automatictest.barragecrawlerserver.enums;
 
+import org.jetbrains.annotations.NotNull;
+import org.jetbrains.annotations.Nullable;
+
 /**
  * @author aszswaz
  * @createTime 2021-09-06 11:59:49
@@ -10,17 +13,34 @@ public enum BarrageStatusEnums {
     /**
      * 等待中
      */
-    WAIT,
+    WAIT("等待中"),
     /**
      * 采集中
      */
-    COLLECTING,
+    COLLECTING("采集中"),
     /**
      * 采集失败
      */
-    FAIL,
+    FAIL("采集失败"),
     /**
      * 已结束
      */
-    ENDED
+    ENDED("已结束");
+
+    /**
+     * 状态的中文，用户前端页面展示
+     */
+    public final String chinese;
+
+    BarrageStatusEnums(String chinese) {
+        this.chinese = chinese;
+    }
+
+    @Nullable
+    public static BarrageStatusEnums getInstance(@NotNull String chinese) {
+        for (BarrageStatusEnums value : BarrageStatusEnums.values()) {
+            if (value.chinese.equals(chinese)) return value;
+        }
+        return null;
+    }
 }

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

+package com.zhiweidata.automatictest.barragecrawlerserver.jsonhandler;
+
+import com.fasterxml.jackson.core.JsonParser;
+import com.fasterxml.jackson.databind.DeserializationContext;
+import com.fasterxml.jackson.databind.JsonDeserializer;
+import com.zhiweidata.automatictest.barragecrawlerserver.enums.BarrageStatusEnums;
+import java.io.IOException;
+import org.jetbrains.annotations.NotNull;
+import org.jetbrains.annotations.Nullable;
+
+/**
+ * @author aszswaz
+ * @createTime 2021-09-18 11:44:33
+ * @ide IntelliJ IDEA
+ */
+@SuppressWarnings("JavaDoc")
+public class BarrageStatusEnumJsonHandler extends JsonDeserializer<BarrageStatusEnums> {
+    @Nullable
+    @Override
+    public BarrageStatusEnums deserialize(@NotNull JsonParser jsonParser, DeserializationContext deserializationContext) throws IOException {
+        String value = jsonParser.getValueAsString();
+        return BarrageStatusEnums.getInstance(value);
+    }
+}

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

@@ -28,6 +28,7 @@ import org.quartz.TriggerBuilder;
 import static com.zhiweidata.automatictest.barragecrawlerserver.config.BaseConfig.BARRAGE_COLLECTION_TASK_JOB_KEY;
 import static com.zhiweidata.automatictest.barragecrawlerserver.config.BaseConfig.EXPORT_START_MAX_DELAY;
 import static com.zhiweidata.automatictest.barragecrawlerserver.config.BaseConfig.TASK_URL;
+import static com.zhiweidata.automatictest.barragecrawlerserver.util.TimeUtil.randomDay;
 import static com.zhiweidata.automatictest.publics.BeanContainer.HTTP_CLIENT;
 import static com.zhiweidata.automatictest.publics.BeanContainer.SCHEDULER;
 import static com.zhiweidata.automatictest.publics.BeanContainer.SQL_SESSION_FACTORY;
@@ -119,7 +120,7 @@ public abstract class CreateTaskJob implements Job {
         triggerBuilder.withIdentity(name, group);
         triggerBuilder.withDescription("弹幕导出，以及导出的excel文件的分析");
         // 在未来 N 天内，随机一个时间启动弹幕的导出测试任务
-        triggerBuilder.startAt(TimeUtil.randomDay(EXPORT_START_MAX_DELAY));
+        triggerBuilder.startAt(randomDay(EXPORT_START_MAX_DELAY));
 
         SCHEDULER.scheduleJob(jobBuilder.build(), triggerBuilder.build());
     }