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 ++++++++++++++++++++++++++++++++++++++++---
1 files changed, 80 insertions(+), 6 deletions(-)
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;
-
}
--
Gitblit v1.9.3