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/FwAreaDivideVO.java | 123 ++++++++++++++++++++++++++++++++++++++--
1 files changed, 115 insertions(+), 8 deletions(-)
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;
-
}
--
Gitblit v1.9.3