From fe427fcedc0961977a5c096190ca404cb739f8c9 Mon Sep 17 00:00:00 2001
From: linwei <872216696@qq.com>
Date: Thu, 22 Jan 2026 18:19:11 +0800
Subject: [PATCH] 告警记录导出
---
drone-service/drone-fw/src/main/java/org/sxkj/fw/record/excel/FwDroneAlarmRecordExcel.java | 40 ++++++++++++++--------------------------
1 files changed, 14 insertions(+), 26 deletions(-)
diff --git a/drone-service/drone-fw/src/main/java/org/sxkj/fw/record/excel/FwDroneAlarmRecordExcel.java b/drone-service/drone-fw/src/main/java/org/sxkj/fw/record/excel/FwDroneAlarmRecordExcel.java
index 2e8f8c5..500ddd7 100644
--- a/drone-service/drone-fw/src/main/java/org/sxkj/fw/record/excel/FwDroneAlarmRecordExcel.java
+++ b/drone-service/drone-fw/src/main/java/org/sxkj/fw/record/excel/FwDroneAlarmRecordExcel.java
@@ -72,18 +72,6 @@
@ExcelProperty("区域名称")
private String areaName;
-
- /**
- * 无人机类型（微型机/植保机...）
- */
- @ColumnWidth(20)
- // @ExcelProperty(value = "设备类型", converter = ExcelDictConverter.class)
- @ExcelProperty(value = "设备类型")
- // @ExcelDictItemLabel(type = "droneType")
- // @ExcelDictItem(type = "droneType")
- private String droneType;
-
-
/**
* 触发原因
*/
@@ -91,29 +79,29 @@
@ExcelProperty("触发原因")
private String triggerReason;
- /**
- * 停留时长 （秒）
- */
+
@ColumnWidth(20)
- @ExcelProperty(value = "停留时长(秒)")
- private String stayDuration;
+ @ExcelProperty("侦测反制设备")
+ private String deviceName;
/**
- * 当前经度
+ * 无人机类型（微型机/植保机...）
*/
@ColumnWidth(20)
- @ExcelProperty("当前经度")
- private Double longitude;
- /**
- * 当前纬度
- */
- @ColumnWidth(20)
- @ExcelProperty("当前纬度")
- private Double latitude;
+ @ExcelProperty(value = "设备类型")
+ private String droneType;
+
@ColumnWidth(20)
@ExcelProperty("设备编号")
private String deviceSn;
+ @ColumnWidth(20)
+ @ExcelProperty(value = "设备状态", converter = ExcelDictConverter.class)
+ @ExcelDictItemLabel(type = "deviceStatus")
+ @ExcelDictItem(type = "deviceStatus")
+ private String deviceStatus;
+
+
}
--
Gitblit v1.9.3