1、AlertMessage类移动位置
2、动态规则增加删除判断,如果使用任务处于运行、暂停,不允许删除动态规则。(静态规则不需要删除判断,因为指令已经下发。但动态规则配置不能删除,告警信息过来会找不到动态规则)
This commit is contained in:
@@ -1,11 +1,13 @@
|
||||
package com.realtime.protection.configuration.entity.rule.dynamicrule;
|
||||
package com.realtime.protection.configuration.entity.alert;
|
||||
|
||||
|
||||
import com.fasterxml.jackson.annotation.JsonProperty;
|
||||
import com.realtime.protection.configuration.entity.task.FiveTupleWithMask;
|
||||
import com.realtime.protection.configuration.kafka.KafkaMessage;
|
||||
import lombok.Data;
|
||||
|
||||
@Data
|
||||
public class AlertMessage {
|
||||
public class AlertMessage implements KafkaMessage {
|
||||
|
||||
@JsonProperty("task_id")
|
||||
private Long taskId;
|
||||
@@ -31,4 +33,3 @@ public class AlertMessage {
|
||||
private String alertMessageUUID;
|
||||
|
||||
}
|
||||
|
||||
@@ -58,7 +58,7 @@ public class DynamicRuleObject {
|
||||
private Integer dynamicRuleCreateUserId;
|
||||
@JsonProperty("dynamic_rule_used_task_id")
|
||||
@Schema(description = "使用该动态规则的任务ID", accessMode = Schema.AccessMode.READ_ONLY)
|
||||
private Integer dynamicRuleUsedTaskId;
|
||||
private Long dynamicRuleUsedTaskId;
|
||||
|
||||
//前端不发送事件类型和来源系统了,而是根据事件类型和来源系统确定策略模板id,发过来template_id
|
||||
@JsonProperty("dynamic_rule_source_system")
|
||||
|
||||
Reference in New Issue
Block a user