From faf55275dcb8d413f18642b3410c8e7df9f6cd9c Mon Sep 17 00:00:00 2001
From: rain <1679827795@qq.com>
Date: Thu, 29 Jan 2026 10:09:07 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
drone-service/drone-fw/src/main/java/org/sxkj/fw/detection/param/FwEffectEvalParam.java | 11 +++++++++++
1 files changed, 11 insertions(+), 0 deletions(-)
diff --git a/drone-service/drone-fw/src/main/java/org/sxkj/fw/detection/param/FwEffectEvalParam.java b/drone-service/drone-fw/src/main/java/org/sxkj/fw/detection/param/FwEffectEvalParam.java
index 468d3a0..15c29b2 100644
--- a/drone-service/drone-fw/src/main/java/org/sxkj/fw/detection/param/FwEffectEvalParam.java
+++ b/drone-service/drone-fw/src/main/java/org/sxkj/fw/detection/param/FwEffectEvalParam.java
@@ -4,6 +4,7 @@
import lombok.Data;
import java.io.Serializable;
+import java.util.List;
/**
* 反制效果评估表 参数类
@@ -33,5 +34,15 @@
*/
@ApiModelProperty(value = "反制效果（success/fail）")
private String counterEffect;
+ /**
+ * 告警记录ID（ja_fw_drone_alarm_record.id）
+ */
+ @ApiModelProperty(value = "告警记录ID（ja_fw_drone_alarm_record.id）")
+ private Long alarmRecordId;
+ @ApiModelProperty(value = "反制方式：1.信号干扰/2.诱导驱离/无")
+ private String counterWay;
+
+ @ApiModelProperty(value = "部门集合",hidden = true)
+ private List<Long> deptList;
}
--
Gitblit v1.9.3