diff --git a/src/main/java/com/realtime/protection/server/command/CommandMapper.java b/src/main/java/com/realtime/protection/server/command/CommandMapper.java index 41529f1..3ab7c5f 100644 --- a/src/main/java/com/realtime/protection/server/command/CommandMapper.java +++ b/src/main/java/com/realtime/protection/server/command/CommandMapper.java @@ -32,4 +32,10 @@ public interface CommandMapper { TaskCommandInfo queryCommandInfoByUUID(@Param("uuid") String uuid); String queryCommandInfo(@Param("command_info") TaskCommandInfo commandInfo); + + Integer queryCommandTotalNum(@Param("task_id") Long taskId, + @Param("src_ip") String sourceIP, + @Param("src_port") String sourcePort, + @Param("dst_ip") String destinationIP, + @Param("dst_port") String destinationPort); } diff --git a/src/main/java/com/realtime/protection/server/command/CommandService.java b/src/main/java/com/realtime/protection/server/command/CommandService.java index 91a3835..92c9094 100644 --- a/src/main/java/com/realtime/protection/server/command/CommandService.java +++ b/src/main/java/com/realtime/protection/server/command/CommandService.java @@ -93,4 +93,9 @@ public class CommandService { public Boolean setCommandJudged(String commandId, Boolean isValid) { return commandMapper.setCommandJudged(commandId, isValid); } + + public Integer queryCommandTotalNum(Long taskId, String sourceIP, String sourcePort, + String destinationIP, String destinationPort){ + return commandMapper.queryCommandTotalNum(taskId, sourceIP, sourcePort, destinationIP, destinationPort); + } } diff --git a/src/main/java/com/realtime/protection/server/defense/object/ProtectObjectController.java b/src/main/java/com/realtime/protection/server/defense/object/ProtectObjectController.java index 9115354..3eff9ea 100644 --- a/src/main/java/com/realtime/protection/server/defense/object/ProtectObjectController.java +++ b/src/main/java/com/realtime/protection/server/defense/object/ProtectObjectController.java @@ -77,7 +77,7 @@ public class ProtectObjectController implements ProtectObjectControllerApi { return ResponseResult.ok() .setData("proobj_list", protectObjectService.queryProtectObjects(protectObjectName, protectObjectId, page, pageSize)) - .setData("total_num", protectObjectService.queryProtectObjectsTotalNum()); + .setData("total_num", protectObjectService.queryProtectObjectsTotalNum(protectObjectName, protectObjectId)); } @Override diff --git a/src/main/java/com/realtime/protection/server/defense/object/ProtectObjectMapper.java b/src/main/java/com/realtime/protection/server/defense/object/ProtectObjectMapper.java index fbffeff..5a1513c 100644 --- a/src/main/java/com/realtime/protection/server/defense/object/ProtectObjectMapper.java +++ b/src/main/java/com/realtime/protection/server/defense/object/ProtectObjectMapper.java @@ -3,7 +3,6 @@ package com.realtime.protection.server.defense.object; import com.realtime.protection.configuration.entity.defense.object.ProtectObject; import org.apache.ibatis.annotations.Mapper; import org.apache.ibatis.annotations.Param; -import org.apache.ibatis.annotations.Select; import java.util.List; @@ -29,6 +28,7 @@ public interface ProtectObjectMapper { Boolean changeProtectObjectAuditStatus(@Param("proobj_id") Integer protectObjectId, @Param("proobj_audit_status") Integer protectObjectAuditStatus); - @Select("SELECT COUNT(protect_object_id) FROM t_protect_object") - Integer queryProtectObjectsTotalNum(); + + Integer queryProtectObjectsTotalNum(@Param("proobj_name") String protectObjectName, + @Param("proobj_id") Integer protectObjectId); } diff --git a/src/main/java/com/realtime/protection/server/defense/object/ProtectObjectService.java b/src/main/java/com/realtime/protection/server/defense/object/ProtectObjectService.java index ed2e790..a1ceb23 100644 --- a/src/main/java/com/realtime/protection/server/defense/object/ProtectObjectService.java +++ b/src/main/java/com/realtime/protection/server/defense/object/ProtectObjectService.java @@ -113,7 +113,7 @@ public class ProtectObjectService { return resultMap; } - public Integer queryProtectObjectsTotalNum() { - return protectObjectMapper.queryProtectObjectsTotalNum(); + public Integer queryProtectObjectsTotalNum(String protectObjectName, Integer protectObjectId) { + return protectObjectMapper.queryProtectObjectsTotalNum(protectObjectName, protectObjectId); } } diff --git a/src/main/java/com/realtime/protection/server/defense/template/TemplateController.java b/src/main/java/com/realtime/protection/server/defense/template/TemplateController.java index 7eb4553..585dab4 100644 --- a/src/main/java/com/realtime/protection/server/defense/template/TemplateController.java +++ b/src/main/java/com/realtime/protection/server/defense/template/TemplateController.java @@ -44,7 +44,7 @@ public class TemplateController implements TemplateControllerApi { return ResponseResult.ok() .setData("templates", templates) - .setData("total_num", templateService.queryTemplateTotalNum()); + .setData("total_num", templateService.queryTemplateTotalNum(templateName)); } @Override diff --git a/src/main/java/com/realtime/protection/server/defense/template/TemplateMapper.java b/src/main/java/com/realtime/protection/server/defense/template/TemplateMapper.java index 4d33cab..e786f51 100644 --- a/src/main/java/com/realtime/protection/server/defense/template/TemplateMapper.java +++ b/src/main/java/com/realtime/protection/server/defense/template/TemplateMapper.java @@ -5,7 +5,6 @@ import com.realtime.protection.configuration.entity.defense.template.Template; import org.apache.ibatis.annotations.Delete; import org.apache.ibatis.annotations.Mapper; import org.apache.ibatis.annotations.Param; -import org.apache.ibatis.annotations.Select; import java.util.List; @@ -28,6 +27,5 @@ public interface TemplateMapper { @Delete("DELETE FROM t_strategy_template WHERE strategy_template_id = #{template_id}") Boolean deleteTemplate(@Param("template_id") Integer templateId); - @Select("SELECT COUNT(strategy_template_id) FROM t_strategy_template") - Integer queryTemplateTotalNum(); + Integer queryTemplateTotalNum(String templateName); } diff --git a/src/main/java/com/realtime/protection/server/defense/template/TemplateService.java b/src/main/java/com/realtime/protection/server/defense/template/TemplateService.java index 9269ddf..4a3aa88 100644 --- a/src/main/java/com/realtime/protection/server/defense/template/TemplateService.java +++ b/src/main/java/com/realtime/protection/server/defense/template/TemplateService.java @@ -47,7 +47,7 @@ public class TemplateService { return templateMapper.deleteTemplate(templateId); } - public Integer queryTemplateTotalNum() { - return templateMapper.queryTemplateTotalNum(); + public Integer queryTemplateTotalNum(String templateName) { + return templateMapper.queryTemplateTotalNum(templateName); } } diff --git a/src/main/java/com/realtime/protection/server/rule/dynamicrule/DynamicRuleController.java b/src/main/java/com/realtime/protection/server/rule/dynamicrule/DynamicRuleController.java index e1fa9a5..6c7c1ee 100644 --- a/src/main/java/com/realtime/protection/server/rule/dynamicrule/DynamicRuleController.java +++ b/src/main/java/com/realtime/protection/server/rule/dynamicrule/DynamicRuleController.java @@ -104,7 +104,8 @@ public class DynamicRuleController implements DynamicRuleControllerApi { .setData("success", true) .setData("dynamic_rule_list", dynamicRuleService.queryDynamicRuleObject(dynamicRuleName, dynamicRuleId, protectObjectSourceSystem, creator, page, pageSize)) - .setData("total_num",dynamicRuleService.queryDynamicRuleTotalNum()); + .setData("total_num",dynamicRuleService.queryDynamicRuleTotalNum(dynamicRuleName, dynamicRuleId, + protectObjectSourceSystem, creator)); } //详情查看?? 就是按id查询吧 diff --git a/src/main/java/com/realtime/protection/server/rule/dynamicrule/DynamicRuleMapper.java b/src/main/java/com/realtime/protection/server/rule/dynamicrule/DynamicRuleMapper.java index c57aa41..e627226 100644 --- a/src/main/java/com/realtime/protection/server/rule/dynamicrule/DynamicRuleMapper.java +++ b/src/main/java/com/realtime/protection/server/rule/dynamicrule/DynamicRuleMapper.java @@ -41,5 +41,6 @@ public interface DynamicRuleMapper { boolean queryProtectObjectById(Integer protectObjectId); - Integer queryDynamicRuleTotalNum(); + Integer queryDynamicRuleTotalNum(String dynamicRuleName, Integer dynamicRuleId, + String sourceSystem, String creator); } 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 44cb20f..ebdbf00 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 @@ -161,7 +161,9 @@ public class DynamicRuleService { templateSourceSystem, creator, page, pageSize); } - public Integer queryDynamicRuleTotalNum() { - return dynamicRuleMapper.queryDynamicRuleTotalNum(); + public Integer queryDynamicRuleTotalNum(String dynamicRuleName, Integer dynamicRuleId, + String protectObjectSourceSystem, String creator) { + return dynamicRuleMapper.queryDynamicRuleTotalNum(dynamicRuleName, dynamicRuleId, + protectObjectSourceSystem, creator); } } diff --git a/src/main/java/com/realtime/protection/server/rule/staticrule/StaticRuleController.java b/src/main/java/com/realtime/protection/server/rule/staticrule/StaticRuleController.java index 2331ccd..e316001 100644 --- a/src/main/java/com/realtime/protection/server/rule/staticrule/StaticRuleController.java +++ b/src/main/java/com/realtime/protection/server/rule/staticrule/StaticRuleController.java @@ -139,7 +139,8 @@ public class StaticRuleController implements StaticRuleControllerApi { static_rule_creator, static_rule_ip, page, pageSize); return ResponseResult.ok() .setData("static_rule_list", pageResult) - .setData("total_num",staticRuleService.queryStaticRuleTotalNum()); + .setData("total_num",staticRuleService.queryStaticRuleTotalNum(static_rule_name, static_rule_id, + static_rule_creator, static_rule_ip)); } /** diff --git a/src/main/java/com/realtime/protection/server/rule/staticrule/StaticRuleMapper.java b/src/main/java/com/realtime/protection/server/rule/staticrule/StaticRuleMapper.java index 6f3a597..47b2400 100644 --- a/src/main/java/com/realtime/protection/server/rule/staticrule/StaticRuleMapper.java +++ b/src/main/java/com/realtime/protection/server/rule/staticrule/StaticRuleMapper.java @@ -39,5 +39,6 @@ public interface StaticRuleMapper { Boolean updateAuditStatusById(Integer id, Integer auditStatus); - Integer queryStaticRuleTotalNum(); + Integer queryStaticRuleTotalNum(String static_rule_name, Integer static_rule_id, + String static_rule_create_username, String ip); } 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 573a161..8429f81 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 @@ -148,7 +148,9 @@ public class StaticRuleService { staticRuleMapper.deleteStaticRuleById(id); } - public Integer queryStaticRuleTotalNum() { - return staticRuleMapper.queryStaticRuleTotalNum(); + public Integer queryStaticRuleTotalNum(String static_rule_name, Integer static_rule_id, + String static_rule_creator, String static_rule_ip) { + return staticRuleMapper.queryStaticRuleTotalNum(static_rule_name, static_rule_id, + static_rule_creator, static_rule_ip); } } diff --git a/src/main/java/com/realtime/protection/server/task/TaskController.java b/src/main/java/com/realtime/protection/server/task/TaskController.java index 8e6e96e..580294c 100644 --- a/src/main/java/com/realtime/protection/server/task/TaskController.java +++ b/src/main/java/com/realtime/protection/server/task/TaskController.java @@ -67,7 +67,7 @@ public class TaskController implements TaskControllerApi { @Override @GetMapping("/query") public ResponseResult queryTasks(@RequestParam(value = "task_status", required = false) Integer taskStatus, - @RequestParam(value = "task_type", required = false) String taskType, + @RequestParam(value = "task_type", required = false) Integer taskType, @RequestParam(value = "task_name", required = false) String taskName, @RequestParam(value = "task_creator", required = false) String taskCreator, @RequestParam("page") @Min(1) Integer page, @@ -75,7 +75,7 @@ public class TaskController implements TaskControllerApi { List tasks = taskService.queryTasks(taskStatus, taskType, taskName, taskCreator, page, pageSize); return ResponseResult.ok() .setData("task_list", tasks) - .setData("total_num", taskService.queryTaskTotalNum()); + .setData("total_num", taskService.queryTaskTotalNum(taskStatus, taskType, taskName, taskCreator)); } @Override @@ -143,7 +143,8 @@ public class TaskController implements TaskControllerApi { return ResponseResult.ok() .setData("success", true) - .setData("commands", taskCommandInfos); + .setData("commands", taskCommandInfos) + .setData("total_num", commandService.queryCommandTotalNum(taskId, sourceIP, sourcePort, destinationIP, destinationPort)); } @GetMapping("/{commandId}/valid/{isJudged}") diff --git a/src/main/java/com/realtime/protection/server/task/TaskControllerApi.java b/src/main/java/com/realtime/protection/server/task/TaskControllerApi.java index 98ca0c0..538aebe 100644 --- a/src/main/java/com/realtime/protection/server/task/TaskControllerApi.java +++ b/src/main/java/com/realtime/protection/server/task/TaskControllerApi.java @@ -186,7 +186,7 @@ public interface TaskControllerApi { } ) ResponseResult queryTasks(@RequestParam(value = "task_status", required = false) Integer taskStatus, - @RequestParam(value = "task_type", required = false) String taskType, + @RequestParam(value = "task_type", required = false) Integer taskType, @RequestParam(value = "task_name", required = false) String taskName, @RequestParam(value = "task_creator", required = false) String taskCreator, @RequestParam("page") @Min(1) Integer page, diff --git a/src/main/java/com/realtime/protection/server/task/TaskMapper.java b/src/main/java/com/realtime/protection/server/task/TaskMapper.java index 3ca4060..7425806 100644 --- a/src/main/java/com/realtime/protection/server/task/TaskMapper.java +++ b/src/main/java/com/realtime/protection/server/task/TaskMapper.java @@ -21,7 +21,7 @@ public interface TaskMapper { void newTaskUsingCommandInfo(@Param("info") TaskCommandInfo taskCommandInfo); - List queryTasks(@Param("task_status") Integer taskStatus, @Param("task_type") String task_type, + List queryTasks(@Param("task_status") Integer taskStatus, @Param("task_type") Integer task_type, @Param("task_name") String taskName, @Param("task_creator") String taskCreator, @Param("page") Integer page, @Param("page_size") Integer pageSize); @@ -54,6 +54,7 @@ public interface TaskMapper { @Select("SELECT task_id FROM t_task WHERE task_end_time < NOW() AND task_status != #{task_status}") List queryTasksByStatus(@Param("task_status") Integer taskStatus); - @Select("SELECT COUNT(task_id) FROM t_task") - Integer queryTaskTotalNum(); + + Integer queryTaskTotalNum(@Param("task_status") Integer taskStatus, @Param("task_type") Integer task_type, + @Param("task_name") String taskName, @Param("task_creator") String taskCreator); } diff --git a/src/main/java/com/realtime/protection/server/task/TaskService.java b/src/main/java/com/realtime/protection/server/task/TaskService.java index 0107ca5..d61a16a 100644 --- a/src/main/java/com/realtime/protection/server/task/TaskService.java +++ b/src/main/java/com/realtime/protection/server/task/TaskService.java @@ -41,7 +41,7 @@ public class TaskService { @Transactional public List queryTasks(Integer taskStatus, - String taskType, String taskName, String taskCreator, + Integer taskType, String taskName, String taskCreator, Integer page, Integer pageSize) { List tasks = taskMapper.queryTasks(taskStatus, taskType, taskName, taskCreator, page, pageSize); for (Task task : tasks) { @@ -132,7 +132,7 @@ public class TaskService { return taskMapper.queryTasksByStatus(StateEnum.FINISHED.getStateNum()); } - public Integer queryTaskTotalNum() { - return taskMapper.queryTaskTotalNum(); + public Integer queryTaskTotalNum(Integer taskStatus, Integer taskType, String taskName,String taskCreator) { + return taskMapper.queryTaskTotalNum(taskStatus, taskType, taskName, taskCreator); } } diff --git a/src/main/java/com/realtime/protection/server/whitelist/WhiteListController.java b/src/main/java/com/realtime/protection/server/whitelist/WhiteListController.java index 3e1542c..6b2f554 100644 --- a/src/main/java/com/realtime/protection/server/whitelist/WhiteListController.java +++ b/src/main/java/com/realtime/protection/server/whitelist/WhiteListController.java @@ -70,7 +70,7 @@ public class WhiteListController implements WhiteListControllerApi { } return ResponseResult.ok() .setData("whiteobj_list", whiteListService.queryWhiteListObject(whiteListName, whiteListId, page, pageSize)) - .setData("total_num", whiteListService.queryWhiteListTotalNum()); + .setData("total_num", whiteListService.queryWhiteListTotalNum(whiteListName, whiteListId)); } @Override diff --git a/src/main/java/com/realtime/protection/server/whitelist/WhiteListMapper.java b/src/main/java/com/realtime/protection/server/whitelist/WhiteListMapper.java index 24b407c..eb473aa 100644 --- a/src/main/java/com/realtime/protection/server/whitelist/WhiteListMapper.java +++ b/src/main/java/com/realtime/protection/server/whitelist/WhiteListMapper.java @@ -39,5 +39,5 @@ public interface WhiteListMapper { List whiteListCommandJudge(@Param("command") FiveTupleWithMask fiveTupleWithMaskInCommand); - Integer queryWhiteListTotalNum(); + Integer queryWhiteListTotalNum(String whiteListName, Integer whiteListId); } diff --git a/src/main/java/com/realtime/protection/server/whitelist/WhiteListService.java b/src/main/java/com/realtime/protection/server/whitelist/WhiteListService.java index fe1b7b8..d2b02ea 100644 --- a/src/main/java/com/realtime/protection/server/whitelist/WhiteListService.java +++ b/src/main/java/com/realtime/protection/server/whitelist/WhiteListService.java @@ -157,8 +157,8 @@ public class WhiteListService { return resultMap; } - public Integer queryWhiteListTotalNum(){ - return whiteListMapper.queryWhiteListTotalNum(); + public Integer queryWhiteListTotalNum(String whiteListName, Integer whiteListId){ + return whiteListMapper.queryWhiteListTotalNum(whiteListName, whiteListId); } diff --git a/src/main/resources/mappers/CommandMapper.xml b/src/main/resources/mappers/CommandMapper.xml index 2568575..e51b91c 100644 --- a/src/main/resources/mappers/CommandMapper.xml +++ b/src/main/resources/mappers/CommandMapper.xml @@ -170,4 +170,41 @@ + diff --git a/src/main/resources/mappers/DynamicRuleMapper.xml b/src/main/resources/mappers/DynamicRuleMapper.xml index 90f360c..72d2949 100644 --- a/src/main/resources/mappers/DynamicRuleMapper.xml +++ b/src/main/resources/mappers/DynamicRuleMapper.xml @@ -209,6 +209,20 @@ diff --git a/src/main/resources/mappers/ProtectObjectMapper.xml b/src/main/resources/mappers/ProtectObjectMapper.xml index a1ba13e..0f37fd8 100644 --- a/src/main/resources/mappers/ProtectObjectMapper.xml +++ b/src/main/resources/mappers/ProtectObjectMapper.xml @@ -69,6 +69,13 @@ FROM t_protect_object WHERE protect_object_id = #{proobj_id} + UPDATE t_protect_object diff --git a/src/main/resources/mappers/StaticRuleMapper.xml b/src/main/resources/mappers/StaticRuleMapper.xml index 75dd033..d525c2a 100644 --- a/src/main/resources/mappers/StaticRuleMapper.xml +++ b/src/main/resources/mappers/StaticRuleMapper.xml @@ -161,6 +161,21 @@ \ No newline at end of file diff --git a/src/main/resources/mappers/TaskMapper.xml b/src/main/resources/mappers/TaskMapper.xml index 631ac52..eb5f896 100644 --- a/src/main/resources/mappers/TaskMapper.xml +++ b/src/main/resources/mappers/TaskMapper.xml @@ -259,4 +259,22 @@ INNER JOIN realtime_protection.t_strategy_template tst on tdr.template_id = tst.strategy_template_id WHERE task_id = #{task_id} + \ No newline at end of file diff --git a/src/main/resources/mappers/TemplateMapper.xml b/src/main/resources/mappers/TemplateMapper.xml index 303f379..795f825 100644 --- a/src/main/resources/mappers/TemplateMapper.xml +++ b/src/main/resources/mappers/TemplateMapper.xml @@ -105,6 +105,14 @@ FROM t_protect_level WHERE protect_level_id = #{level_id} + UPDATE t_strategy_template diff --git a/src/main/resources/mappers/WhiteListMapper.xml b/src/main/resources/mappers/WhiteListMapper.xml index 59db94f..73b861f 100644 --- a/src/main/resources/mappers/WhiteListMapper.xml +++ b/src/main/resources/mappers/WhiteListMapper.xml @@ -201,6 +201,14 @@ \ No newline at end of file