diff --git a/src/main/java/com/realtime/protection/configuration/entity/rule/dynamicrule/DynamicRuleObject.java b/src/main/java/com/realtime/protection/configuration/entity/rule/dynamicrule/DynamicRuleObject.java index 1c77011..525abef 100644 --- a/src/main/java/com/realtime/protection/configuration/entity/rule/dynamicrule/DynamicRuleObject.java +++ b/src/main/java/com/realtime/protection/configuration/entity/rule/dynamicrule/DynamicRuleObject.java @@ -86,9 +86,9 @@ public class DynamicRuleObject { @Schema(description = "优先级", example = "1", requiredMode = Schema.RequiredMode.REQUIRED) private Integer dynamicRulePriority; @NotNull - @JsonProperty("dynamic_rule_range") - @Schema(description = "范围", example = "北京", requiredMode = Schema.RequiredMode.REQUIRED) - private String dynamicRuleRange; +// @JsonProperty("dynamic_rule_range") +// @Schema(description = "范围", example = "北京", requiredMode = Schema.RequiredMode.REQUIRED) +// private String dynamicRuleRange; @NotNull @JsonProperty("dynamic_rule_frequency") @Schema(description = "频率", example = "1", requiredMode = Schema.RequiredMode.REQUIRED) diff --git a/src/main/java/com/realtime/protection/configuration/entity/rule/staticrule/StaticRuleObject.java b/src/main/java/com/realtime/protection/configuration/entity/rule/staticrule/StaticRuleObject.java index 5dc8cda..7aab19a 100644 --- a/src/main/java/com/realtime/protection/configuration/entity/rule/staticrule/StaticRuleObject.java +++ b/src/main/java/com/realtime/protection/configuration/entity/rule/staticrule/StaticRuleObject.java @@ -135,10 +135,10 @@ public class StaticRuleObject { @Min(value = 1) @Schema(description = "优先级,1代表高2代表中3代表低", example = "1", requiredMode = Schema.RequiredMode.REQUIRED) private Integer staticRulePriority; - @JsonProperty("static_rule_range") - @ExcelProperty("范围") - @Schema(description = "范围", example = "北京", requiredMode = Schema.RequiredMode.REQUIRED) - private String staticRuleRange; +// @JsonProperty("static_rule_range") +// @ExcelProperty("范围") +// @Schema(description = "范围", example = "北京", requiredMode = Schema.RequiredMode.REQUIRED) +// private String staticRuleRange; @JsonProperty("static_rule_frequency") @ExcelProperty("频率") @Min(value = 1) diff --git a/src/main/java/com/realtime/protection/configuration/entity/task/Task.java b/src/main/java/com/realtime/protection/configuration/entity/task/Task.java index dc31aff..4070b20 100644 --- a/src/main/java/com/realtime/protection/configuration/entity/task/Task.java +++ b/src/main/java/com/realtime/protection/configuration/entity/task/Task.java @@ -78,4 +78,9 @@ public class Task { @JsonProperty("task_audit_status") @Schema(description = "任务审核状态（0为未审核，1为已退回，2为已通过）", accessMode = Schema.AccessMode.READ_ONLY) private Integer taskAuditStatus; + + @JsonProperty("task_range") + @NotNull(message = "task_range字段不能为空。") + @Schema(description = "局点范围，由规则移动到任务", example = "1009") + private String taskRange; } diff --git a/src/main/java/com/realtime/protection/server/rule/dynamicrule/DynamicRuleService.java b/src/main/java/com/realtime/protection/server/rule/dynamicrule/DynamicRuleService.java index d56279f..6e5a594 100644 --- a/src/main/java/com/realtime/protection/server/rule/dynamicrule/DynamicRuleService.java +++ b/src/main/java/com/realtime/protection/server/rule/dynamicrule/DynamicRuleService.java @@ -109,8 +109,8 @@ public class DynamicRuleService { Template template = dynamicRuleMapper.queryTemplateByRuleId(dynamicRuleId); if (template == null){ //template在表中删除了，需要重新设置template（感觉这种情况不多见） - dynamicRuleObject.setDynamicRuleSourceSystem("need reset"); - dynamicRuleObject.setDynamicRuleEventType("need reset"); + dynamicRuleObject.setDynamicRuleSourceSystem(null); + dynamicRuleObject.setDynamicRuleEventType(null); }else{ dynamicRuleObject.setDynamicRuleSourceSystem(template.getSourceSystem()); dynamicRuleObject.setDynamicRuleEventType(template.getTemplateName()); diff --git a/src/main/java/com/realtime/protection/server/rule/staticrule/StaticRuleService.java b/src/main/java/com/realtime/protection/server/rule/staticrule/StaticRuleService.java index 7068ff3..3b7f0c8 100644 --- a/src/main/java/com/realtime/protection/server/rule/staticrule/StaticRuleService.java +++ b/src/main/java/com/realtime/protection/server/rule/staticrule/StaticRuleService.java @@ -2,6 +2,7 @@ package com.realtime.protection.server.rule.staticrule; import com.alibaba.excel.util.ListUtils; import com.realtime.protection.configuration.entity.rule.staticrule.StaticRuleObject; +import com.realtime.protection.configuration.utils.Counter; import com.realtime.protection.configuration.entity.whitelist.WhiteListObject; import com.realtime.protection.configuration.utils.SqlSessionWrapper; import com.realtime.protection.configuration.utils.enums.RuleEnum; @@ -16,6 +17,11 @@ import java.net.InetAddress; import java.net.UnknownHostException; import java.nio.ByteBuffer; import java.time.LocalDateTime; +import java.time.format.DateTimeFormatter; +import java.util.HashMap; +import java.util.List; +import java.util.Map; +import java.util.Objects; import java.util.*; import java.util.function.Function; @@ -70,6 +76,9 @@ public class StaticRuleService { if (!RuleEnum.checkValidate(object)) { throw new IllegalArgumentException("静态规则不符合指定的配置方法，请参考规则模板以配置静态规则"); } + /* + 新建静态规则，过一下白名单审核 + */ List staticRuleObjects = new ArrayList<>(); staticRuleObjects.add(object); List whiteListsHit = whiteListService.whiteListStaticRulesObjectCheck(staticRuleObjects); diff --git a/src/main/java/com/realtime/protection/server/task/status/StateHandler.java b/src/main/java/com/realtime/protection/server/task/status/StateHandler.java index 3dd0d22..8b8506f 100644 --- a/src/main/java/com/realtime/protection/server/task/status/StateHandler.java +++ b/src/main/java/com/realtime/protection/server/task/status/StateHandler.java @@ -20,7 +20,7 @@ import java.util.concurrent.atomic.AtomicReference; public class StateHandler { private final WebClient client = WebClient.builder() - .baseUrl("http://192.168.107.89:9081") + .baseUrl("http://192.168.107.49:8088") .build(); protected Boolean handleStart(TaskService taskService, CommandService commandService, Long taskId) { diff --git a/src/main/resources/config/application-kafkatest.yml b/src/main/resources/config/application-kafkatest.yml index e900e5c..2e38892 100644 --- a/src/main/resources/config/application-kafkatest.yml +++ b/src/main/resources/config/application-kafkatest.yml @@ -36,7 +36,7 @@ spring: default-property-inclusion: non_null kafka: # kafka集群信息，多个用逗号间隔 - bootstrap-servers: localhost:9092 + bootstrap-servers: 192.168.107.49:9092 consumer: topic-name: topic-test # 消费者组 diff --git a/src/main/resources/config/application.yml b/src/main/resources/config/application.yml index 027b4e3..7bd1c35 100644 --- a/src/main/resources/config/application.yml +++ b/src/main/resources/config/application.yml @@ -1,3 +1,3 @@ spring: profiles: - active: test \ No newline at end of file + active: kafkatest \ No newline at end of file diff --git a/src/main/resources/mappers/AlertMessageMapper.xml b/src/main/resources/mappers/AlertMessageMapper.xml index e4376d2..421c5c7 100644 --- a/src/main/resources/mappers/AlertMessageMapper.xml +++ b/src/main/resources/mappers/AlertMessageMapper.xml @@ -21,7 +21,7 @@ - + @@ -153,7 +153,7 @@ t_task.task_end_time, t_dr.template_id, - t_dr.dynamic_rule_range, + t_task.task_range, t_dr.dynamic_rule_protect_level, t_task.task_status, diff --git a/src/main/resources/mappers/DynamicRuleMapper.xml b/src/main/resources/mappers/DynamicRuleMapper.xml index 4c926ee..b8ff03e 100644 --- a/src/main/resources/mappers/DynamicRuleMapper.xml +++ b/src/main/resources/mappers/DynamicRuleMapper.xml @@ -12,15 +12,15 @@ (dynamic_rule_name, create_time, modify_time, dynamic_rule_create_username, dynamic_rule_create_depart, template_id, dynamic_rule_protect_level, - dynamic_rule_priority, dynamic_rule_range, + dynamic_rule_priority, dynamic_rule_frequency, dynamic_rule_create_user_id, log_rule_id) values (#{object.dynamicRuleName}, NOW(), #{object.dynamicRuleModifyTime}, #{object.dynamicRuleCreateUsername}, #{object.dynamicRuleCreateDepart}, #{object.templateId}, #{object.dynamicRuleProtectLevel}, - #{object.dynamicRulePriority}, #{object.dynamicRuleRange}, + #{object.dynamicRulePriority}, #{object.dynamicRuleFrequency}, - #{object.dynamicRuleCreateUserId},#{object.logRuleId}) + #{object.dynamicRuleCreateUserId}, #{object.logRuleId}) @@ -34,8 +34,8 @@ (dynamic_rule_name, create_time, modify_time, dynamic_rule_create_username, dynamic_rule_create_depart, template_id, dynamic_rule_protect_level, - dynamic_rule_priority, dynamic_rule_range, - dynamic_rule_frequency, dynamic_rule_create_user_id,log_rule_id + dynamic_rule_priority, + dynamic_rule_frequency, dynamic_rule_create_user_id, log_rule_id ) values @@ -43,9 +43,9 @@ NOW(),#{object.dynamicRuleModifyTime}, #{object.dynamicRuleCreateUsername},#{object.dynamicRuleCreateDepart}, #{object.templateId}, #{object.dynamicRuleProtectLevel}, - #{object.dynamicRulePriority}, #{object.dynamicRuleRange}, + #{object.dynamicRulePriority}, #{object.dynamicRuleFrequency}, - #{object.dynamicRuleCreateUserId},#{object.logRuleId}) + #{object.dynamicRuleCreateUserId}, #{object.logRuleId}) @@ -95,7 +95,6 @@ #{object.dynamicRuleProtectLevel}, dynamic_rule_priority = #{object.dynamicRulePriority}, - dynamic_rule_range = #{object.dynamicRuleRange}, dynamic_rule_frequency = #{object.dynamicRuleFrequency}, modify_time = NOW() where @@ -134,7 +133,6 @@ - @@ -148,7 +146,6 @@ - diff --git a/src/main/resources/mappers/StaticRuleMapper.xml b/src/main/resources/mappers/StaticRuleMapper.xml index e0b1ce5..8443bc8 100644 --- a/src/main/resources/mappers/StaticRuleMapper.xml +++ b/src/main/resources/mappers/StaticRuleMapper.xml @@ -6,22 +6,22 @@ - insert into t_static_rule(static_rule_name, static_rule_create_time, static_rule_create_username, static_rule_create_depart, static_rule_create_user_id, static_rule_sip, static_rule_msip, static_rule_sport, static_rule_msport, static_rule_dip, static_rule_mdip, static_rule_dport, static_rule_mdport, static_rule_protocol, static_rule_mprotocol, static_rule_dns, - static_rule_url, static_rule_priority, static_rule_range, - static_rule_frequency, static_rule_audit_status) + static_rule_url, static_rule_priority, + static_rule_frequency, static_rule_audit_status + ) values (#{object.staticRuleName}, #{object.staticRuleCreateTime}, #{object.staticRuleCreateUsername}, #{object.staticRuleCreateDepart}, #{object.staticRuleCreateUserId}, INET_ATON(#{object.staticRuleSip}), INET_ATON(#{object.staticRuleMsip}), #{object.staticRuleSport}, #{object.staticRuleMsport}, INET_ATON(#{object.staticRuleDip}), INET_ATON(#{object.staticRuleMdip}), #{object.staticRuleDport}, #{object.staticRuleMdport}, #{object.staticRuleProtocol}, #{object.staticRuleMprotocol}, #{object.staticRuleDns}, #{object.staticRuleURL}, #{object.staticRulePriority}, - #{object.staticRuleRange}, #{object.staticRuleFrequency}, + #{object.staticRuleFrequency}, #{object.auditStatus}) @@ -31,8 +31,9 @@ static_rule_sport, static_rule_msport, static_rule_dip, static_rule_mdip, static_rule_dport, static_rule_mdport, static_rule_protocol, static_rule_mprotocol, static_rule_dns, - static_rule_url, static_rule_priority, static_rule_range, - static_rule_frequency, static_rule_audit_status) + static_rule_url, static_rule_priority, + static_rule_frequency, static_rule_audit_status + ) values (#{object.staticRuleName}, NOW(), #{object.staticRuleCreateUsername}, @@ -41,8 +42,8 @@ INET_ATON(#{object.staticRuleDip}), INET_ATON(#{object.staticRuleMdip}), #{object.staticRuleDport}, #{object.staticRuleMdport}, #{object.staticRuleProtocol}, #{object.staticRuleMprotocol}, #{object.staticRuleDns}, #{object.staticRuleURL}, #{object.staticRulePriority}, - #{object.staticRuleRange}, #{object.staticRuleFrequency}, - 0) + #{object.staticRuleFrequency}, 0 + ) @@ -68,9 +69,7 @@ static_rule_priority = #{object.staticRulePriority}, - - static_rule_range = #{object.staticRuleRange}, - + static_rule_frequency = #{object.staticRuleFrequency}, @@ -132,7 +131,6 @@ - diff --git a/src/main/resources/mappers/TaskMapper.xml b/src/main/resources/mappers/TaskMapper.xml index 32322e5..d8d58e8 100644 --- a/src/main/resources/mappers/TaskMapper.xml +++ b/src/main/resources/mappers/TaskMapper.xml @@ -8,11 +8,14 @@ INSERT INTO t_task(task_name, task_start_time, task_end_time, task_act, task_type, task_create_time, task_modify_time, - task_create_userid, task_create_username, task_create_depart) - VALUE (#{task.taskName}, #{task.taskStartTime}, #{task.taskEndTime}, - #{task.taskAct}, #{task.taskType}, - NOW(), NOW(), - #{task.taskCreateUserId}, #{task.taskCreateUsername}, #{task.taskCreateDepart}) + task_create_userid, task_create_username, task_create_depart,task_range + ) + VALUE (#{task.taskName}, #{task.taskStartTime}, #{task.taskEndTime}, + #{task.taskAct}, #{task.taskType}, + NOW(), NOW(), + #{task.taskCreateUserId}, #{task.taskCreateUsername}, #{task.taskCreateDepart},#{task.taskRange}) + } + ) @@ -44,6 +47,7 @@ + @@ -136,6 +140,7 @@ task_act = #{task.taskAct}, task_start_time = #{task.taskStartTime}, task_end_time = #{task.taskEndTime}, + task_range = #{task.taskRange}, task_modify_time = NOW(), WHERE task_id = #{task.taskId} @@ -202,7 +207,7 @@ - + @@ -226,12 +231,13 @@ INSERT INTO t_task(task_name, task_start_time, task_end_time, task_create_time, task_modify_time, task_type, - task_act, task_create_username, task_create_depart, task_create_userid) + task_act, task_create_username, task_create_depart, task_create_userid, task_range) VALUE ( - #{info.taskName}, #{info.startTime}, #{info.endTime}, NOW(), NOW(), #{info.taskType}, - #{info.taskAct}, #{info.taskCreateUsername}, #{info.taskCreateDepart}, #{info.taskCreateUserId} - ); + #{info.taskName}, #{info.startTime}, #{info.endTime}, NOW(), NOW(), #{info.taskType}, + #{info.taskAct}, #{info.taskCreateUsername}, #{info.taskCreateDepart}, #{info.taskCreateUserId}, + #{info.distributePoint}} + ); diff --git a/src/test/java/com/realtime/protection/server/alertmessage/AlertMessageTest.java b/src/test/java/com/realtime/protection/server/alertmessage/AlertMessageTest.java index b5f4870..b30074c 100644 --- a/src/test/java/com/realtime/protection/server/alertmessage/AlertMessageTest.java +++ b/src/test/java/com/realtime/protection/server/alertmessage/AlertMessageTest.java @@ -55,12 +55,13 @@ public class AlertMessageTest { object.setDynamicRuleName("UpdateDynamicRule2"); object.setDynamicRuleFrequency(1); object.setDynamicRulePriority(1); - object.setDynamicRuleRange("北京"); +// object.setDynamicRuleRange("北京"); object.setDynamicRuleProtectLevel(1); object.setLogRuleId(1L); object.setTemplateId(templates.get(0).getTemplateId()); object.setProtectObjectIds(List.of(new Integer[]{protectObject.get(0).getProtectObjectId()})); Integer dynamicRuleId = dynamicRuleService.newDynamicRuleObject(object); + dynamicRuleService.updateAuditStatus(object.getDynamicRuleId(), 2); Task task = new Task(); @@ -82,22 +83,22 @@ public class AlertMessageTest { //启动任务 stateChangeService.changeState(2, taskId, false); - for (int i = 0 ; i< 5; i++) { - AlertMessage alert = new AlertMessage(); - FiveTupleWithMask fiveTupleWithMask = new FiveTupleWithMask(); - fiveTupleWithMask.setSourceIP("111.1.1." + i); - fiveTupleWithMask.setDestinationIP("222.22.2." + i); - fiveTupleWithMask.setSourcePort("111"); - fiveTupleWithMask.setDestinationPort("222"); - fiveTupleWithMask.setProtocol("tcp"); - - alert.setDynamicRuleId(dynamicRuleId); - alert.setTaskId(taskId); - alert.setFiveTupleWithMask(fiveTupleWithMask); - alert.setContent("testcontent"); - alert.setProtectIsSrcOrDst(1); - alertMessageService.processAlertMessage(alert); - } +// for (int i = 0 ; i< 5; i++) { +// AlertMessage alert = new AlertMessage(); +// FiveTupleWithMask fiveTupleWithMask = new FiveTupleWithMask(); +// fiveTupleWithMask.setSourceIP("111.1.1." + i); +// fiveTupleWithMask.setDestinationIP("222.22.2." + i); +// fiveTupleWithMask.setSourcePort("111"); +// fiveTupleWithMask.setDestinationPort("222"); +// fiveTupleWithMask.setProtocol("tcp"); +// +// alert.setDynamicRuleId(dynamicRuleId); +// alert.setTaskId(taskId); +// alert.setFiveTupleWithMask(fiveTupleWithMask); +// alert.setContent("testcontent"); +// alert.setProtectIsSrcOrDst(1); +// alertMessageService.processAlertMessage(alert); +// } diff --git a/src/test/java/com/realtime/protection/server/rule/dynamic/DynamicRuleServiceTest.java b/src/test/java/com/realtime/protection/server/rule/dynamic/DynamicRuleServiceTest.java index 9976537..7cdd46a 100644 --- a/src/test/java/com/realtime/protection/server/rule/dynamic/DynamicRuleServiceTest.java +++ b/src/test/java/com/realtime/protection/server/rule/dynamic/DynamicRuleServiceTest.java @@ -48,7 +48,7 @@ public class DynamicRuleServiceTest extends ProtectionApplicationTests { object.setDynamicRuleName("UpdateDynamicRule2"); object.setDynamicRuleFrequency(1); object.setDynamicRulePriority(1); - object.setDynamicRuleRange("北京"); +// object.setDynamicRuleRange("北京"); object.setDynamicRuleProtectLevel(2); object.setTemplateId(templates.get(0).getTemplateId()); object.setLogRuleId(1L); @@ -77,7 +77,7 @@ public class DynamicRuleServiceTest extends ProtectionApplicationTests { object.setDynamicRuleName("UpdateDynamicRule2"); object.setDynamicRuleFrequency(1); object.setDynamicRulePriority(1); - object.setDynamicRuleRange("北京"); +// object.setDynamicRuleRange("北京"); object.setDynamicRuleProtectLevel(2); object.setTemplateId(templates.get(0).getTemplateId()); object.setProtectObjectIds(List.of(new Integer[]{protectObject.get(0).getProtectObjectId()})); @@ -117,7 +117,7 @@ public class DynamicRuleServiceTest extends ProtectionApplicationTests { object.setDynamicRuleName("UpdateDynamicRule2"); object.setDynamicRuleFrequency(1); object.setDynamicRulePriority(1); - object.setDynamicRuleRange("北京"); +// object.setDynamicRuleRange("北京"); object.setDynamicRuleProtectLevel(2); object.setTemplateId(1); object.setProtectObjectIds(List.of(new Integer[]{6061})); diff --git a/src/test/java/com/realtime/protection/server/rule/staticrule/StaticRuleServiceTest.java b/src/test/java/com/realtime/protection/server/rule/staticrule/StaticRuleServiceTest.java index 28c2fef..fad0079 100644 --- a/src/test/java/com/realtime/protection/server/rule/staticrule/StaticRuleServiceTest.java +++ b/src/test/java/com/realtime/protection/server/rule/staticrule/StaticRuleServiceTest.java @@ -40,7 +40,7 @@ public class StaticRuleServiceTest extends ProtectionApplicationTests { staticRuleTest.setStaticRulePriority(1); staticRuleTest.setStaticRuleFrequency(1); - staticRuleTest.setStaticRuleRange("北京"); +// staticRuleTest.setStaticRuleRange("北京"); } @@ -85,7 +85,7 @@ public class StaticRuleServiceTest extends ProtectionApplicationTests { object.setStaticRuleDip("2.2.3.100"); object.setStaticRulePriority(2); object.setStaticRuleFrequency(1); - object.setStaticRuleRange("北京"); +// object.setStaticRuleRange("北京"); // object.setStaticRuleProtectLevel(2); staticRuleService.updateStaticRule(5, object); diff --git a/src/test/java/com/realtime/protection/server/task/TaskServiceTest.java b/src/test/java/com/realtime/protection/server/task/TaskServiceTest.java index 63c0aa8..13c4842 100644 --- a/src/test/java/com/realtime/protection/server/task/TaskServiceTest.java +++ b/src/test/java/com/realtime/protection/server/task/TaskServiceTest.java @@ -1,12 +1,17 @@ package com.realtime.protection.server.task; import com.realtime.protection.ProtectionApplicationTests; +import com.realtime.protection.configuration.entity.defense.object.ProtectObject; +import com.realtime.protection.configuration.entity.defense.template.Template; import com.realtime.protection.configuration.entity.rule.dynamicrule.DynamicRuleObject; import com.realtime.protection.configuration.entity.rule.staticrule.StaticRuleObject; 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.exception.DorisStartException; +import com.realtime.protection.server.command.CommandService; +import com.realtime.protection.server.defense.object.ProtectObjectService; +import com.realtime.protection.server.defense.template.TemplateService; import com.realtime.protection.server.rule.dynamicrule.DynamicRuleService; import com.realtime.protection.server.rule.staticrule.StaticRuleService; import com.realtime.protection.server.task.status.StateChangeService; @@ -30,14 +35,20 @@ class TaskServiceTest extends ProtectionApplicationTests { private final StaticRuleService staticRuleService; private final DynamicRuleService dynamicRuleService; private final StateChangeService stateChangeService; + private final CommandService commandService; + private final ProtectObjectService protectObjectService; + private final TemplateService templateService; private Task task; @Autowired - TaskServiceTest(TaskService taskService, StaticRuleService staticRuleService, DynamicRuleService dynamicRuleService, StateChangeService stateChangeService) { + TaskServiceTest(TaskService taskService, StaticRuleService staticRuleService, DynamicRuleService dynamicRuleService, StateChangeService stateChangeService, CommandService commandService, ProtectObjectService protectObjectService, TemplateService templateService) { this.taskService = taskService; this.staticRuleService = staticRuleService; this.dynamicRuleService = dynamicRuleService; this.stateChangeService = stateChangeService; + this.commandService = commandService; + this.protectObjectService = protectObjectService; + this.templateService = templateService; } @BeforeEach @@ -204,4 +215,114 @@ class TaskServiceTest extends ProtectionApplicationTests { stateChangeService.changeState(2, 43844L, false); } + + + @Test + void testStartStaticTask() throws DorisStartException { + StaticRuleObject staticRuleTest = new StaticRuleObject(); + staticRuleTest.setStaticRuleName("mh-静态测试"); + staticRuleTest.setStaticRuleCreateUsername("mh"); + staticRuleTest.setStaticRuleCreateDepart("mmeess"); + staticRuleTest.setStaticRuleCreateUserId(2); + staticRuleTest.setAuditStatus(0); + + staticRuleTest.setStaticRuleSip("1.1.2.0"); +// staticRuleTest.setStaticRuleMsip("255.255.255.0"); + +// staticRuleTest.setStaticRuleDip("1.1.1.2"); +// staticRuleTest.setStaticRuleMdip("255.255.255.0"); +// staticRuleTest.setStaticRuleSport(80); + + staticRuleTest.setStaticRulePriority(1); + staticRuleTest.setStaticRuleFrequency(1); +// staticRuleTest.setStaticRuleRange("北京"); + Integer staticRuleId = staticRuleService.newStaticRuleObject(staticRuleTest); + + + Task task = new Task(); + task.setTaskName("mh-task测试3"); + + LocalDateTime taskStartTime = LocalDateTime.now().plusMinutes(1); + LocalDateTime taskEndTime = LocalDateTime.now().plusYears(5); + + task.setTaskStartTime(taskStartTime); + task.setTaskEndTime(taskEndTime); + task.setTaskAct("阻断"); + task.setTaskType(1); + task.setTaskRange("1009"); + + task.setTaskCreateUserId(1); + task.setTaskCreateUsername("xxx"); + task.setTaskCreateDepart("xxx"); + + List staticRuleIds = new ArrayList<>(); + staticRuleIds.add(staticRuleId); + staticRuleService.updateAuditStatus(staticRuleId, 2); + + task.setStaticRuleIds(staticRuleIds); + + Long taskId = taskService.newTask(task); + +// + taskService.changeTaskAuditStatus(taskId, 2); + + stateChangeService.changeState(2, taskId, false); + + System.out.println(commandService.queryCommandInfos(taskId, null, null, null, null, 1, 5)); + + } + + @Test + void testQueryCommandsByTaskId() { + List taskCommandInfos = commandService.queryCommandInfos(43912L, null, null, null, null, 1, 5); + System.out.println(taskCommandInfos); + + + } + + @Test + void testStartDynamicTask() throws DorisStartException { + List protectObject = protectObjectService.queryProtectObjects( + null, null, null, null, + null, null, null, null, + null, null, 1, 1); + List