From 6b66b45f7c6072437cab79cf4d8d2ada30dfecf7 Mon Sep 17 00:00:00 2001
From: linwei <872216696@qq.com>
Date: Tue, 20 Jan 2026 09:26:45 +0800
Subject: [PATCH] 反制设备sn调整

---
 drone-service/drone-fw/src/main/java/org/sxkj/fw/detection/dto/FwEffectEvalDTO.java |  101 +++++++++++++++++++++++++++++++++++++++++++++++++-
 1 files changed, 98 insertions(+), 3 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 2d7aedf..35537ef 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
@@ -16,19 +16,114 @@
  */
 package org.sxkj.fw.detection.dto;
 
+import com.baomidou.mybatisplus.annotation.TableField;
+import com.fasterxml.jackson.annotation.JsonFormat;
+import io.swagger.annotations.ApiModelProperty;
 import org.sxkj.fw.detection.entity.FwEffectEvalEntity;
 import lombok.Data;
 import lombok.EqualsAndHashCode;
+
+import java.util.Date;
 
 /**
  * 反制效果评估表 数据传输对象实体类
  *
  * @author BladeX
- * @since 2026-01-07
+ * @since 2026-01-08
  */
 @Data
-@EqualsAndHashCode(callSuper = true)
-public class FwEffectEvalDTO extends FwEffectEvalEntity {
+public class FwEffectEvalDTO {
 	private static final long serialVersionUID = 1L;
 
+	@ApiModelProperty("主键id")
+	private Long id;
+
+	/**
+	 * 告警记录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;
+
+	/**
+	 * 反制设备ID（ja_fw_device.id）
+	 */
+	@ApiModelProperty(value = "反制设备ID（ja_fw_device.id）")
+	private Long deviceId;
+	/**
+	 * 反制设备编码（快照）
+	 */
+	@ApiModelProperty(value = "反制设备编码（快照）")
+	private String deviceCode;
+	/**
+	 * 反制设备名称（快照）
+	 */
+	@ApiModelProperty(value = "反制设备名称（快照）")
+	private String deviceName;
+	/**
+	 * 反制设备型号（快照）
+	 */
+	@ApiModelProperty(value = "反制设备型号（快照）")
+	private String deviceModel;
+	/**
+	 * 反制设备类型（快照）
+	 */
+	@ApiModelProperty(value = "反制设备类型（快照）")
+	private String deviceType;
+	/**
+	 * 无人机名称
+	 */
+	@ApiModelProperty(value = "无人机名称")
+	private String droneName;
+	/**
+	 * 无人机类型
+	 */
+	@ApiModelProperty(value = "无人机类型")
+	private String droneType;
+	/**
+	 * 无人机设备编码
+	 */
+	@ApiModelProperty(value = "无人机设备编码")
+	private String droneDeviceCode;
+	/**
+	 * 发现时间
+	 */
+	@ApiModelProperty(value = "发现时间")
+	@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
+	private Date findTime;
+	/**
+	 * 反制效果（success/fail）
+	 */
+	@ApiModelProperty(value = "反制效果（success/fail）")
+	private String counterEffect;
+	/**
+	 * 部署经度（冗余）
+	 */
+	@ApiModelProperty(value = "部署经度（冗余）")
+	private Double deployLongitude;
+	/**
+	 * 部署纬度（冗余）
+	 */
+	@ApiModelProperty(value = "部署纬度（冗余）")
+	private Double deployLatitude;
+	/**
+	 * 覆盖范围（米）
+	 */
+	@ApiModelProperty(value = "覆盖范围（米）")
+	private Integer coverRadiusM;
+	/**
+	 * 工作模式（机动/固定）
+	 */
+	@ApiModelProperty(value = "工作模式（机动/固定）")
+	private String workMode;
+	/**
+	 * 区域编码
+	 */
+	@ApiModelProperty(value = "区域编码")
+	private String areaCode;
 }

--
Gitblit v1.9.3