gfwleak/enderbyendera-realtime-protection
Archived
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

1、规则查询增加审批人、创建日期查询条件

Browse Source 
2、任务查询增加事件类型、创建日期、开始日期查询条件
This commit is contained in:
PushM
2024-05-22 17:36:25 +08:00
parent bdfb207401
commit df19bef4fa
19 changed files with 181 additions and 52 deletions
Download Patch File Download Diff File Expand all files Collapse all files

18
src/main/java/com/realtime/protection/server/rule/dynamicrule/DynamicRuleController.java
View File

@@ -11,6 +11,7 @@ import lombok.extern.slf4j.Slf4j;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.web.bind.annotation.*;
import java.time.LocalDate;
import java.util.ArrayList;
import java.util.List;
import java.util.Map;
@@ -125,17 +126,25 @@ public class DynamicRuleController implements DynamicRuleControllerApi {
@RequestParam(value = "event_type", required = false) String eventType,
@RequestParam(value = "protect_level", required = false) Integer protectLevel,
@RequestParam(value = "template_name", required = false) String templateName,
@RequestParam(name = "auditUserName", required = false) String auditUserName,
@RequestParam(name = "createTime", required = false) LocalDate createTime,
@RequestParam(value = "page", defaultValue = "1") Integer page,
@RequestParam(value = "pageSize", defaultValue = "10") Integer pageSize) {
log.info("分页查询动态规则: {}:{}:{}:{}", dynamicRuleName, dynamicRuleId, page, pageSize);
// log.info("分页查询动态规则: {}:{}:{}:{}", dynamicRuleName, dynamicRuleId, page, pageSize);
//调用service查询
String createDateStr = null;
if (createTime != null) {
createDateStr = createTime.toString();
}
return ResponseResult.ok()
.setData("success", true)
.setData("dynamic_rule_list", dynamicRuleService.queryDynamicRuleObject(dynamicRuleName, dynamicRuleId,
protectObjectSourceSystem, creator, auditStatus, eventType, protectLevel, templateName, page, pageSize))
protectObjectSourceSystem, creator, auditStatus, eventType, protectLevel, templateName,
auditUserName, createDateStr, page, pageSize))
.setData("total_num", dynamicRuleService.queryDynamicRuleTotalNum(dynamicRuleName, dynamicRuleId,
protectObjectSourceSystem, creator, auditStatus, eventType, protectLevel, templateName));
protectObjectSourceSystem, creator, auditStatus, eventType,
protectLevel, templateName, auditUserName, createDateStr));
}
//详情查看？？ 就是按id查询吧
@@ -217,7 +226,8 @@ public class DynamicRuleController implements DynamicRuleControllerApi {
return ResponseResult.ok()
.setData("dynamic_rule_num", dynamicRuleService.queryDynamicRuleTotalNum(null, null, null,
null, null, null, null, null))
null, null, null,
null, null,null,null))
.setData("dynamic_rule_used_num", dynamicRuleService.queryAuditDynamicRuleTotalNum(
AuditStatusEnum.getNumByState(AuditStatusEnum.USING.getState())
))

8
src/main/java/com/realtime/protection/server/rule/dynamicrule/DynamicRuleControllerApi.java
View File

