1. 重构审核状态，将其转换为状态模式，添加Using状态（使用中）

2. 策略模板添加方法，通过反射判断防护等级中是否有字段为true
2024-04-17 14:01:46 +08:00
parent de6437b8b0
commit 7e990754b9
33 changed files with 411 additions and 94 deletions
--- a/src/main/java/com/realtime/protection/server/task/TaskService.java
+++ b/src/main/java/com/realtime/protection/server/task/TaskService.java
@@ -5,7 +5,7 @@ import com.realtime.protection.configuration.entity.task.DynamicTaskInfo;
 import com.realtime.protection.configuration.entity.task.Task;
 import com.realtime.protection.configuration.entity.task.TaskCommandInfo;
 import com.realtime.protection.configuration.utils.enums.StateEnum;
-import com.realtime.protection.configuration.utils.status.AuditStatusValidator;
+import com.realtime.protection.configuration.utils.enums.audit.AuditStatusValidator;
 import lombok.extern.slf4j.Slf4j;
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
--- a/src/main/java/com/realtime/protection/server/task/status/StateChangeService.java
+++ b/src/main/java/com/realtime/protection/server/task/status/StateChangeService.java
@@ -3,7 +3,7 @@ package com.realtime.protection.server.task.status;
 import com.baomidou.dynamic.datasource.annotation.DSTransactional;
 import com.realtime.protection.configuration.exception.DorisStartException;
 import com.realtime.protection.configuration.utils.enums.StateEnum;
-import com.realtime.protection.configuration.utils.status.State;
+import com.realtime.protection.server.task.status.states.State;
 import com.realtime.protection.server.command.CommandService;
 import com.realtime.protection.server.task.TaskService;
 import lombok.extern.slf4j.Slf4j;
