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

1、统计接口，增加已退回的数据

Browse Source 
2、增加规则、任务、配置的历史状态变化表查询
3、任务结束后，其选择规则再次使用报错正在使用中问题解决。修改规则审计状态同时，删去used_tasl_id的值
4、任务结束，修改is——delete报错解决，doris要使用unique key
5、分页查询逆序返回
This commit is contained in:
PushM
2024-06-05 03:29:32 +08:00
parent e4ebe2d791
commit 906bf494d9
41 changed files with 485 additions and 22 deletions
Download Patch File Download Diff File Expand all files Collapse all files

24
src/main/java/com/realtime/protection/configuration/entity/defense/object/ProtectObject.java
View File

@@ -68,34 +68,42 @@ public class ProtectObject {
@JsonProperty("proobj_create_username")
@ExcelIgnore
@Schema(description = "防护对象创建人", example = "xxx")
@Schema(description = "防护对象创建人", example = "xxx", accessMode = Schema.AccessMode.READ_ONLY)
private String protectObjectCreateUsername;
@JsonProperty("proobj_create_depart")
@ExcelIgnore
@Schema(description = "防护对象创建人处室", example = "xxx")
@Schema(description = "防护对象创建人处室", example = "xxx", accessMode = Schema.AccessMode.READ_ONLY)
private String protectObjectCreateDepart;
@JsonProperty("proobj_create_userid")
@ExcelIgnore
@Schema(description = "防护对象创建人ID", example = "0")
@Schema(description = "防护对象创建人ID", example = "0", accessMode = Schema.AccessMode.READ_ONLY)
private Integer protectObjectCreateUserId;
@JsonProperty("audit_user_name")
@Schema(description = "审核用户名称", example = "user11")
@Schema(description = "审核用户名称", example = "user11", accessMode = Schema.AccessMode.READ_ONLY)
private String auditUserName;
@JsonProperty("audit_user_id")
@Schema(description = "审核用户id", example = "11111")
@Schema(description = "审核用户id", example = "11111", accessMode = Schema.AccessMode.READ_ONLY)
private String auditUserId;
@JsonProperty("audit_user_depart")
@Schema(description = "审核用户部门", example = "部门1")
@Schema(description = "审核用户部门", example = "部门1", accessMode = Schema.AccessMode.READ_ONLY)
private String auditUserDepart;
@JsonProperty("create_time")
@Schema(description = "创建时间", example = "")
@Schema(description = "创建时间", example = "", accessMode = Schema.AccessMode.READ_ONLY)
private LocalDateTime createTime;
@JsonProperty("modify_time")
@Schema(description = "修改时间", example = "")
@Schema(description = "修改时间", example = "", accessMode = Schema.AccessMode.READ_ONLY)
private LocalDateTime modifyTime;
@JsonProperty("effecive_time")
@Schema(description = "日志表中有效开始时间", example = "", accessMode = Schema.AccessMode.READ_ONLY)
private LocalDateTime effeciveTime;
@JsonProperty("expire_time")
@Schema(description = "日志表中有效结束时间", example = "", accessMode = Schema.AccessMode.READ_ONLY)
private LocalDateTime expireTime;
}

10
src/main/java/com/realtime/protection/configuration/entity/defense/template/TemplateNew.java
View File

