From 51a551a7f8eae7654f973d45cd2fa2952774673d Mon Sep 17 00:00:00 2001
From: linwei <872216696@qq.com>
Date: Fri, 07 Aug 2026 10:56:55 +0800
Subject: [PATCH] perf(task): 优化巡查任务审核性能并添加详细日志记录

---
 drone-service/drone-fw/src/main/java/org/sxkj/fw/area/excel/FwAreaDivideExcel.java |   30 ++++++++++++------------------
 1 files changed, 12 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 14a9fb6..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,11 +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.LocalDateTimeConverter;
 
 import java.io.Serializable;
 import java.math.BigDecimal;
-import java.time.LocalDate;
-import java.time.LocalTime;
+import java.time.LocalDateTime;
 
 
 /**
@@ -72,7 +72,7 @@
 	 */
 	@ColumnWidth(20)
 	@ExcelProperty("经纬度面(存储地理面数据)")
-	private byte[] geom;
+	private String geom;
 	/**
 	 * 区域类型:报警区/重点管制区
 	 */
@@ -104,29 +104,23 @@
 	@ExcelProperty("关联派出所id")
 	private Long policeStationId;
 	/**
-	 * 可飞行时间段-开始
+	 * 关联设备ID,逗号分隔
 	 */
 	@ColumnWidth(20)
-	@ExcelProperty("可飞行时间段-开始")
-	private LocalTime flyTimeStart;
+	@ExcelProperty("关联设备ID,逗号分隔")
+	private String deviceIds;
 	/**
-	 * 可飞行时间段-结束
+	 * 可飞行日期时间-开始
 	 */
 	@ColumnWidth(20)
-	@ExcelProperty("可飞行时间段-结束")
-	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