@@ -98,7 +98,7 @@ public class StateChangeService {
    @Async
    protected void finishTasks() {
        List<Long> finishedTaskIds = taskService.getFinishedTasks();
-        log.debug("成功扫描出所有需要变为结束状态的任务：" + finishedTaskIds);
+        log.debug("成功扫描出所有需要变为结束状态的任务：{}", finishedTaskIds);

        for (Long taskId : finishedTaskIds) {
            try {
--- a/src/main/java/com/realtime/protection/server/task/status/StateHandler.java
+++ b/src/main/java/com/realtime/protection/server/task/status/StateHandler.java
@@ -5,7 +5,7 @@ import com.realtime.protection.configuration.entity.task.Task;
 import com.realtime.protection.configuration.entity.task.TaskCommandInfo;
 import com.realtime.protection.configuration.response.SimpleResponse;
 import com.realtime.protection.configuration.utils.enums.TaskTypeEnum;
-import com.realtime.protection.configuration.utils.status.AuditStatus;
+import com.realtime.protection.configuration.utils.enums.audit.AuditStatusEnum;
 import com.realtime.protection.server.command.CommandService;
 import com.realtime.protection.server.task.TaskService;
 import org.springframework.http.HttpStatus;
@@ -36,7 +36,7 @@ public class StateHandler {
        }

        // 如果审核状态不为已通过审核，则报错
-        if (taskAuditStatus != AuditStatus.AUDITED.getAuditStatus()) {
+        if (taskAuditStatus != AuditStatusEnum.AUDITED.getNum()) {
            throw new IllegalArgumentException("无效的task_id，因为未通过审核");
        }

--- a/src/main/java/com/realtime/protection/server/task/status/states/FailedState.java
+++ b/src/main/java/com/realtime/protection/server/task/status/states/FailedState.java
@@ -2,7 +2,6 @@ package com.realtime.protection.server.task.status.states;

 import com.realtime.protection.configuration.exception.DorisStartException;
 import com.realtime.protection.configuration.utils.enums.StateEnum;
-import com.realtime.protection.configuration.utils.status.State;
 import com.realtime.protection.server.command.CommandService;
 import com.realtime.protection.server.task.TaskService;
 import com.realtime.protection.server.task.status.StateHandler;
--- a/src/main/java/com/realtime/protection/server/task/status/states/FinishedState.java
+++ b/src/main/java/com/realtime/protection/server/task/status/states/FinishedState.java
@@ -1,6 +1,5 @@
 package com.realtime.protection.server.task.status.states;

-import com.realtime.protection.configuration.utils.status.State;
 import com.realtime.protection.server.command.CommandService;
 import com.realtime.protection.server.task.TaskService;

--- a/src/main/java/com/realtime/protection/server/task/status/states/GeneratingState.java
+++ b/src/main/java/com/realtime/protection/server/task/status/states/GeneratingState.java
@@ -1,7 +1,6 @@
 package com.realtime.protection.server.task.status.states;

 import com.realtime.protection.configuration.utils.enums.StateEnum;
-import com.realtime.protection.configuration.utils.status.State;
 import com.realtime.protection.server.command.CommandService;
 import com.realtime.protection.server.task.TaskService;
 import com.realtime.protection.server.task.status.StateHandler;
--- a/src/main/java/com/realtime/protection/server/task/status/states/PauseState.java
+++ b/src/main/java/com/realtime/protection/server/task/status/states/PauseState.java
@@ -1,7 +1,6 @@
 package com.realtime.protection.server.task.status.states;

 import com.realtime.protection.configuration.utils.enums.StateEnum;
-import com.realtime.protection.configuration.utils.status.State;
 import com.realtime.protection.server.command.CommandService;
 import com.realtime.protection.server.task.TaskService;
 import com.realtime.protection.server.task.status.StateHandler;
--- a/src/main/java/com/realtime/protection/server/task/status/states/PendingState.java
+++ b/src/main/java/com/realtime/protection/server/task/status/states/PendingState.java
@@ -2,7 +2,6 @@ package com.realtime.protection.server.task.status.states;

 import com.realtime.protection.configuration.exception.DorisStartException;
 import com.realtime.protection.configuration.utils.enums.StateEnum;
-import com.realtime.protection.configuration.utils.status.State;
 import com.realtime.protection.server.command.CommandService;
 import com.realtime.protection.server.task.TaskService;
 import com.realtime.protection.server.task.status.StateHandler;
--- a/src/main/java/com/realtime/protection/server/task/status/states/RunningState.java
+++ b/src/main/java/com/realtime/protection/server/task/status/states/RunningState.java
@@ -1,7 +1,6 @@
 package com.realtime.protection.server.task.status.states;

 import com.realtime.protection.configuration.utils.enums.StateEnum;
-import com.realtime.protection.configuration.utils.status.State;
 import com.realtime.protection.server.command.CommandService;
 import com.realtime.protection.server.task.TaskService;
 import com.realtime.protection.server.task.status.StateHandler;
--- a/src/main/java/com/realtime/protection/server/task/status/states/State.java
+++ b/src/main/java/com/realtime/protection/server/task/status/states/State.java
@@ -0,0 +1,9 @@
+package com.realtime.protection.server.task.status.states;
+
+import com.realtime.protection.configuration.exception.DorisStartException;
+import com.realtime.protection.server.command.CommandService;
+import com.realtime.protection.server.task.TaskService;
+
+public interface State {
+    Boolean handle(State newState, CommandService commandService, TaskService taskService, Long taskId) throws DorisStartException;
+}
--- a/src/main/java/com/realtime/protection/server/task/status/states/StopState.java
+++ b/src/main/java/com/realtime/protection/server/task/status/states/StopState.java
@@ -2,7 +2,6 @@ package com.realtime.protection.server.task.status.states;

 import com.realtime.protection.configuration.exception.DorisStartException;
 import com.realtime.protection.configuration.utils.enums.StateEnum;
-import com.realtime.protection.configuration.utils.status.State;
 import com.realtime.protection.server.command.CommandService;
 import com.realtime.protection.server.task.TaskService;
 import com.realtime.protection.server.task.status.StateHandler;