From dcf77ffc2787d813a3cdcc66c9018554602d6daa Mon Sep 17 00:00:00 2001 From: PushM <584406942@qq.com> Date: Mon, 29 Apr 2024 19:49:50 +0800 Subject: [PATCH] =?UTF-8?q?1=E3=80=81=E9=9D=99=E6=80=81=E5=8A=A8=E6=80=81?= =?UTF-8?q?=E8=A7=84=E5=88=99=E5=88=86=E9=A1=B5=E6=9F=A5=E8=AF=A2=E6=9D=A1?= =?UTF-8?q?=E4=BB=B6=E6=96=B0=E5=A2=9E=E5=AE=A1=E6=A0=B8=E7=8A=B6=E6=80=81?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../rule/dynamicrule/DynamicRuleController.java | 7 ++++--- .../dynamicrule/DynamicRuleControllerApi.java | 2 ++ .../rule/dynamicrule/DynamicRuleMapper.java | 4 ++-- .../rule/dynamicrule/DynamicRuleService.java | 9 +++++---- .../rule/staticrule/StaticRuleController.java | 7 ++++--- .../staticrule/StaticRuleControllerApi.java | 2 ++ .../rule/staticrule/StaticRuleMapper.java | 4 ++-- .../rule/staticrule/StaticRuleService.java | 8 ++++---- .../resources/mappers/DynamicRuleMapper.xml | 12 +++++++++--- src/main/resources/mappers/StaticRuleMapper.xml | 6 ++++++ .../rule/dynamic/DynamicRuleServiceTest.java | 4 ++-- .../rule/staticrule/StaticRuleServiceTest.java | 2 +- .../protection/server/task/TaskServiceTest.java | 17 ++++++++++++----- .../server/whitelist/WhiteListServiceTest.java | 2 +- 14 files changed, 56 insertions(+), 30 deletions(-) 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 871f08b..685ba2a 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 @@ -108,6 +108,7 @@ public class DynamicRuleController implements DynamicRuleControllerApi { @RequestParam(value = "id", required = false) Integer dynamicRuleId, @RequestParam(value = "source_system", required = false) String protectObjectSourceSystem, @RequestParam(value = "creator", required = false) String creator, + @RequestParam(value = "audit_status", required = false) Integer auditStatus, @RequestParam(value = "page", defaultValue = "1") Integer page, @RequestParam(value = "page_size", defaultValue = "10") Integer pageSize) { log.info("分页查询动态规则: {}:{}:{}:{}", dynamicRuleName, dynamicRuleId, page, pageSize); @@ -115,9 +116,9 @@ public class DynamicRuleController implements DynamicRuleControllerApi { return ResponseResult.ok() .setData("success", true) .setData("dynamic_rule_list", dynamicRuleService.queryDynamicRuleObject(dynamicRuleName, dynamicRuleId, - protectObjectSourceSystem, creator, page, pageSize)) + protectObjectSourceSystem, creator, auditStatus, page, pageSize)) .setData("total_num",dynamicRuleService.queryDynamicRuleTotalNum(dynamicRuleName, dynamicRuleId, - protectObjectSourceSystem, creator)); + protectObjectSourceSystem, creator, auditStatus)); } //详情查看？？ 就是按id查询吧 @@ -170,7 +171,7 @@ public class DynamicRuleController implements DynamicRuleControllerApi { public ResponseResult getStaticRuleStatisticsData(){ return ResponseResult.ok() - .setData("dynamic_rule_num", dynamicRuleService.queryDynamicRuleTotalNum(null, null, + .setData("dynamic_rule_num", dynamicRuleService.queryDynamicRuleTotalNum(null,null, null, null, null)) .setData("dynamic_rule_used_num", dynamicRuleService.queryAuditDynamicRuleTotalNum( AuditStatusEnum.getNumByState(AuditStatusEnum.USING.getState()) diff --git a/src/main/java/com/realtime/protection/server/rule/dynamicrule/DynamicRuleControllerApi.java b/src/main/java/com/realtime/protection/server/rule/dynamicrule/DynamicRuleControllerApi.java index 29a55e7..d452bfe 100644 --- a/src/main/java/com/realtime/protection/server/rule/dynamicrule/DynamicRuleControllerApi.java +++ b/src/main/java/com/realtime/protection/server/rule/dynamicrule/DynamicRuleControllerApi.java @@ -347,6 +347,7 @@ public interface DynamicRuleControllerApi { @Parameter(name = "id", description = "动态规则ID", example = "2"), @Parameter(name = "source_system", description = "来源你系统", example = "BW系统"), @Parameter(name = "creator", description = "创建人名称"), + @Parameter(name = "audit_status", description = "审核状态", example = "1"), @Parameter(name = "page", description = "页码", example = "1"), @Parameter(name = "page_size", description = "每页大小", example = "10") } @@ -355,6 +356,7 @@ public interface DynamicRuleControllerApi { @RequestParam(value = "id", required = false) Integer dynamicRuleId, @RequestParam(value = "source_system", required = false) String protectObjectSourceSystem, @RequestParam(value = "creator", required = false) String creator, + @RequestParam(value = "audit_status", required = false) Integer auditStatus, @RequestParam(value = "page", defaultValue = "1") Integer page, @RequestParam(value = "page_size", defaultValue = "10") Integer pageSize); 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 8656c39..3241227 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 @@ -31,7 +31,7 @@ public interface DynamicRuleMapper { void deleteDynamicRules(List dynamicRuleIds); List queryDynamicRuleObject(String dynamicRuleName, Integer dynamicRuleId, - String sourceSystem, String creator, + String sourceSystem, String creator, Integer auditStatus, Integer page, Integer pageSize); void deleteDynamicRuleProtectObjectConcat(Integer dynamicRuleId); @@ -43,7 +43,7 @@ public interface DynamicRuleMapper { boolean queryProtectObjectById(Integer protectObjectId); Integer queryDynamicRuleTotalNum(String dynamicRuleName, Integer dynamicRuleId, - String sourceSystem, String creator); + String sourceSystem, String creator, Integer auditStatus); List queryDynamicRuleByIds(List ids); 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 6e5a594..7d81e5a 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 @@ -171,16 +171,17 @@ public class DynamicRuleService { //分页查询基础的动态规则，暂时不返回关联的保护对象 public List queryDynamicRuleObject(String dynamicRuleName, Integer dynamicRuleId, - String templateSourceSystem,String creator, + String templateSourceSystem,String creator,Integer auditStatus, Integer page, Integer pageSize) { return dynamicRuleMapper.queryDynamicRuleObject(dynamicRuleName, dynamicRuleId, - templateSourceSystem, creator, page, pageSize); + templateSourceSystem, creator, auditStatus, page, pageSize); } public Integer queryDynamicRuleTotalNum(String dynamicRuleName, Integer dynamicRuleId, - String protectObjectSourceSystem, String creator) { + String protectObjectSourceSystem, String creator, + Integer auditStatus) { return dynamicRuleMapper.queryDynamicRuleTotalNum(dynamicRuleName, dynamicRuleId, - protectObjectSourceSystem, creator); + protectObjectSourceSystem, creator, auditStatus); } public List queryDynamicRuleByIds(List ids) { 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 ccdf690..77100c7 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 @@ -134,6 +134,7 @@ public class StaticRuleController implements StaticRuleControllerApi { @RequestParam(name = "id", required = false) Integer static_rule_id, @RequestParam(name = "creator", required = false) String static_rule_creator, @RequestParam(name = "ip", required = false) String static_rule_ip, + @RequestParam(name = "auditStatus", required = false) Integer auditStatus, @RequestParam(defaultValue = "1") Integer page, @RequestParam(defaultValue = "10") Integer pageSize ) { @@ -141,11 +142,11 @@ public class StaticRuleController implements StaticRuleControllerApi { //调用service新增 List pageResult = staticRuleService.queryStaticRule( static_rule_name, static_rule_id, - static_rule_creator, static_rule_ip, page, pageSize); + static_rule_creator, static_rule_ip, auditStatus, page, pageSize); return ResponseResult.ok() .setData("static_rule_list", pageResult) .setData("total_num",staticRuleService.queryStaticRuleTotalNum(static_rule_name, static_rule_id, - static_rule_creator, static_rule_ip)); + static_rule_creator, static_rule_ip, auditStatus)); } @Override @@ -208,7 +209,7 @@ public class StaticRuleController implements StaticRuleControllerApi { public ResponseResult getStaticRuleStatisticsData(){ return ResponseResult.ok() - .setData("static_rule_num", staticRuleService.queryStaticRuleTotalNum(null, null, null, null)) + .setData("static_rule_num", staticRuleService.queryStaticRuleTotalNum(null, null, null, null, null)) .setData("static_rule_used_num", staticRuleService.queryAuditStaticRuleTotalNum( AuditStatusEnum.getNumByState(AuditStatusEnum.USING.getState()) )) diff --git a/src/main/java/com/realtime/protection/server/rule/staticrule/StaticRuleControllerApi.java b/src/main/java/com/realtime/protection/server/rule/staticrule/StaticRuleControllerApi.java index 905ae9a..90c0a68 100644 --- a/src/main/java/com/realtime/protection/server/rule/staticrule/StaticRuleControllerApi.java +++ b/src/main/java/com/realtime/protection/server/rule/staticrule/StaticRuleControllerApi.java @@ -204,6 +204,7 @@ public interface StaticRuleControllerApi { @Parameter(name = "id", description = "静态规则id"), @Parameter(name = "creator", description = "静态规则创建人"), @Parameter(name = "ip", description = "静态规则ip，匹配所有源和目的ip"), + @Parameter(name = "auditStatus", description = "静态规则审核状态"), @Parameter(name = "page", description = "页码"), @Parameter(name = "pageSize", description = "每页条数") } @@ -212,6 +213,7 @@ public interface StaticRuleControllerApi { @RequestParam(required = false) Integer static_rule_id, @RequestParam(required = false) String static_rule_creator, @RequestParam(required = false) String static_rule_ip, + @RequestParam(required = false) Integer auditStatus, @RequestParam(defaultValue = "1") Integer page, @RequestParam(defaultValue = "10") Integer pageSize ); 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 309d091..c6d0bb3 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 @@ -28,7 +28,7 @@ public interface StaticRuleMapper { //多页查询静态规则 List queryStaticRule(String static_rule_name, Integer static_rule_id, - String static_rule_create_username, String ip, + String static_rule_create_username, String ip, Integer auditStatus, Integer page, Integer pageSize); @@ -41,7 +41,7 @@ public interface StaticRuleMapper { Boolean updateAuditStatusById(Integer id, Integer auditStatus); Integer queryStaticRuleTotalNum(String static_rule_name, Integer static_rule_id, - String static_rule_create_username, String ip); + String static_rule_create_username, String ip, Integer auditStatus); List queryStaticRuleByIds(List ids); 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 9fa7f72..cc35afb 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 @@ -166,11 +166,11 @@ public class StaticRuleService { */ public List queryStaticRule( String static_rule_name, Integer static_rule_id, - String creator, String ip, + String creator, String ip, Integer auditStatus, Integer page, Integer pageSize) { return staticRuleMapper.queryStaticRule(static_rule_name, static_rule_id, - creator, ip, page, pageSize); + creator, ip, auditStatus, page, pageSize); } public Boolean newStaticRuleObjects(List staticRuleList) { @@ -233,9 +233,9 @@ public class StaticRuleService { } public Integer queryStaticRuleTotalNum(String static_rule_name, Integer static_rule_id, - String static_rule_creator, String static_rule_ip) { + String static_rule_creator, String static_rule_ip, Integer auditStatus) { return staticRuleMapper.queryStaticRuleTotalNum(static_rule_name, static_rule_id, - static_rule_creator, static_rule_ip); + static_rule_creator, static_rule_ip, auditStatus); } public List queryStaticRuleByIds(List ids) { diff --git a/src/main/resources/mappers/DynamicRuleMapper.xml b/src/main/resources/mappers/DynamicRuleMapper.xml index b8ff03e..a8c0f56 100644 --- a/src/main/resources/mappers/DynamicRuleMapper.xml +++ b/src/main/resources/mappers/DynamicRuleMapper.xml @@ -190,18 +190,21 @@ left join t_strategy_template on t_dynamic_rule.template_id = t_strategy_template.strategy_template_id - + t_dynamic_rule.dynamic_rule_name like concat('%', #{dynamicRuleName}, '%') and t_dynamic_rule.dynamic_rule_id = #{dynamicRuleId} - + and t_strategy_template.strategy_template_source_system = #{sourceSystem} - + and t_dynamic_rule.dynamic_rule_create_username = #{creator} + + and t_dynamic_rule.audit_status = #{auditStatus} + LIMIT ${(page - 1) * pageSize}, #{pageSize} @@ -244,6 +247,9 @@ and t_dynamic_rule.dynamic_rule_create_username = #{creator} + + and t_dynamic_rule.audit_status = #{auditStatus} + @@ -188,6 +191,9 @@ AND (static_rule_sip = INET_ATON(#{ip}) or static_rule_msip = INET_ATON(#{ip}) or static_rule_dip = INET_ATON(#{ip}) or static_rule_mdip = INET_ATON(#{ip})) + + AND static_rule_audit_status = #{auditStatus} +