From 8d5b8a8c1909be6cdca5228a01bdc017b85a4078 Mon Sep 17 00:00:00 2001
From: rain <1679827795@qq.com>
Date: Wed, 21 Jan 2026 15:37:17 +0800
Subject: [PATCH] 处理Vo继承entity问题

---
 drone-service/drone-fw/src/main/java/org/sxkj/fw/detection/vo/FwEffectEvalVO.java |  129 +++++++++++++++++++++++++++++++++++++++++-
 1 files changed, 124 insertions(+), 5 deletions(-)

diff --git a/drone-service/drone-fw/src/main/java/org/sxkj/fw/detection/vo/FwEffectEvalVO.java b/drone-service/drone-fw/src/main/java/org/sxkj/fw/detection/vo/FwEffectEvalVO.java
index 806a847..aef18d5 100644
--- a/drone-service/drone-fw/src/main/java/org/sxkj/fw/detection/vo/FwEffectEvalVO.java
+++ b/drone-service/drone-fw/src/main/java/org/sxkj/fw/detection/vo/FwEffectEvalVO.java
@@ -16,10 +16,10 @@
  */
 package org.sxkj.fw.detection.vo;
 
-import org.sxkj.fw.detection.entity.FwEffectEvalEntity;
-import org.springblade.core.tool.node.INode;
+import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
-import lombok.EqualsAndHashCode;
+
+import java.util.Date;
 
 /**
  * 反制效果评估表 视图实体类
@@ -28,8 +28,127 @@
  * @since 2026-01-08
  */
 @Data
-@EqualsAndHashCode(callSuper = true)
-public class FwEffectEvalVO extends FwEffectEvalEntity {
+public class FwEffectEvalVO {
 	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 deviceSn;
+	/**
+	 * 反制设备名称(快照)
+	 */
+	@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 = "发现时间")
+	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;
+	/**
+	 * 创建人
+	 */
+	@ApiModelProperty(value = "创建人")
+	private Long createUser;
+	/**
+	 * 创建部门
+	 */
+	@ApiModelProperty(value = "创建部门")
+	private Long createDept;
+	/**
+	 * 创建时间
+	 */
+	@ApiModelProperty(value = "创建时间")
+	private Date createTime;
+	/**
+	 * 更新人
+	 */
+	@ApiModelProperty(value = "更新人")
+	private Long updateUser;
+	/**
+	 * 更新时间
+	 */
+	@ApiModelProperty(value = "更新时间")
+	private Date updateTime;
+	/**
+	 * 状态(0正常 1停用)
+	 */
+	@ApiModelProperty(value = "状态(0正常 1停用)")
+	private Integer status;
+	/**
+	 * 删除标志(0存在 1删除)
+	 */
+	@ApiModelProperty(value = "删除标志(0存在 1删除)")
+	private Integer isDeleted;
 
 }

--
Gitblit v1.9.3