From 777eeea75ffc628d024ded81f19deff78f4f42af Mon Sep 17 00:00:00 2001
From: linwei <872216696@qq.com>
Date: Thu, 08 Jan 2026 16:18:41 +0800
Subject: [PATCH] 报警记录导出
---
drone-service/drone-fw/src/main/java/org/sxkj/fw/record/excel/FwDroneAlarmRecordExcel.java | 30 +++++++++++++++++-------------
1 files changed, 17 insertions(+), 13 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 b5bc030..a2d87d3 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
@@ -21,11 +21,14 @@
import com.alibaba.excel.annotation.write.style.ColumnWidth;
import com.alibaba.excel.annotation.write.style.ContentRowHeight;
import com.alibaba.excel.annotation.write.style.HeadRowHeight;
+import com.fasterxml.jackson.annotation.JsonFormat;
import lombok.Data;
+import org.sxkj.fw.utils.excel.ExcelDictConverter;
+import org.sxkj.fw.utils.excel.ExcelDictItem;
+import org.sxkj.fw.utils.excel.ExcelDictItemLabel;
import java.io.Serializable;
import java.math.BigDecimal;
-import java.time.LocalTime;
import java.util.Date;
@@ -65,7 +68,9 @@
* 无人机类型（微型机/植保机...）
*/
@ColumnWidth(20)
- @ExcelProperty("无人机类型（微型机/植保机...）")
+ @ExcelProperty( value = "无人机类型（微型机/植保机...）",converter = ExcelDictConverter.class)
+ @ExcelDictItemLabel(type = "droneType")
+ @ExcelDictItem(type = "droneType")
private String droneType;
/**
* 告警类型：实时告警/历史告警
@@ -78,6 +83,7 @@
*/
@ColumnWidth(20)
@ExcelProperty("告警时间")
+ @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
private Date alarmTime;
/**
* 触发原因
@@ -89,7 +95,9 @@
* 飞行状态：侦测中/反制中
*/
@ColumnWidth(20)
- @ExcelProperty("飞行状态：侦测中/反制中")
+ @ExcelProperty(value = "飞行状态：侦测中/反制中", converter = ExcelDictConverter.class)
+ @ExcelDictItemLabel(type = "flightStatus")
+ @ExcelDictItem(type = "flightStatus")
private String flightStatus;
/**
* 当前经度
@@ -122,16 +130,18 @@
@ExcelProperty("飞行速度(m/s)")
private BigDecimal flightSpeedMs;
/**
- * 停留时长 HH:MM:SS
+ * 停留时长 （秒）
*/
@ColumnWidth(20)
- @ExcelProperty("停留时长 HH:MM:SS")
- private LocalTime stayDuration;
+ @ExcelProperty(value = "停留时长(秒)")
+ private String stayDuration;
/**
* 反制方式：信号干扰/诱导驱离/无
*/
@ColumnWidth(20)
- @ExcelProperty("反制方式：信号干扰/诱导驱离/无")
+ @ExcelProperty(value = "反制方式：信号干扰/诱导驱离/无", converter = ExcelDictConverter.class)
+ @ExcelDictItemLabel(type = "counterWay")
+ @ExcelDictItem(type = "counterWay")
private String counterWay;
/**
* 区域id ja_fw_area_divide
@@ -151,11 +161,5 @@
@ColumnWidth(20)
@ExcelProperty("区域编码")
private String areaCode;
- /**
- * 删除标志（0存在 1删除）
- */
- @ColumnWidth(20)
- @ExcelProperty("删除标志（0存在 1删除）")
- private Byte isDeleted;
}
--
Gitblit v1.9.3