From 74756c657109a4e48dd6c0b4d8959cdab89b33a9 Mon Sep 17 00:00:00 2001
From: xiebin <vip_xiaobin810@163.com>
Date: Wed, 28 Jan 2026 20:10:29 +0800
Subject: [PATCH] update-区域划分表结构调整
---
drone-service/drone-fw/src/main/java/org/sxkj/fw/area/entity/FwAreaDivideEntity.java | 64 +++++++++++--------------------
1 files changed, 23 insertions(+), 41 deletions(-)
diff --git a/drone-service/drone-fw/src/main/java/org/sxkj/fw/area/entity/FwAreaDivideEntity.java b/drone-service/drone-fw/src/main/java/org/sxkj/fw/area/entity/FwAreaDivideEntity.java
index d1cc5c3..972f87a 100644
--- a/drone-service/drone-fw/src/main/java/org/sxkj/fw/area/entity/FwAreaDivideEntity.java
+++ b/drone-service/drone-fw/src/main/java/org/sxkj/fw/area/entity/FwAreaDivideEntity.java
@@ -17,6 +17,8 @@
package org.sxkj.fw.area.entity;
import com.baomidou.mybatisplus.annotation.TableName;
+import com.baomidou.mybatisplus.annotation.TableField;
+import com.fasterxml.jackson.annotation.JsonFormat;
import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
@@ -24,8 +26,7 @@
import org.springblade.core.mp.base.BaseEntity;
import java.math.BigDecimal;
-import java.time.LocalDate;
-import java.time.LocalTime;
+import java.time.LocalDateTime;
/**
* 区域划分表 实体类
@@ -42,76 +43,57 @@
/**
* 区域名称
*/
+ @TableField("area_name")
@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 byte[] geom;
- /**
- * 区域类型：报警区/重点管制区
- */
- @ApiModelProperty(value = "区域类型：报警区/重点管制区")
- private String areaType;
- /**
* 触发条件
*/
+ @TableField("trigger_condition")
@ApiModelProperty(value = "触发条件")
private String triggerCondition;
/**
* 响应机制内容
*/
+ @TableField("response_mechanism")
@ApiModelProperty(value = "响应机制内容")
private String responseMechanism;
/**
* 管控级别：日常/重点/严密
*/
+ @TableField("control_level")
@ApiModelProperty(value = "管控级别：日常/重点/严密")
private String controlLevel;
/**
* 关联派出所id
*/
+ @TableField("police_station_id")
@ApiModelProperty(value = "关联派出所id")
private Long policeStationId;
/**
- * 可飞行时间段-开始
+ * 关联设备ID，逗号分隔
*/
- @ApiModelProperty(value = "可飞行时间段-开始")
- private LocalTime flyTimeStart;
+ @TableField("device_ids")
+ @ApiModelProperty(value = "关联设备ID，逗号分隔")
+ private String deviceIds;
/**
- * 可飞行时间段-结束
+ * 可飞行日期时间-开始
*/
- @ApiModelProperty(value = "可飞行时间段-结束")
- private LocalTime flyTimeEnd;
+ @TableField("fly_date_start")
+ @ApiModelProperty(value = "可飞行日期时间-开始")
+ @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
+ private LocalDateTime flyDateStart;
/**
- * 可飞行日期-开始
+ * 可飞行日期时间-结束
*/
- @ApiModelProperty(value = "可飞行日期-开始")
- private LocalDate flyDateStart;
- /**
- * 可飞行日期-结束
- */
- @ApiModelProperty(value = "可飞行日期-结束")
- private LocalDate flyDateEnd;
+ @TableField("fly_date_end")
+ @ApiModelProperty(value = "可飞行日期时间-结束")
+ @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
+ private LocalDateTime flyDateEnd;
/**
* 区域编码
*/
+ @TableField("area_code")
@ApiModelProperty(value = "区域编码")
private String areaCode;
--
Gitblit v1.9.3