From 80ec5979c3688a01359517cda32bc33b20c7f66b Mon Sep 17 00:00:00 2001
From: xiebin <vip_xiaobin810@163.com>
Date: Fri, 09 Jan 2026 10:48:10 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
drone-service/drone-fw/src/main/java/org/sxkj/fw/record/excel/FwDroneFlightRecordExcel.java | 55 ++++++++++++++++++++++---------------------------------
1 files changed, 22 insertions(+), 33 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 2fe95ac..a9f6603 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
@@ -42,53 +42,42 @@
private static final long serialVersionUID = 1L;
- /**
- * 反无设备ID（关联ja_fw_device.id）
- */
- @ColumnWidth(20)
- @ExcelProperty("反无设备ID（关联ja_fw_device.id）")
- private Long deviceId;
- /**
- * 无人机名称
- */
@ColumnWidth(20)
@ExcelProperty("无人机名称")
private String droneName;
- /**
- * 序列号
- */
+
@ColumnWidth(20)
@ExcelProperty("序列号")
private String serialNo;
- /**
- * 首次告警时间
- */
+
@ColumnWidth(20)
@ExcelProperty("首次告警时间")
private Date alarmTime;
- /**
- * 触发原因/类型
- */
+
@ColumnWidth(20)
@ExcelProperty("触发原因/类型")
private String triggerType;
- /**
- * 停留时长(HH:MM:SS)
- */
+
@ColumnWidth(20)
- @ExcelProperty("停留时长(HH:MM:SS)")
- private LocalTime stayDuration;
- /**
- * 区域编码
- */
+ @ExcelProperty("停留时长")
+ private String stayDuration;
+
@ColumnWidth(20)
- @ExcelProperty("区域编码")
- private String areaCode;
- /**
- * 删除标志（0存在 1删除）
- */
+ @ExcelProperty("区域名称")
+ private String areaName;
+
@ColumnWidth(20)
- @ExcelProperty("删除标志（0存在 1删除）")
- private Byte isDeleted;
+ @ExcelProperty("经度")
+ private Double longitude;
+
+ @ColumnWidth(20)
+ @ExcelProperty("纬度")
+ private Double latitude;
+
+ @ColumnWidth(20)
+ @ExcelProperty("时间")
+ private Date pointTime;
+
+
}
--
Gitblit v1.9.3