From f0aa8adb5cafc5829138bc0b096be7fd1e94b6f6 Mon Sep 17 00:00:00 2001
From: linwei <872216696@qq.com>
Date: Thu, 22 Jan 2026 17:07:29 +0800
Subject: [PATCH] 告警记录导出
---
drone-service/drone-fw/src/main/java/org/sxkj/fw/record/excel/FwDroneAlarmRecordExcel.java | 104 ++++++++++++++-------------------------------------
1 files changed, 29 insertions(+), 75 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 a2d87d3..2e8f8c5 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
@@ -46,12 +46,7 @@
private static final long serialVersionUID = 1L;
- /**
- * 反无设备ID（关联ja_fw_device.id）
- */
- @ColumnWidth(20)
- @ExcelProperty("反无设备ID（关联ja_fw_device.id）")
- private Long deviceId;
+
/**
* 无人机名称
*/
@@ -62,22 +57,9 @@
* 无人机序列号
*/
@ColumnWidth(20)
- @ExcelProperty("无人机序列号")
+ @ExcelProperty("序列号")
private String droneSerialNo;
- /**
- * 无人机类型（微型机/植保机...）
- */
- @ColumnWidth(20)
- @ExcelProperty( value = "无人机类型（微型机/植保机...）",converter = ExcelDictConverter.class)
- @ExcelDictItemLabel(type = "droneType")
- @ExcelDictItem(type = "droneType")
- private String droneType;
- /**
- * 告警类型：实时告警/历史告警
- */
- @ColumnWidth(20)
- @ExcelProperty("告警类型：实时告警/历史告警")
- private String alarmType;
+
/**
* 告警时间
*/
@@ -85,20 +67,37 @@
@ExcelProperty("告警时间")
@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
private Date alarmTime;
+
+ @ColumnWidth(20)
+ @ExcelProperty("区域名称")
+ private String areaName;
+
+
+ /**
+ * 无人机类型（微型机/植保机...）
+ */
+ @ColumnWidth(20)
+ // @ExcelProperty(value = "设备类型", converter = ExcelDictConverter.class)
+ @ExcelProperty(value = "设备类型")
+ // @ExcelDictItemLabel(type = "droneType")
+ // @ExcelDictItem(type = "droneType")
+ private String droneType;
+
+
/**
* 触发原因
*/
@ColumnWidth(20)
@ExcelProperty("触发原因")
private String triggerReason;
+
/**
- * 飞行状态：侦测中/反制中
+ * 停留时长 （秒）
*/
@ColumnWidth(20)
- @ExcelProperty(value = "飞行状态：侦测中/反制中", converter = ExcelDictConverter.class)
- @ExcelDictItemLabel(type = "flightStatus")
- @ExcelDictItem(type = "flightStatus")
- private String flightStatus;
+ @ExcelProperty(value = "停留时长(秒)")
+ private String stayDuration;
+
/**
* 当前经度
*/
@@ -111,55 +110,10 @@
@ColumnWidth(20)
@ExcelProperty("当前纬度")
private Double latitude;
- /**
- * 信号频段(MHz)
- */
+
@ColumnWidth(20)
- @ExcelProperty("信号频段(MHz)")
- private Integer signalFreqMhz;
- /**
- * 飞行高度(m)
- */
- @ColumnWidth(20)
- @ExcelProperty("飞行高度(m)")
- private Integer flightHeightM;
- /**
- * 飞行速度(m/s)
- */
- @ColumnWidth(20)
- @ExcelProperty("飞行速度(m/s)")
- private BigDecimal flightSpeedMs;
- /**
- * 停留时长 （秒）
- */
- @ColumnWidth(20)
- @ExcelProperty(value = "停留时长(秒)")
- private String stayDuration;
- /**
- * 反制方式：信号干扰/诱导驱离/无
- */
- @ColumnWidth(20)
- @ExcelProperty(value = "反制方式：信号干扰/诱导驱离/无", converter = ExcelDictConverter.class)
- @ExcelDictItemLabel(type = "counterWay")
- @ExcelDictItem(type = "counterWay")
- private String counterWay;
- /**
- * 区域id ja_fw_area_divide
- */
- @ColumnWidth(20)
- @ExcelProperty("区域id ja_fw_area_divide")
- private String areaDivideId;
- /**
- * 场景id ja_fw_defense_scene.id
- */
- @ColumnWidth(20)
- @ExcelProperty("场景id ja_fw_defense_scene.id")
- private String defenseSceneId;
- /**
- * 区域编码
- */
- @ColumnWidth(20)
- @ExcelProperty("区域编码")
- private String areaCode;
+ @ExcelProperty("设备编号")
+ private String deviceSn;
+
}
--
Gitblit v1.9.3