diff --git a/src/main/java/com/realtime/protection/configuration/entity/task/DynamicTaskInfo.java b/src/main/java/com/realtime/protection/configuration/entity/task/DynamicTaskInfo.java index b9afc6d..30b07fa 100644 --- a/src/main/java/com/realtime/protection/configuration/entity/task/DynamicTaskInfo.java +++ b/src/main/java/com/realtime/protection/configuration/entity/task/DynamicTaskInfo.java @@ -25,6 +25,7 @@ public class DynamicTaskInfo { private Integer ruleId; private String sourceSystem; private String eventType; + private Long logRuleId; // 从防护对象列表中获取 private List protectObjects; diff --git a/src/main/java/com/realtime/protection/configuration/response/AuditAdvice.java b/src/main/java/com/realtime/protection/configuration/response/AuditAdvice.java index 59536f8..9ff428b 100644 --- a/src/main/java/com/realtime/protection/configuration/response/AuditAdvice.java +++ b/src/main/java/com/realtime/protection/configuration/response/AuditAdvice.java @@ -71,7 +71,7 @@ public class AuditAdvice implements ResponseBodyAdvice { return null; }) .doOnError(WebClientRequestException.class, err -> - log.warn("审计服务器遭遇异常" + err.getMessage())); + log.warn("审计服务器遭遇异常{}", err.getMessage())); mono.subscribe(AuditAdvice::handleMono); 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 625c62c..1740012 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 @@ -3,6 +3,7 @@ package com.realtime.protection.server.defense.object; import com.alibaba.excel.util.ListUtils; import com.realtime.protection.configuration.entity.defense.object.ProtectObject; import com.realtime.protection.configuration.utils.SqlSessionWrapper; +import com.realtime.protection.configuration.utils.enums.audit.AuditStatusEnum; import com.realtime.protection.configuration.utils.enums.audit.AuditStatusValidator; import org.springframework.stereotype.Service; import org.springframework.transaction.annotation.Transactional; @@ -74,6 +75,14 @@ public class ProtectObjectService { } public Boolean updateProtectObject(ProtectObject protectObject) { + if (!protectObjectMapper.queryProtectObject(protectObject.getProtectObjectId()) + .getProtectObjectAuditStatus() + .equals(AuditStatusEnum.AUDITED.getNum())) { + return false; + } + + protectObject.setProtectObjectAuditStatus(AuditStatusEnum.PENDING.getNum()); + return protectObjectMapper.updateProtectObject(protectObject); } 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 d8fd1b6..f06cb4d 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 @@ -64,6 +64,13 @@ public class TemplateController implements TemplateControllerApi { return ResponseResult.ok().setData("template", template); } + @Override + @GetMapping("/query/level") + public ResponseResult queryTemplateProtectLevels() { + List