From 8585b431e9257333413358eb37c30ae58f74db76 Mon Sep 17 00:00:00 2001
From: linwei <872216696@qq.com>
Date: Thu, 13 Aug 2026 15:46:10 +0800
Subject: [PATCH] refactor(database): 优化数据库查询中的字段映射
---
drone-service/drone-fw/src/main/java/org/sxkj/fw/area/vo/FwDefenseZoneVO.java | 96 +++++++++++++++++++++++++++++++++++++++++++++---
1 files changed, 90 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 5b4482f..ff75dfd 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
@@ -16,20 +16,104 @@
*/
package org.sxkj.fw.area.vo;
-import org.sxkj.fw.area.entity.FwDefenseZoneEntity;
-import org.springblade.core.tool.node.INode;
+import java.util.Date;
+import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
-import lombok.EqualsAndHashCode;
+import java.math.BigDecimal;
+import java.io.Serializable;
+import com.fasterxml.jackson.databind.annotation.JsonSerialize;
+import com.fasterxml.jackson.databind.ser.std.ToStringSerializer;
/**
* 防区管理表 视图实体类
*
* @author lw
- * @since 2026-01-07
+ * @since 2026-01-08
*/
@Data
-@EqualsAndHashCode(callSuper = true)
-public class FwDefenseZoneVO extends FwDefenseZoneEntity {
+public class FwDefenseZoneVO implements Serializable {
private static final long serialVersionUID = 1L;
+ /**
+ * 主键id
+ */
+ @ApiModelProperty(value = "主键id")
+ @JsonSerialize(using = ToStringSerializer.class)
+ 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;
+
+ @ApiModelProperty(value = "设备数量")
+ private Integer deviceCount;
+
+ @ApiModelProperty(value = "区域数量")
+ private Integer areaCount;
+
+ /**
+ * 更新人
+ */
+ @ApiModelProperty(value = "更新人")
+ private Long updateUser;
+ /**
+ * 更新时间
+ */
+ @ApiModelProperty(value = "更新时间")
+ private Date updateTime;
+ /**
+ * 状态（0正常 1停用）
+ */
+ @ApiModelProperty(value = "状态（0正常 1停用）")
+ private Integer status;
}
--
Gitblit v1.9.3