From 4fa212add5bb7689331e9e070c802bfcb5dcafa2 Mon Sep 17 00:00:00 2001
From: rain <1679827795@qq.com>
Date: Mon, 02 Feb 2026 17:21:07 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
drone-service/drone-fw/src/main/java/org/sxkj/fw/detection/dto/FwEffectEvalDTO.java | 13 ++++++++++++-
1 files changed, 12 insertions(+), 1 deletions(-)
diff --git a/drone-service/drone-fw/src/main/java/org/sxkj/fw/detection/dto/FwEffectEvalDTO.java b/drone-service/drone-fw/src/main/java/org/sxkj/fw/detection/dto/FwEffectEvalDTO.java
index 13fe026..7dab16c 100644
--- a/drone-service/drone-fw/src/main/java/org/sxkj/fw/detection/dto/FwEffectEvalDTO.java
+++ b/drone-service/drone-fw/src/main/java/org/sxkj/fw/detection/dto/FwEffectEvalDTO.java
@@ -24,6 +24,9 @@
import lombok.EqualsAndHashCode;
import java.util.Date;
+import java.io.Serializable;
+import com.fasterxml.jackson.databind.annotation.JsonSerialize;
+import com.fasterxml.jackson.databind.ser.std.ToStringSerializer;
/**
* 反制效果评估表 数据传输对象实体类
@@ -32,10 +35,11 @@
* @since 2026-01-08
*/
@Data
-public class FwEffectEvalDTO {
+public class FwEffectEvalDTO implements Serializable {
private static final long serialVersionUID = 1L;
@ApiModelProperty("主键id")
+ @JsonSerialize(using = ToStringSerializer.class)
private Long id;
/**
@@ -43,6 +47,13 @@
*/
@ApiModelProperty(value = "告警记录ID（ja_fw_drone_alarm_record.id）")
private Long alarmRecordId;
+
+ /**
+ * 反制方式：信号干扰/诱导驱离/无
+ */
+ @ApiModelProperty(value = "反制方式：1.信号干扰/2.诱导驱离/无")
+ private String counterWay;
+
/**
* 反制设备ID（ja_fw_device.id）
*/
--
Gitblit v1.9.3