在CommandInfo字段中添加isValid字段

src/main/java/com/realtime/protection/configuration/entity/task/TaskCommandInfo.java

@@ -50,6 +50,9 @@ public class TaskCommandInfo {
     @NotNull(message = "指令结束时间不能为空。")
     private LocalDateTime endTime;
 
+    @Schema(description = "指令是否生效", example = "false")
+    private Boolean isValid = true;
+
     @Schema(description = "五元组信息")
     @NotNull(message = "五元组信息不能为空。")
     private FiveTupleWithMask fiveTupleWithMask;
@@ -68,6 +71,7 @@ public class TaskCommandInfo {
 
     @Schema(description = "防御策略模板ID", accessMode = Schema.AccessMode.READ_ONLY)
     private Integer templateId;
+
     @Schema(description = "防护等级", accessMode = Schema.AccessMode.READ_ONLY)
     private Integer protectLevel;
 }

src/main/java/com/realtime/protection/configuration/response/ResponseResult.java

@@ -4,7 +4,6 @@ import io.swagger.v3.oas.annotations.media.Schema;
 import lombok.Data;
 
 import java.io.Serializable;
-import java.util.LinkedHashMap;
 import java.util.Map;
 
 @Data

src/main/java/com/realtime/protection/server/alertmessage/AlertMessageService.java

@@ -4,10 +4,10 @@ import com.realtime.protection.configuration.entity.defense.template.ProtectLeve
 import com.realtime.protection.configuration.entity.rule.dynamicrule.AlertMessage;
 import com.realtime.protection.configuration.entity.task.FiveTupleWithMask;
 import com.realtime.protection.configuration.entity.task.TaskCommandInfo;
+import com.realtime.protection.configuration.utils.enums.StateEnum;
+import com.realtime.protection.server.command.CommandService;
 import com.realtime.protection.server.task.TaskService;
 import org.springframework.stereotype.Service;
-import com.realtime.protection.server.command.CommandService;
-import com.realtime.protection.configuration.utils.enums.StateEnum;
 
 @Service
 public class AlertMessageService {

src/main/java/com/realtime/protection/server/command/CommandService.java

@@ -75,6 +75,7 @@ public class CommandService {
         return commandMapper.stopCommandsByTaskId(taskId);
     }
 
+    @DS("doris")
     public Boolean removeCommandsByTaskId(Long taskId) {
         return commandMapper.removeCommandsByTaskId(taskId);
     }

src/main/java/com/realtime/protection/server/defense/object/ProtectObjectController.java

@@ -3,7 +3,6 @@ package com.realtime.protection.server.defense.object;
 import com.alibaba.excel.EasyExcel;
 import com.realtime.protection.configuration.entity.defense.object.ProtectObject;
 import com.realtime.protection.configuration.response.ResponseResult;
-import com.realtime.protection.configuration.utils.EntityUtils;
 import jakarta.servlet.http.HttpServletResponse;
 import jakarta.validation.Valid;
 import jakarta.validation.constraints.Min;

src/main/java/com/realtime/protection/server/defense/template/TemplateController.java

@@ -2,7 +2,6 @@ package com.realtime.protection.server.defense.template;
 
 import com.realtime.protection.configuration.entity.defense.template.Template;
 import com.realtime.protection.configuration.response.ResponseResult;
-import com.realtime.protection.configuration.utils.EntityUtils;
 import jakarta.validation.Valid;
 import jakarta.validation.constraints.Min;
 import org.springframework.web.bind.annotation.*;

src/main/java/com/realtime/protection/server/rule/staticrule/StaticRuleControllerApi.java

@@ -9,7 +9,6 @@ import io.swagger.v3.oas.annotations.media.Schema;
 import io.swagger.v3.oas.annotations.tags.Tag;
 import jakarta.servlet.http.HttpServletResponse;
 import jakarta.validation.Valid;
-import org.springframework.web.bind.annotation.GetMapping;
 import org.springframework.web.bind.annotation.PathVariable;
 import org.springframework.web.bind.annotation.RequestBody;
 import org.springframework.web.bind.annotation.RequestParam;

src/main/java/com/realtime/protection/server/task/TaskController.java

@@ -4,7 +4,6 @@ import com.realtime.protection.configuration.entity.task.Task;
 import com.realtime.protection.configuration.entity.task.TaskCommandInfo;
 import com.realtime.protection.configuration.exception.DorisStartException;
 import com.realtime.protection.configuration.response.ResponseResult;
-import com.realtime.protection.configuration.utils.EntityUtils;
 import com.realtime.protection.server.command.CommandService;
 import com.realtime.protection.server.task.status.StateChangeService;
 import jakarta.validation.Valid;

src/main/java/com/realtime/protection/server/task/TaskControllerApi.java

@@ -4,7 +4,6 @@ import com.realtime.protection.configuration.entity.task.Task;
 import com.realtime.protection.configuration.entity.task.TaskCommandInfo;
 import com.realtime.protection.configuration.exception.DorisStartException;
 import com.realtime.protection.configuration.response.ResponseResult;
-import io.netty.channel.ChannelHandler;
 import io.swagger.v3.oas.annotations.Operation;
 import io.swagger.v3.oas.annotations.Parameter;
 import io.swagger.v3.oas.annotations.media.Content;
@@ -17,10 +16,6 @@ import jakarta.validation.constraints.Min;
 import jakarta.validation.constraints.NotNull;
 import org.springframework.web.bind.annotation.*;
 
-import java.util.Map;
-
-import static com.fasterxml.jackson.databind.type.LogicalType.Map;
-
 @Tag(name = "任务控制器API", description = "任务管理模块相关的所有接口")
 public interface TaskControllerApi {
     @PostMapping("/new")

src/main/java/com/realtime/protection/server/task/status/StateChangeService.java

@@ -81,7 +81,6 @@ public class StateChangeService {
     }
 
     @Scheduled(cron = "0 0/2 * * * ?")
-    @Transactional
     @Async
     protected void finishTasks() {
         List<Long> finishedTaskIds = taskService.getFinishedTasks();

src/main/resources/mappers/CommandMapper.xml

@@ -17,7 +17,7 @@
                 #{info.fiveTupleWithMask.maskSourceIP}, #{info.fiveTupleWithMask.maskSourcePort},
                 #{info.fiveTupleWithMask.maskDestinationIP}, #{info.fiveTupleWithMask.maskDestinationPort},
                 #{info.fiveTupleWithMask.maskProtocol},
-                #{info.startTime}, #{info.endTime}, TRUE, 0, 0,
+                #{info.startTime}, #{info.endTime}, #{info.isValid}, 0, 0,
                 NOW(), NOW(), FALSE)
     </insert>
 
@@ -36,7 +36,7 @@
             #{info.fiveTupleWithMask.maskSourceIP}, #{info.fiveTupleWithMask.maskSourcePort},
             #{info.fiveTupleWithMask.maskDestinationIP}, #{info.fiveTupleWithMask.maskDestinationPort},
             #{info.fiveTupleWithMask.maskProtocol},
-            #{info.startTime}, #{info.endTime}, TRUE, 0, 0,
+            #{info.startTime}, #{info.endTime}, #{info.isValid}, 0, 0,
             NOW(), NOW(), FALSE
             )
         </foreach>

src/test/java/com/realtime/protection/server/rule/dynamic/DynamicRuleServiceTest.java

@@ -9,8 +9,6 @@ import org.springframework.boot.test.context.SpringBootTest;
 
 import java.util.List;
 
-import static org.junit.jupiter.api.Assertions.assertTrue;
-
 @SpringBootTest
 public class DynamicRuleServiceTest extends ProtectionApplicationTests {
     private final DynamicRuleService dynamicRuleService;

src/test/java/com/realtime/protection/server/task/TaskServiceTest.java

@@ -5,8 +5,6 @@ import com.realtime.protection.configuration.entity.rule.dynamicrule.DynamicRule
 import com.realtime.protection.configuration.entity.rule.staticrule.StaticRuleObject;
 import com.realtime.protection.configuration.entity.task.Task;
 import com.realtime.protection.configuration.entity.task.TaskCommandInfo;
-import com.realtime.protection.configuration.exception.DorisStartException;
-import com.realtime.protection.configuration.utils.enums.StateEnum;
 import com.realtime.protection.server.rule.dynamicrule.DynamicRuleService;
 import com.realtime.protection.server.rule.staticrule.StaticRuleService;
 import com.realtime.protection.server.task.status.StateChangeService;

src/test/java/com/realtime/protection/server/task/status/CommandServiceTest.java

@@ -13,7 +13,6 @@ import org.springframework.boot.test.context.SpringBootTest;
 
 import java.time.LocalDateTime;
 import java.util.List;
-import java.util.UUID;
 
 import static org.junit.jupiter.api.Assertions.*;