From 08ddfad4530a014094c06fe68b8c2d9a0753403a Mon Sep 17 00:00:00 2001
From: linwei <872216696@qq.com>
Date: Wed, 05 Aug 2026 14:09:29 +0800
Subject: [PATCH] fix(gd): 修复线索事件查询中的SQL语法错误

---
 drone-service/drone-fw/src/main/java/org/sxkj/fw/record/excel/FwDroneFlightRecordExcel.java |   24 ++++++++++++++----------
 1 files changed, 14 insertions(+), 10 deletions(-)

diff --git a/drone-service/drone-fw/src/main/java/org/sxkj/fw/record/excel/FwDroneFlightRecordExcel.java b/drone-service/drone-fw/src/main/java/org/sxkj/fw/record/excel/FwDroneFlightRecordExcel.java
index a9f6603..1515536 100644
--- a/drone-service/drone-fw/src/main/java/org/sxkj/fw/record/excel/FwDroneFlightRecordExcel.java
+++ b/drone-service/drone-fw/src/main/java/org/sxkj/fw/record/excel/FwDroneFlightRecordExcel.java
@@ -17,6 +17,7 @@
 package org.sxkj.fw.record.excel;
 
 
+import com.alibaba.excel.annotation.ExcelIgnore;
 import com.alibaba.excel.annotation.ExcelProperty;
 import com.alibaba.excel.annotation.write.style.ColumnWidth;
 import com.alibaba.excel.annotation.write.style.ContentRowHeight;
@@ -42,6 +43,9 @@
 
 	private static final long serialVersionUID = 1L;
 
+	@ExcelIgnore
+	private Long id;
+
 	@ColumnWidth(20)
 	@ExcelProperty("无人机名称")
 	private String droneName;
@@ -50,21 +54,21 @@
 	@ExcelProperty("序列号")
 	private String serialNo;
 
-	@ColumnWidth(20)
-	@ExcelProperty("首次告警时间")
-	private Date alarmTime;
-
-	@ColumnWidth(20)
-	@ExcelProperty("触发原因/类型")
-	private String triggerType;
+	// @ColumnWidth(20)
+	// @ExcelProperty("首次告警时间")
+	// private Date alarmTime;
+	//
+	// @ColumnWidth(20)
+	// @ExcelProperty("触发原因")
+	// private String triggerType;
 
 	@ColumnWidth(20)
 	@ExcelProperty("停留时长")
 	private String stayDuration;
 
-	@ColumnWidth(20)
-	@ExcelProperty("区域名称")
-	private String areaName;
+	// @ColumnWidth(20)
+	// @ExcelProperty("区域名称")
+	// private String areaName;
 
 	@ColumnWidth(20)
 	@ExcelProperty("经度")

--
Gitblit v1.9.3