@@ -7,6 +7,8 @@ import jakarta.validation.constraints.Min;
import jakarta.validation.constraints.NotNull;
import lombok.Data;
import java.time.LocalDateTime;
@Data
public class TemplateNew {
@JsonProperty("template_id")
@@ -117,4 +119,12 @@ public class TemplateNew {
@JsonProperty("update_time")
@Schema(description = "更新时间", example = "部门1", accessMode = Schema.AccessMode.READ_ONLY)
private String updateTime;
@JsonProperty("effecive_time")
@Schema(description = "日志表中有效开始时间", example = "", accessMode = Schema.AccessMode.READ_ONLY)
private LocalDateTime effeciveTime;
@JsonProperty("expire_time")
@Schema(description = "日志表中到期时间", example = "", accessMode = Schema.AccessMode.READ_ONLY)
private LocalDateTime expireTime;
}

14
src/main/java/com/realtime/protection/configuration/entity/rule/dynamicrule/DynamicRuleObject.java
View File

@@ -1,5 +1,6 @@
package com.realtime.protection.configuration.entity.rule.dynamicrule;
import com.alibaba.excel.annotation.ExcelIgnore;
import com.fasterxml.jackson.annotation.JsonProperty;
import com.realtime.protection.configuration.utils.enums.audit.AuditStatusEnum;
import com.realtime.protection.configuration.utils.enums.audit.AuditStatusValidator;
@@ -97,6 +98,19 @@ public class DynamicRuleObject {
@Schema(description = "动态规则描述", example = "动态规则描述")
private String description;
@JsonProperty("effecive_time")
@Schema(description = "日志表中有效开始时间", example = "", accessMode = Schema.AccessMode.READ_ONLY)
private LocalDateTime effeciveTime;
@JsonProperty("expire_time")
@Schema(description = "日志表中到期时间", example = "", accessMode = Schema.AccessMode.READ_ONLY)
private LocalDateTime expireTime;
@JsonProperty("used_task_name")
@ExcelIgnore
@Schema(description = "使用该规则的任务名称", example = "任务1", accessMode = Schema.AccessMode.READ_ONLY)
private String usedTaskName;
public void checkAuditStatusValidate(AuditStatusEnum newAuditStatus) {
if (!List.of(AuditStatusEnum.AUDITED.getNum(), AuditStatusEnum.USING.getNum()).contains(this.getAuditStatus())) {
throw new IllegalArgumentException("规则《" + this.getDynamicRuleName() + "》原审批状态非法");

14
src/main/java/com/realtime/protection/configuration/entity/rule/staticrule/StaticRuleObject.java
View File

@@ -167,6 +167,20 @@ public class StaticRuleObject {
@Schema(description = "事件类型", example = "DDos")
private String eventType;
@JsonProperty("effecive_time")
@ExcelIgnore
@Schema(description = "日志表中有效开始时间", example = "", accessMode = Schema.AccessMode.READ_ONLY)
private LocalDateTime effeciveTime;
@JsonProperty("expire_time")
@ExcelIgnore
@Schema(description = "日志表中到期时间", example = "", accessMode = Schema.AccessMode.READ_ONLY)
private LocalDateTime expireTime;
@JsonProperty("used_task_name")
@ExcelIgnore
@Schema(description = "使用该规则的任务名称", example = "任务1", accessMode = Schema.AccessMode.READ_ONLY)
private String usedTaskName;
public void checkAuditStatusValidate(AuditStatusEnum newAuditStatus) {
if (!List.of(AuditStatusEnum.AUDITED.getNum(), AuditStatusEnum.USING.getNum()).contains(this.getAuditStatus())) {

7
src/main/java/com/realtime/protection/configuration/entity/task/Task.java
View File

@@ -136,6 +136,13 @@ public class Task {
accessMode = Schema.AccessMode.READ_ONLY)
private List<ProtectObject> protectObjects;
@JsonProperty("effecive_time")
@Schema(description = "日志表中有效开始时间", example = "", accessMode = Schema.AccessMode.READ_ONLY)
private LocalDateTime effeciveTime;
@JsonProperty("expire_time")
@Schema(description = "日志表中到期时间", example = "", accessMode = Schema.AccessMode.READ_ONLY)
private LocalDateTime expireTime;
}

8
src/main/java/com/realtime/protection/configuration/entity/whitelist/WhiteListObject.java
View File

@@ -96,4 +96,12 @@ public class WhiteListObject {
@JsonProperty("modify_time")
@Schema(description = "修改时间", example = "")
private LocalDateTime modifyTime;
@JsonProperty("effecive_time")
@Schema(description = "日志表中有效开始时间", example = "", accessMode = Schema.AccessMode.READ_ONLY)
private LocalDateTime effeciveTime;
@JsonProperty("expire_time")
@Schema(description = "日志表中到期时间", example = "", accessMode = Schema.AccessMode.READ_ONLY)
private LocalDateTime expireTime;
}