From 51a551a7f8eae7654f973d45cd2fa2952774673d Mon Sep 17 00:00:00 2001
From: linwei <872216696@qq.com>
Date: Fri, 07 Aug 2026 10:56:55 +0800
Subject: [PATCH] perf(task): 优化巡查任务审核性能并添加详细日志记录
---
drone-service/drone-fw/src/main/java/org/sxkj/fw/record/excel/FwDroneAlarmRecordExcel.java | 69 +++++++++++++++++++++++++++++++++-
1 files changed, 66 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..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
@@ -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)
@@ -41,4 +47,61 @@
private static final long serialVersionUID = 1L;
+ /**
+ * 无人机名称
+ */
+ @ColumnWidth(20)
+ @ExcelProperty("无人机名称")
+ private String droneName;
+ /**
+ * 无人机序列号
+ */
+ @ColumnWidth(20)
+ @ExcelProperty("序列号")
+ private String droneSerialNo;
+
+ /**
+ * 告警时间
+ */
+ @ColumnWidth(20)
+ @ExcelProperty("告警时间")
+ @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
+ private Date alarmTime;
+
+ @ColumnWidth(20)
+ @ExcelProperty("区域名称")
+ private String areaName;
+
+ /**
+ * 触发原因
+ */
+ @ColumnWidth(20)
+ @ExcelProperty("触发原因")
+ private String triggerReason;
+
+
+ @ColumnWidth(20)
+ @ExcelProperty("侦测反制设备")
+ private String deviceName;
+
+ /**
+ * 无人机类型（微型机/植保机...）
+ */
+ @ColumnWidth(20)
+ @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