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