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/area/vo/FwDefenseSceneVO.java             |   86 +++++
 drone-service/drone-fw/src/main/java/org/sxkj/fw/detection/dto/FwDeviceConfigDTO.java      |   70 ++++
 drone-service/drone-fw/src/main/java/org/sxkj/fw/detection/mapper/FwEffectEvalMapper.xml   |    2 
 drone-service/drone-fw/src/main/java/org/sxkj/fw/detection/vo/FwEffectEvalVO.java          |  129 +++++++
 drone-service/drone-fw/src/main/java/org/sxkj/fw/area/dto/FwDefenseSceneDTO.java           |   98 +++++
 drone-service/drone-fw/src/main/java/org/sxkj/fw/area/vo/FwPoliceStationVO.java            |   64 +++
 drone-service/drone-fw/src/main/java/org/sxkj/fw/detection/vo/FwTaskScheduleVO.java        |  105 ++++++
 drone-service/drone-fw/src/main/java/org/sxkj/fw/area/dto/FwPoliceStationDTO.java          |   83 ++++
 drone-service/drone-fw/src/main/java/org/sxkj/fw/detection/vo/FwDeviceConfigVO.java        |   71 ++++
 drone-service/drone-fw/src/main/java/org/sxkj/fw/detection/mapper/FwDeviceConfigMapper.xml |   18 +
 drone-service/drone-fw/src/main/java/org/sxkj/fw/area/vo/FwAreaDivideVO.java               |  123 +++++++
 drone-service/drone-fw/src/main/java/org/sxkj/fw/area/vo/FwDefenseZoneVO.java              |   67 +++
 12 files changed, 862 insertions(+), 54 deletions(-)

diff --git a/drone-service/drone-fw/src/main/java/org/sxkj/fw/area/dto/FwDefenseSceneDTO.java b/drone-service/drone-fw/src/main/java/org/sxkj/fw/area/dto/FwDefenseSceneDTO.java
index b545726..4605a33 100644
--- a/drone-service/drone-fw/src/main/java/org/sxkj/fw/area/dto/FwDefenseSceneDTO.java
+++ b/drone-service/drone-fw/src/main/java/org/sxkj/fw/area/dto/FwDefenseSceneDTO.java
@@ -16,9 +16,10 @@
  */
 package org.sxkj.fw.area.dto;
 
-import org.sxkj.fw.area.entity.FwDefenseSceneEntity;
+import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
-import lombok.EqualsAndHashCode;
+
+import java.util.Date;
 
 /**
  * 防控场景表 数据传输对象实体类
@@ -27,8 +28,97 @@
  * @since 2026-01-07
  */
 @Data
