From 4e48664942bbefe70699ca43d25cbbd56ecc8daa Mon Sep 17 00:00:00 2001
From: xiebin <vip_xiaobin810@163.com>
Date: Mon, 19 Jan 2026 15:17:12 +0800
Subject: [PATCH] update-维修计划状态更新、新增定时器修改状态
---
drone-service/drone-fw/src/main/java/org/sxkj/fw/area/entity/FwAreaDivideEntity.java | 34 +++++++++++++++-------------------
1 files changed, 15 insertions(+), 19 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 5cbe1c0..9c57af3 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
@@ -18,6 +18,7 @@
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;
@@ -25,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;
/**
* 区域划分表 实体类
@@ -69,7 +69,7 @@
*/
@TableField("geom")
@ApiModelProperty(value = "经纬度面（存储地理面数据）")
- private byte[] geom;
+ private String geom;
/**
* 区域类型：报警区/重点管制区
*/
@@ -101,29 +101,25 @@
@ApiModelProperty(value = "关联派出所id")
private Long policeStationId;
/**
- * 可飞行时间段-开始
+ * 关联设备ID，逗号分隔
*/
- @TableField("fly_time_start")
- @ApiModelProperty(value = "可飞行时间段-开始")
- private LocalTime flyTimeStart;
+ @TableField("device_ids")
+ @ApiModelProperty(value = "关联设备ID，逗号分隔")
+ private String deviceIds;
/**
- * 可飞行时间段-结束
- */
- @TableField("fly_time_end")
- @ApiModelProperty(value = "可飞行时间段-结束")
- private LocalTime flyTimeEnd;
- /**
- * 可飞行日期-开始
+ * 可飞行日期时间-开始
*/
@TableField("fly_date_start")
- @ApiModelProperty(value = "可飞行日期-开始")
- private LocalDate flyDateStart;
+ @ApiModelProperty(value = "可飞行日期时间-开始")
+ @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
+ private LocalDateTime flyDateStart;
/**
- * 可飞行日期-结束
+ * 可飞行日期时间-结束
*/
@TableField("fly_date_end")
- @ApiModelProperty(value = "可飞行日期-结束")
- private LocalDate flyDateEnd;
+ @ApiModelProperty(value = "可飞行日期时间-结束")
+ @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
+ private LocalDateTime flyDateEnd;
/**
* 区域编码
*/
--
Gitblit v1.9.3