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/excel/FwAreaDivideExcel.java | 29 +++++++++++------------------
1 files changed, 11 insertions(+), 18 deletions(-)
diff --git a/drone-service/drone-fw/src/main/java/org/sxkj/fw/area/excel/FwAreaDivideExcel.java b/drone-service/drone-fw/src/main/java/org/sxkj/fw/area/excel/FwAreaDivideExcel.java
index 2c5fa90..3cb38a2 100644
--- a/drone-service/drone-fw/src/main/java/org/sxkj/fw/area/excel/FwAreaDivideExcel.java
+++ b/drone-service/drone-fw/src/main/java/org/sxkj/fw/area/excel/FwAreaDivideExcel.java
@@ -22,12 +22,11 @@
import com.alibaba.excel.annotation.write.style.ContentRowHeight;
import com.alibaba.excel.annotation.write.style.HeadRowHeight;
import lombok.Data;
-import org.sxkj.fw.utils.excel.LocalTimeConverter;
+import org.sxkj.fw.utils.excel.LocalDateTimeConverter;
import java.io.Serializable;
import java.math.BigDecimal;
-import java.time.LocalDate;
-import java.time.LocalTime;
+import java.time.LocalDateTime;
/**
@@ -105,29 +104,23 @@
@ExcelProperty("关联派出所id")
private Long policeStationId;
/**
- * 可飞行时间段-开始
+ * 关联设备ID，逗号分隔
*/
@ColumnWidth(20)
- @ExcelProperty(value = "可飞行时间段-开始", converter = LocalTimeConverter.class)
- private LocalTime flyTimeStart;
+ @ExcelProperty("关联设备ID，逗号分隔")
+ private String deviceIds;
/**
- * 可飞行时间段-结束
+ * 可飞行日期时间-开始
*/
@ColumnWidth(20)
- @ExcelProperty(value = "可飞行时间段-结束", converter = LocalTimeConverter.class)
- private LocalTime flyTimeEnd;
+ @ExcelProperty(value = "可飞行日期时间-开始", converter = LocalDateTimeConverter.class)
+ private LocalDateTime flyDateStart;
/**
- * 可飞行日期-开始
+ * 可飞行日期时间-结束
*/
@ColumnWidth(20)
- @ExcelProperty("可飞行日期-开始")
- private LocalDate flyDateStart;
- /**
- * 可飞行日期-结束
- */
- @ColumnWidth(20)
- @ExcelProperty("可飞行日期-结束")
- private LocalDate flyDateEnd;
+ @ExcelProperty(value = "可飞行日期时间-结束", converter = LocalDateTimeConverter.class)
+ private LocalDateTime flyDateEnd;
/**
* 区域编码
*/
--
Gitblit v1.9.3