@@ -14,6 +14,7 @@ import jakarta.validation.Valid;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.web.bind.annotation.*;
import java.time.LocalDate;
import java.util.List;
import java.util.Map;
@@ -351,7 +352,9 @@ public interface DynamicRuleControllerApi {
@Parameter(name = "audit_status", description = "审核状态", example = "1"),
@Parameter(name = "event_type", description = "事件类型", example = "反射型DDOS"),
@Parameter(name = "protect_level", description = "保护级别", example = "1"),
// @Parameter(name = "template_name", description = "模板名称", example = "test"),
@Parameter(name = "auditUserName", description = "审核用户名称", example = "user1"),
@Parameter(name = "createTime", description = "创建日期，不跟具体时间吧", example = "2024-04-25"),
@Parameter(name = "page", description = "页码", example = "1"),
@Parameter(name = "pageSize", description = "每页大小", example = "10")
}
@@ -364,6 +367,9 @@ public interface DynamicRuleControllerApi {
@RequestParam(value = "event_type", required = false) String eventType,
@RequestParam(value = "protect_level", required = false) Integer protectLevel,
@RequestParam(value = "template_name", required = false) String templateName,
@RequestParam(name = "auditUserName", required = false) String auditUserName,
@RequestParam(name = "createTime", required = false) LocalDate createTime,
@RequestParam(value = "page", defaultValue = "1") Integer page,
@RequestParam(value = "page_size", defaultValue = "10") Integer pageSize);
@Operation(

4
src/main/java/com/realtime/protection/server/rule/dynamicrule/DynamicRuleMapper.java
View File

@@ -33,6 +33,7 @@ public interface DynamicRuleMapper {
List<DynamicRuleObject> queryDynamicRuleObject(String dynamicRuleName, Integer dynamicRuleId,
String sourceSystem, String creator, Integer auditStatus,
String eventType, Integer protectLevel, String templateName,
String auditUserName, String createDate,
Integer page, Integer pageSize);
void deleteDynamicRuleProtectObjectConcat(Integer dynamicRuleId);
@@ -45,7 +46,8 @@ public interface DynamicRuleMapper {
Integer queryDynamicRuleTotalNum(String dynamicRuleName, Integer dynamicRuleId,
String sourceSystem, String creator, Integer auditStatus
, String eventType, Integer protectLevel, String templateName);
, String eventType, Integer protectLevel, String templateName,
String auditUserName, String createDate);
List<DynamicRuleObject> queryDynamicRuleByIds(List<Integer> ids);

9
src/main/java/com/realtime/protection/server/rule/dynamicrule/DynamicRuleService.java
View File

@@ -1,7 +1,6 @@
package com.realtime.protection.server.rule.dynamicrule;
import com.alibaba.excel.util.ListUtils;
import com.realtime.protection.configuration.entity.defense.template.Template;
import com.realtime.protection.configuration.entity.defense.template.TemplateNew;
import com.realtime.protection.configuration.entity.rule.dynamicrule.DynamicRuleObject;
import com.realtime.protection.configuration.utils.Counter;
@@ -191,16 +190,18 @@ public class DynamicRuleService {
public List<DynamicRuleObject> queryDynamicRuleObject(String dynamicRuleName, Integer dynamicRuleId,
String templateSourceSystem,String creator,Integer auditStatus,
String eventType, Integer protectLevel, String templateName,
String auditUserName, String createDate,
Integer page, Integer pageSize) {
return dynamicRuleMapper.queryDynamicRuleObject(dynamicRuleName, dynamicRuleId,
templateSourceSystem, creator, auditStatus, eventType, protectLevel, templateName, page, pageSize);
templateSourceSystem, creator, auditStatus, eventType, protectLevel, templateName, auditUserName, createDate, page, pageSize);
}
public Integer queryDynamicRuleTotalNum(String dynamicRuleName, Integer dynamicRuleId,
String protectObjectSourceSystem, String creator,
Integer auditStatus, String eventType, Integer protectLevel, String templateName) {
Integer auditStatus, String eventType, Integer protectLevel,
String templateName,String auditUserName, String createDate) {
return dynamicRuleMapper.queryDynamicRuleTotalNum(dynamicRuleName, dynamicRuleId,
protectObjectSourceSystem, creator, auditStatus, eventType, protectLevel, templateName);
protectObjectSourceSystem, creator, auditStatus, eventType, protectLevel, templateName,auditUserName, createDate);
}
public List<DynamicRuleObject> queryDynamicRuleByIds(List<Integer> ids) {

20
src/main/java/com/realtime/protection/server/rule/staticrule/StaticRuleController.java
View File

@@ -19,6 +19,7 @@ import org.springframework.web.multipart.MultipartFile;
import java.io.IOException;
import java.net.URLEncoder;
import java.nio.charset.StandardCharsets;
import java.time.LocalDate;
import java.util.ArrayList;
import java.util.List;
import java.util.Map;
@@ -157,18 +158,26 @@ public class StaticRuleController implements StaticRuleControllerApi {
@RequestParam(name = "dip", required = false) String static_rule_dip,
@RequestParam(name = "dport", required = false) Integer static_rule_dport,
@RequestParam(name = "auditStatus", required = false) Integer auditStatus,
@RequestParam(name = "auditUserName", required = false) String auditUserName,
@RequestParam(name = "createTime", required = false) LocalDate createTime,
@RequestParam(defaultValue = "1") Integer page,
@RequestParam(defaultValue = "10") Integer pageSize
) {
log.info("多查询静态规则: {},{},{},{}", static_rule_name, static_rule_id, page, pageSize);
// log.info("多查询静态规则: {},{},{},{}", static_rule_name, static_rule_id, page, pageSize);
//调用service新增
String createDateStr = null;
if (createTime != null) {
createDateStr = createTime.toString();
}
List<StaticRuleObject> pageResult = staticRuleService.queryStaticRule(
static_rule_name, static_rule_id,
static_rule_creator, static_rule_sip, static_rule_sport, static_rule_dip, static_rule_dport, auditStatus, page, pageSize);
static_rule_creator, static_rule_sip, static_rule_sport, static_rule_dip, static_rule_dport, auditStatus,
auditUserName, createDateStr, 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_sip, static_rule_sport, static_rule_dip, static_rule_dport, auditStatus));
static_rule_creator, static_rule_sip, static_rule_sport, static_rule_dip, static_rule_dport, auditStatus
, auditUserName, createDateStr));
}
@Override
@@ -258,7 +267,10 @@ public class StaticRuleController implements StaticRuleControllerApi {
public ResponseResult getStaticRuleStatisticsData(){
return ResponseResult.ok()
.setData("static_rule_num", staticRuleService.queryStaticRuleTotalNum(null, null, null, null, null, null, null, null))
.setData("static_rule_num", staticRuleService.queryStaticRuleTotalNum(
null, null, null, null,
null, null, null, null,
null,null))
.setData("static_rule_used_num", staticRuleService.queryAuditStaticRuleTotalNum(
AuditStatusEnum.getNumByState(AuditStatusEnum.USING.getState())
))

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

@@ -18,6 +18,8 @@ import org.springframework.web.bind.annotation.*;
import org.springframework.web.multipart.MultipartFile;
import java.io.IOException;
import java.time.LocalDate;
import java.time.LocalDateTime;
import java.util.List;
import java.util.Map;
@@ -211,6 +213,8 @@ public interface StaticRuleControllerApi {
@Parameter(name = "dip", description = "静态规则ip，匹配目的ip并考虑掩码"),
@Parameter(name = "dport", description = "静态规则port，匹配目的port"),
@Parameter(name = "auditStatus", description = "静态规则审核状态"),
@Parameter(name = "auditUserName", description = "静态规则审核用户名称"),
@Parameter(name = "createTime", description = "静态规则创建时间"),
@Parameter(name = "page", description = "页码"),
@Parameter(name = "pageSize", description = "每页条数")
}
@@ -223,6 +227,8 @@ public interface StaticRuleControllerApi {
@RequestParam(required = false) String static_rule_dip,
@RequestParam(required = false) Integer static_rule_dport,
@RequestParam(required = false) Integer auditStatus,
@RequestParam(required = false) String auditUserName,
@RequestParam(required = false) LocalDate createTime,
@RequestParam(defaultValue = "1") Integer page,
@RequestParam(defaultValue = "10") Integer pageSize
);

5
src/main/java/com/realtime/protection/server/rule/staticrule/StaticRuleMapper.java
View File

@@ -5,6 +5,7 @@ import org.apache.ibatis.annotations.Delete;
import org.apache.ibatis.annotations.Mapper;
import org.apache.ibatis.annotations.Param;
import java.time.LocalDateTime;
import java.util.List;
import java.util.Map;
@@ -30,7 +31,7 @@ public interface StaticRuleMapper {
List<StaticRuleObject> queryStaticRule(String static_rule_name, Integer static_rule_id,
String static_rule_create_username, String sip,
Integer sport, String dip, Integer dport,
Integer auditStatus,
Integer auditStatus, String auditUserName, String createDate,
Integer page, Integer pageSize);
@@ -50,7 +51,7 @@ public interface StaticRuleMapper {
String static_rule_create_username,
String sip, Integer sport,
String dip, Integer dport,
Integer auditStatus);
Integer auditStatus,String auditUserName, String createDate);
List<StaticRuleObject> queryStaticRuleByIds(List<Integer> ids);

13
src/main/java/com/realtime/protection/server/rule/staticrule/StaticRuleService.java
View File

@@ -180,11 +180,12 @@ public class StaticRuleService {
String creator,
String static_rule_sip, Integer static_rule_sport,
String static_rule_dip, Integer static_rule_dport,
Integer auditStatus,
Integer auditStatus, String auditUserName, String createTime,
Integer page, Integer pageSize) {
return staticRuleMapper.queryStaticRule(static_rule_name, static_rule_id,
creator, static_rule_sip, static_rule_sport, static_rule_dip, static_rule_dport, auditStatus, page, pageSize);
creator, static_rule_sip, static_rule_sport, static_rule_dip, static_rule_dport, auditStatus,
auditUserName, createTime,page, pageSize);
}
public Boolean newStaticRuleObjects(List<StaticRuleObject> staticRuleList) {
@@ -260,10 +261,11 @@ public class StaticRuleService {
String static_rule_creator,
String static_rule_sip, Integer static_rule_sport,
String static_rule_dip, Integer static_rule_dport,
Integer auditStatus) {
Integer auditStatus,
String auditUserName, String createTime) {
return staticRuleMapper.queryStaticRuleTotalNum(static_rule_name, static_rule_id,
static_rule_creator, static_rule_sip, static_rule_sport,
static_rule_dip, static_rule_dport, auditStatus);
static_rule_dip, static_rule_dport, auditStatus, auditUserName, createTime);
}
public List<StaticRuleObject> queryStaticRuleByIds(List<Integer> ids) {
@@ -372,8 +374,7 @@ public class StaticRuleService {
}
public List<Integer> queryAuditStatusByIds(Map<Integer, Integer> idsWithAuditStatusMap) {
List<Integer> originalAuditStatusList = staticRuleMapper.queryAuditStatusByIds(idsWithAuditStatusMap);
return originalAuditStatusList;
return staticRuleMapper.queryAuditStatusByIds(idsWithAuditStatusMap);
}
public Integer queryAuditStaticRuleTotalNum(Integer auditStatus) {