-@EqualsAndHashCode(callSuper = true)
-public class FwDefenseSceneDTO extends FwDefenseSceneEntity {
+public class FwDefenseSceneDTO {
 	private static final long serialVersionUID = 1L;
 
+	/**
+	 * 主键id
+	 */
+	@ApiModelProperty(value = "主键id")
+	private Long id;
+	/**
+	 * 场景名称
+	 */
+	@ApiModelProperty(value = "场景名称")
+	private String sceneName;
+	/**
+	 * 场景类型：核心区/学校等
+	 */
+	@ApiModelProperty(value = "场景类型：核心区/学校等")
+	private String sceneType;
+	/**
+	 * 指挥点经度
+	 */
+	@ApiModelProperty(value = "指挥点经度")
+	private Double longitude;
+	/**
+	 * 指挥点纬度
+	 */
+	@ApiModelProperty(value = "指挥点纬度")
+	private Double latitude;
+	/**
+	 * 防控负责人
+	 */
+	@ApiModelProperty(value = "防控负责人")
+	private String defenseLeader;
+	/**
+	 * 防控负责人电话
+	 */
+	@ApiModelProperty(value = "防控负责人电话")
+	private String leaderPhone;
+	/**
+	 * 防控面积(m)
+	 */
+	@ApiModelProperty(value = "防控面积(m)")
+	private Integer defenseArea;
+	/**
+	 * 设备模式
+	 */
+	@ApiModelProperty(value = "设备模式")
+	private String deviceMode;
+	/**
+	 * 关联区域ID，逗号分隔
+	 */
+	@ApiModelProperty(value = "关联区域ID，逗号分隔")
+	private String areaDivideIds;
+	/**
+	 * 区域编码
+	 */
+	@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;
 }
diff --git a/drone-service/drone-fw/src/main/java/org/sxkj/fw/area/dto/FwPoliceStationDTO.java b/drone-service/drone-fw/src/main/java/org/sxkj/fw/area/dto/FwPoliceStationDTO.java
index dcb6c16..0f26a57 100644
--- a/drone-service/drone-fw/src/main/java/org/sxkj/fw/area/dto/FwPoliceStationDTO.java
+++ b/drone-service/drone-fw/src/main/java/org/sxkj/fw/area/dto/FwPoliceStationDTO.java
@@ -16,9 +16,10 @@
  */
 package org.sxkj.fw.area.dto;
 
-import org.sxkj.fw.area.entity.FwPoliceStationEntity;
+import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
-import lombok.EqualsAndHashCode;
+
+import java.util.Date;
 
 /**
  * 派出所信息表 数据传输对象实体类
@@ -27,8 +28,82 @@
  * @since 2026-01-08
  */
 @Data
-@EqualsAndHashCode(callSuper = true)
-public class FwPoliceStationDTO extends FwPoliceStationEntity {
+public class FwPoliceStationDTO {
 	private static final long serialVersionUID = 1L;
 
+	/**
+	 * 主键id
+	 */
+	@ApiModelProperty(value = "主键id")
+	private Long id;
+	/**
+	 * 派出所名称
+	 */
+	@ApiModelProperty(value = "派出所名称")
+	private String stationName;
+	/**
+	 * 派出所地址
+	 */
+	@ApiModelProperty(value = "派出所地址")
+	private String address;
+	/**
+	 * 经度
+	 */
+	@ApiModelProperty(value = "经度")
+	private Double longitude;
+	/**
+	 * 纬度
+	 */
+	@ApiModelProperty(value = "纬度")
+	private Double latitude;
+	/**
+	 * 联系人
+	 */
+	@ApiModelProperty(value = "联系人")
+	private String contactPerson;
+	/**
+	 * 联系方式
+	 */
+	@ApiModelProperty(value = "联系方式")
+	private String contactPhone;
+	/**
+	 * 区域编码
+	 */
+	@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;
 }
diff --git a/drone-service/drone-fw/src/main/java/org/sxkj/fw/area/vo/FwAreaDivideVO.java b/drone-service/drone-fw/src/main/java/org/sxkj/fw/area/vo/FwAreaDivideVO.java
index 973739e..41c17fa 100644
--- a/drone-service/drone-fw/src/main/java/org/sxkj/fw/area/vo/FwAreaDivideVO.java
+++ b/drone-service/drone-fw/src/main/java/org/sxkj/fw/area/vo/FwAreaDivideVO.java
@@ -16,11 +16,13 @@
  */
 package org.sxkj.fw.area.vo;
 
-import org.sxkj.fw.area.entity.FwAreaDivideEntity;
-import org.springblade.core.tool.node.INode;
+import com.fasterxml.jackson.annotation.JsonFormat;
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
-import lombok.EqualsAndHashCode;
+
+import java.math.BigDecimal;
+import java.time.LocalDateTime;
+import java.util.Date;
 
 /**
  * 区域划分表 视图实体类
@@ -29,26 +31,131 @@
  * @since 2026-01-07
  */
 @Data
-@EqualsAndHashCode(callSuper = true)
-public class FwAreaDivideVO extends FwAreaDivideEntity {
+public class FwAreaDivideVO {
 	private static final long serialVersionUID = 1L;
 
+	/**
+	 * 主键id
+	 */
+	@ApiModelProperty(value = "主键id")
+	private Long id;
+	/**
+	 * 区域名称
+	 */
+	@ApiModelProperty(value = "区域名称")
+	private String areaName;
+	/**
+	 * 区域中心经度
+	 */
+	@ApiModelProperty(value = "区域中心经度")
+	private Double longitude;
+	/**
+	 * 区域中心纬度
+	 */
+	@ApiModelProperty(value = "区域中心纬度")
+	private Double latitude;
+	/**
+	 * 区域面积（km²）
+	 */
+	@ApiModelProperty(value = "区域面积（km²）")
+	private BigDecimal areaSize;
+	/**
+	 * 经纬度面（存储地理面数据）
+	 */
+	@ApiModelProperty(value = "经纬度面（存储地理面数据）")
+	private String geom;
+	/**
+	 * 区域类型：报警区/重点管制区
+	 */
+	@ApiModelProperty(value = "区域类型：报警区/重点管制区")
+	private String areaType;
+	/**
+	 * 触发条件
+	 */
+	@ApiModelProperty(value = "触发条件")
+	private String triggerCondition;
+	/**
+	 * 响应机制内容
+	 */
+	@ApiModelProperty(value = "响应机制内容")
+	private String responseMechanism;
+	/**
+	 * 管控级别：日常/重点/严密
+	 */
+	@ApiModelProperty(value = "管控级别：日常/重点/严密")
+	private String controlLevel;
+	/**
+	 * 关联派出所id
+	 */
+	@ApiModelProperty(value = "关联派出所id")
+	private Long policeStationId;
+	/**
+	 * 关联设备ID，逗号分隔
+	 */
+	@ApiModelProperty(value = "关联设备ID，逗号分隔")
+	private String deviceIds;
+	/**
+	 * 可飞行日期时间-开始
+	 */
+	@ApiModelProperty(value = "可飞行日期时间-开始")
+	@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
+	private LocalDateTime flyDateStart;
+	/**
+	 * 可飞行日期时间-结束
+	 */
+	@ApiModelProperty(value = "可飞行日期时间-结束")
+	@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
+	private LocalDateTime flyDateEnd;
+	/**
+	 * 区域编码
+	 */
+	@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;
+
+	// VO 扩展字段
 	/**
 	 * 派出所名称
 	 */
 	@ApiModelProperty(value = "派出所名称")
 	private String policeStationName;
-
 	/**
 	 * 派出所联系人
 	 */
 	@ApiModelProperty(value = "派出所联系人")
 	private String policeStationContactPerson;
-
 	/**
 	 * 派出所联系电话
 	 */
 	@ApiModelProperty(value = "派出所联系电话")
 	private String policeStationContactPhone;
-
 }
diff --git a/drone-service/drone-fw/src/main/java/org/sxkj/fw/area/vo/FwDefenseSceneVO.java b/drone-service/drone-fw/src/main/java/org/sxkj/fw/area/vo/FwDefenseSceneVO.java
index 205d58d..c92be6f 100644
--- a/drone-service/drone-fw/src/main/java/org/sxkj/fw/area/vo/FwDefenseSceneVO.java
+++ b/drone-service/drone-fw/src/main/java/org/sxkj/fw/area/vo/FwDefenseSceneVO.java
@@ -17,10 +17,9 @@
 package org.sxkj.fw.area.vo;
 
 import io.swagger.annotations.ApiModelProperty;
-import org.sxkj.fw.area.entity.FwDefenseSceneEntity;
-import org.springblade.core.tool.node.INode;
 import lombok.Data;
-import lombok.EqualsAndHashCode;
+
+import java.util.Date;
 
 /**
  * 防控场景表 视图实体类
@@ -29,10 +28,86 @@
  * @since 2026-01-08
  */
 @Data
-@EqualsAndHashCode(callSuper = true)
-public class FwDefenseSceneVO extends FwDefenseSceneEntity {
+public class FwDefenseSceneVO {
 	private static final long serialVersionUID = 1L;
 
+	/**
+	 * 主键id
+	 */
+	@ApiModelProperty(value = "主键id")
+	private Long id;
+	/**
+	 * 场景名称
+	 */
+	@ApiModelProperty(value = "场景名称")
+	private String sceneName;
+	/**
+	 * 场景类型：核心区/学校等
+	 */
+	@ApiModelProperty(value = "场景类型：核心区/学校等")
+	private String sceneType;
+	/**
+	 * 指挥点经度
+	 */
+	@ApiModelProperty(value = "指挥点经度")
+	private Double longitude;
+	/**
+	 * 指挥点纬度
+	 */
+	@ApiModelProperty(value = "指挥点纬度")
+	private Double latitude;
+	/**
+	 * 防控负责人
+	 */
+	@ApiModelProperty(value = "防控负责人")
+	private String defenseLeader;
+	/**
+	 * 防控负责人电话
+	 */
+	@ApiModelProperty(value = "防控负责人电话")
+	private String leaderPhone;
+	/**
+	 * 防控面积(m)
+	 */
+	@ApiModelProperty(value = "防控面积(m)")
+	private Integer defenseArea;
+	/**
+	 * 设备模式
+	 */
+	@ApiModelProperty(value = "设备模式")
+	private String deviceMode;
+	/**
+	 * 关联区域ID，逗号分隔
+	 */
+	@ApiModelProperty(value = "关联区域ID，逗号分隔")
+	private String areaDivideIds;
+	/**
+	 * 区域编码
+	 */
+	@ApiModelProperty(value = "区域编码")
+	private String areaCode;
+	/**
+	 * 创建人
+	 */
+	@ApiModelProperty(value = "创建人")
+	private Long createUser;
+	/**
+	 * 创建部门
+	 */
+	@ApiModelProperty(value = "创建部门")
+	private Long createDept;
+	/**
+	 * 创建时间
+	 */
+	@ApiModelProperty(value = "创建时间")
+	private Date createTime;
+	/**
+	 * 更新时间
+	 */
+	@ApiModelProperty(value = "更新时间")
+	private Date updateTime;
+
+	// VO 扩展字段
 	@ApiModelProperty(value = "区域数量")
 	private Integer areaCount;
 
@@ -41,5 +116,4 @@
 
 	@ApiModelProperty(value = "反制设备数量")
 	private Integer counterDeviceCount;
-
 }
diff --git a/drone-service/drone-fw/src/main/java/org/sxkj/fw/area/vo/FwDefenseZoneVO.java b/drone-service/drone-fw/src/main/java/org/sxkj/fw/area/vo/FwDefenseZoneVO.java
index f6e1230..c57a5e2 100644
--- a/drone-service/drone-fw/src/main/java/org/sxkj/fw/area/vo/FwDefenseZoneVO.java
+++ b/drone-service/drone-fw/src/main/java/org/sxkj/fw/area/vo/FwDefenseZoneVO.java
@@ -17,10 +17,10 @@
 package org.sxkj.fw.area.vo;
 
 import io.swagger.annotations.ApiModelProperty;
-import org.sxkj.fw.area.entity.FwDefenseZoneEntity;
-import org.springblade.core.tool.node.INode;
 import lombok.Data;
-import lombok.EqualsAndHashCode;
+
+import java.math.BigDecimal;
+import java.util.Date;
 
 /**
  * 防区管理表 视图实体类
@@ -29,10 +29,66 @@
  * @since 2026-01-08
  */
 @Data
-@EqualsAndHashCode(callSuper = true)
-public class FwDefenseZoneVO extends FwDefenseZoneEntity {
+public class FwDefenseZoneVO {
 	private static final long serialVersionUID = 1L;
 
+	/**
+	 * 主键id
+	 */
+	@ApiModelProperty(value = "主键id")
+	private Long id;
+	/**
+	 * 防区名称
+	 */
+	@ApiModelProperty(value = "防区名称")
+	private String zoneName;
+	/**
+	 * 防区面积(km²)
+	 */
+	@ApiModelProperty(value = "防区面积(km²)")
+	private BigDecimal zoneArea;
+	/**
+	 * 关联场景ID，逗号分隔
+	 */
+	@ApiModelProperty(value = "关联场景ID，逗号分隔")
+	private String defenseSceneIds;
+	/**
+	 * 关联区域ID，逗号分隔
+	 */
+	@ApiModelProperty(value = "关联区域ID，逗号分隔")
+	private String areaDivideIds;
+	/**
+	 * 关联设备ID，逗号分隔
+	 */
+	@ApiModelProperty(value = "关联设备ID，逗号分隔")
+	private String deviceIds;
+	/**
+	 * 经纬度面（存储地理面数据）
+	 */
+	@ApiModelProperty(value = "经纬度面（存储地理面数据）")
+	private String geom;
+	/**
+	 * 区域编码
+	 */
+	@ApiModelProperty(value = "区域编码")
+	private String areaCode;
+	/**
+	 * 创建人
+	 */
+	@ApiModelProperty(value = "创建人")
+	private Long createUser;
+	/**
+	 * 创建部门
+	 */
+	@ApiModelProperty(value = "创建部门")
+	private Long createDept;
+	/**
+	 * 创建时间
+	 */
+	@ApiModelProperty(value = "创建时间")
+	private Date createTime;
+
+	// VO 扩展字段
 	@ApiModelProperty(value = "场景数量")
 	private Integer sceneCount;
 
@@ -41,5 +97,4 @@
 
 	@ApiModelProperty(value = "区域数量")
 	private Integer areaCount;
-
 }
diff --git a/drone-service/drone-fw/src/main/java/org/sxkj/fw/area/vo/FwPoliceStationVO.java b/drone-service/drone-fw/src/main/java/org/sxkj/fw/area/vo/FwPoliceStationVO.java
index d739867..a4f8c63 100644
--- a/drone-service/drone-fw/src/main/java/org/sxkj/fw/area/vo/FwPoliceStationVO.java
+++ b/drone-service/drone-fw/src/main/java/org/sxkj/fw/area/vo/FwPoliceStationVO.java
@@ -16,10 +16,10 @@
  */
 package org.sxkj.fw.area.vo;
 
-import org.sxkj.fw.area.entity.FwPoliceStationEntity;
-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,62 @@
  * @since 2026-01-08
  */
 @Data
-@EqualsAndHashCode(callSuper = true)
-public class FwPoliceStationVO extends FwPoliceStationEntity {
+public class FwPoliceStationVO {
 	private static final long serialVersionUID = 1L;
 
+	/**
+	 * 主键id
+	 */
+	@ApiModelProperty(value = "主键id")
+	private Long id;
+	/**
+	 * 派出所名称
+	 */
+	@ApiModelProperty(value = "派出所名称")
+	private String stationName;
+	/**
+	 * 派出所地址
+	 */
+	@ApiModelProperty(value = "派出所地址")
+	private String address;
+	/**
+	 * 经度
+	 */
+	@ApiModelProperty(value = "经度")
+	private Double longitude;
+	/**
+	 * 纬度
+	 */
+	@ApiModelProperty(value = "纬度")
+	private Double latitude;
+	/**
+	 * 联系人
+	 */
+	@ApiModelProperty(value = "联系人")
+	private String contactPerson;
+	/**
+	 * 联系方式
+	 */
+	@ApiModelProperty(value = "联系方式")
+	private String contactPhone;
+	/**
+	 * 区域编码
+	 */
+	@ApiModelProperty(value = "区域编码")
+	private String areaCode;
+	/**
+	 * 创建人
+	 */
+	@ApiModelProperty(value = "创建人")
+	private Long createUser;
+	/**
+	 * 创建部门
+	 */
+	@ApiModelProperty(value = "创建部门")
+	private Long createDept;
+	/**
+	 * 创建时间
+	 */
+	@ApiModelProperty(value = "创建时间")
+	private Date createTime;
 }
diff --git a/drone-service/drone-fw/src/main/java/org/sxkj/fw/detection/dto/FwDeviceConfigDTO.java b/drone-service/drone-fw/src/main/java/org/sxkj/fw/detection/dto/FwDeviceConfigDTO.java
index c62e89b..97e5cd3 100644
--- a/drone-service/drone-fw/src/main/java/org/sxkj/fw/detection/dto/FwDeviceConfigDTO.java
+++ b/drone-service/drone-fw/src/main/java/org/sxkj/fw/detection/dto/FwDeviceConfigDTO.java
@@ -16,9 +16,10 @@
  */
 package org.sxkj.fw.detection.dto;
 
-import org.sxkj.fw.detection.entity.FwDeviceConfigEntity;
+import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
-import lombok.EqualsAndHashCode;
+
+import java.util.Date;
 
 /**
  * 设备配置表 数据传输对象实体类
@@ -27,8 +28,69 @@
  * @since 2026-01-08
  */
 @Data
-@EqualsAndHashCode(callSuper = true)
-public class FwDeviceConfigDTO extends FwDeviceConfigEntity {
+public class FwDeviceConfigDTO {
 	private static final long serialVersionUID = 1L;
+	@ApiModelProperty("主键id")
+	private Long id;
+	/**
+	 * 设备ID（tz_device_deploy.id）
+	 */
+	@ApiModelProperty(value = "设备ID（tz_device_deploy.id）")
+	private Long deviceId;
+	/**
+	 * 配置版本号
+	 */
+	@ApiModelProperty(value = "配置版本号")
+	private Integer configVersion;
+	/**
+	 * 是否最新 1最新 0历史
+	 */
+	@ApiModelProperty(value = "是否最新 1最新 0历史")
+	private Byte isLatest;
+	/**
+	 * 全部参数（JSON）
+	 */
+	@ApiModelProperty(value = "全部参数（JSON）")
+	private String configJson;
+	/**
+	 * 区域编码
+	 */
+	@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;
 
 }
diff --git a/drone-service/drone-fw/src/main/java/org/sxkj/fw/detection/mapper/FwDeviceConfigMapper.xml b/drone-service/drone-fw/src/main/java/org/sxkj/fw/detection/mapper/FwDeviceConfigMapper.xml
index 111b177..323debd 100644
--- a/drone-service/drone-fw/src/main/java/org/sxkj/fw/detection/mapper/FwDeviceConfigMapper.xml
+++ b/drone-service/drone-fw/src/main/java/org/sxkj/fw/detection/mapper/FwDeviceConfigMapper.xml
@@ -19,8 +19,24 @@
         <result column="is_deleted" property="isDeleted"/>
     </resultMap>
 
+    <resultMap id="fwDeviceConfigVoResultMap" type="org.sxkj.fw.detection.vo.FwDeviceConfigVO">
+        <result column="id" property="id"/>
+        <result column="device_id" property="deviceId"/>
+        <result column="config_version" property="configVersion"/>
+        <result column="is_latest" property="isLatest"/>
+        <result column="config_json" property="configJson"/>
+        <result column="area_code" property="areaCode"/>
+        <result column="create_user" property="createUser"/>
+        <result column="create_dept" property="createDept"/>
+        <result column="create_time" property="createTime"/>
+        <result column="update_user" property="updateUser"/>
+        <result column="update_time" property="updateTime"/>
+        <result column="status" property="status"/>
+        <result column="is_deleted" property="isDeleted"/>
+    </resultMap>
 
-    <select id="selectFwDeviceConfigPage" resultMap="fwDeviceConfigResultMap">
+
+    <select id="selectFwDeviceConfigPage" resultMap="fwDeviceConfigVoResultMap">
         select * from ja_fw_device_config
         <where>
             is_deleted = 0
diff --git a/drone-service/drone-fw/src/main/java/org/sxkj/fw/detection/mapper/FwEffectEvalMapper.xml b/drone-service/drone-fw/src/main/java/org/sxkj/fw/detection/mapper/FwEffectEvalMapper.xml
index 00816d3..ab958b1 100644
--- a/drone-service/drone-fw/src/main/java/org/sxkj/fw/detection/mapper/FwEffectEvalMapper.xml
+++ b/drone-service/drone-fw/src/main/java/org/sxkj/fw/detection/mapper/FwEffectEvalMapper.xml
@@ -3,7 +3,7 @@
 <mapper namespace="org.sxkj.fw.detection.mapper.FwEffectEvalMapper">
 
     <!-- 通用查询映射结果 -->
-    <resultMap id="fwEffectEvalResultMap" type="org.sxkj.fw.detection.entity.FwEffectEvalEntity">
+    <resultMap id="fwEffectEvalResultMap" type="org.sxkj.fw.detection.vo.FwEffectEvalVO">
         <result column="id" property="id"/>
         <result column="alarm_record_id" property="alarmRecordId"/>
         <result column="device_id" property="deviceId"/>
diff --git a/drone-service/drone-fw/src/main/java/org/sxkj/fw/detection/vo/FwDeviceConfigVO.java b/drone-service/drone-fw/src/main/java/org/sxkj/fw/detection/vo/FwDeviceConfigVO.java
index 076edac..577edc0 100644
--- a/drone-service/drone-fw/src/main/java/org/sxkj/fw/detection/vo/FwDeviceConfigVO.java
+++ b/drone-service/drone-fw/src/main/java/org/sxkj/fw/detection/vo/FwDeviceConfigVO.java
@@ -16,10 +16,10 @@
  */
 package org.sxkj.fw.detection.vo;
 
-import org.sxkj.fw.detection.entity.FwDeviceConfigEntity;
-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,69 @@
  * @since 2026-01-08
  */
 @Data
-@EqualsAndHashCode(callSuper = true)
-public class FwDeviceConfigVO extends FwDeviceConfigEntity {
+public class FwDeviceConfigVO {
 	private static final long serialVersionUID = 1L;
+	@ApiModelProperty("主键id")
+	private Long id;
+	/**
+	 * 设备ID（tz_device_deploy.id）
+	 */
+	@ApiModelProperty(value = "设备ID（tz_device_deploy.id）")
+	private Long deviceId;
+	/**
+	 * 配置版本号
+	 */
+	@ApiModelProperty(value = "配置版本号")
+	private Integer configVersion;
+	/**
+	 * 是否最新 1最新 0历史
+	 */
+	@ApiModelProperty(value = "是否最新 1最新 0历史")
+	private Byte isLatest;
+	/**
+	 * 全部参数（JSON）
+	 */
+	@ApiModelProperty(value = "全部参数（JSON）")
+	private String configJson;
+	/**
+	 * 区域编码
+	 */
+	@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;
 
 }
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;
 
 }
diff --git a/drone-service/drone-fw/src/main/java/org/sxkj/fw/detection/vo/FwTaskScheduleVO.java b/drone-service/drone-fw/src/main/java/org/sxkj/fw/detection/vo/FwTaskScheduleVO.java
index 00b9372..7d3907d 100644
--- a/drone-service/drone-fw/src/main/java/org/sxkj/fw/detection/vo/FwTaskScheduleVO.java
+++ b/drone-service/drone-fw/src/main/java/org/sxkj/fw/detection/vo/FwTaskScheduleVO.java
@@ -16,10 +16,10 @@
  */
 package org.sxkj.fw.detection.vo;
 
-import org.sxkj.fw.detection.entity.FwTaskScheduleEntity;
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
-import lombok.EqualsAndHashCode;
+
+import java.util.Date;
 
 /**
  * 任务调度记录表 视图实体类
@@ -28,10 +28,105 @@
  * @since 2026-01-08
  */
 @Data
-@EqualsAndHashCode(callSuper = true)
-public class FwTaskScheduleVO extends FwTaskScheduleEntity {
+public class FwTaskScheduleVO {
 	private static final long serialVersionUID = 1L;
-
+	@ApiModelProperty("主键id")
+	private Long id;
+	/**
+	 * 设备ID（ja_fw_device.id）
+	 */
+	@ApiModelProperty(value = "设备ID（ja_fw_device.id）")
+	private Long deviceId;
+	/**
+	 * 关联区域ID
+	 */
+	@ApiModelProperty(value = "关联区域ID")
+	private Long areaDivideId;
+	/**
+	 * 关联场景ID
+	 */
+	@ApiModelProperty(value = "关联场景ID")
+	private Long defenseSceneId;
+	/**
+	 * 调度经度
+	 */
+	@ApiModelProperty(value = "调度经度")
+	private Double longitude;
+	/**
+	 * 调度纬度
+	 */
+	@ApiModelProperty(value = "调度纬度")
+	private Double latitude;
+	/**
+	 * 调度人员
+	 */
+	@ApiModelProperty(value = "调度人员")
+	private String dispatchUser;
+	/**
+	 * 调度日期-开始
+	 */
+	@ApiModelProperty(value = "调度日期-开始")
+	private Date dispatchStartTime;
+	/**
+	 * 调度日期-结束
+	 */
+	@ApiModelProperty(value = "调度日期-结束")
+	private Date dispatchEndTime;
+	/**
+	 * 调度内容
+	 */
+	@ApiModelProperty(value = "调度内容")
+	private String dispatchContent;
+	/**
+	 * 调度结果
+	 */
+	@ApiModelProperty(value = "调度结果")
+	private String dispatchResult;
+	/**
+	 * 处置措施
+	 */
+	@ApiModelProperty(value = "处置措施")
+	private String disposeMeasure;
+	/**
+	 * 区域编码
+	 */
+	@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;
 	/**
 	 * 设备sn
 	 */

--
Gitblit v1.9.3