From 8d5b8a8c1909be6cdca5228a01bdc017b85a4078 Mon Sep 17 00:00:00 2001
From: rain <1679827795@qq.com>
Date: Wed, 21 Jan 2026 15:37:17 +0800
Subject: [PATCH] 处理Vo继承entity问题
---
drone-service/drone-fw/src/main/java/org/sxkj/fw/record/excel/FwDroneAlarmRecordExcel.java | 127 +++++++++++++++++++++++++++++++++++++++++-
1 files changed, 124 insertions(+), 3 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 6a0573b..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
@@ -17,20 +17,26 @@
package org.sxkj.fw.record.excel;
-import lombok.Data;
-
import com.alibaba.excel.annotation.ExcelProperty;
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.util.Date;
/**
* 无人机告警表 Excel实体类
*
* @author lw
- * @since 2026-01-07
+ * @since 2026-01-08
*/
@Data
@ColumnWidth(25)
@@ -40,5 +46,120 @@
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 droneSerialNo;
+ /**
+ * 无人机类型（微型机/植保机...）
+ */
+ @ColumnWidth(20)
+ @ExcelProperty( value = "无人机类型（微型机/植保机...）",converter = ExcelDictConverter.class)
+ @ExcelDictItemLabel(type = "droneType")
+ @ExcelDictItem(type = "droneType")
+ private String droneType;
+ /**
+ * 告警类型：实时告警/历史告警
+ */
+ @ColumnWidth(20)
+ @ExcelProperty("告警类型：实时告警/历史告警")
+ private String alarmType;
+ /**
+ * 告警时间
+ */
+ @ColumnWidth(20)
+ @ExcelProperty("告警时间")
+ @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
+ private Date alarmTime;
+ /**
+ * 触发原因
+ */
+ @ColumnWidth(20)
+ @ExcelProperty("触发原因")
+ private String triggerReason;
+ /**
+ * 飞行状态：侦测中/反制中
+ */
+ @ColumnWidth(20)
+ @ExcelProperty(value = "飞行状态：侦测中/反制中", converter = ExcelDictConverter.class)
+ @ExcelDictItemLabel(type = "flightStatus")
+ @ExcelDictItem(type = "flightStatus")
+ private String flightStatus;
+ /**
+ * 当前经度
+ */
+ @ColumnWidth(20)
+ @ExcelProperty("当前经度")
+ private Double longitude;
+ /**
+ * 当前纬度
+ */
+ @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;
}
--
Gitblit v1.9.3