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/dto/FwDroneFlightRecordDTO.java |   51 +++++++++++++++++++++++++++++++++++++++++++++++----
 1 files changed, 47 insertions(+), 4 deletions(-)

diff --git a/drone-service/drone-fw/src/main/java/org/sxkj/fw/record/dto/FwDroneFlightRecordDTO.java b/drone-service/drone-fw/src/main/java/org/sxkj/fw/record/dto/FwDroneFlightRecordDTO.java
index 3ac46b8..de7edec 100644
--- a/drone-service/drone-fw/src/main/java/org/sxkj/fw/record/dto/FwDroneFlightRecordDTO.java
+++ b/drone-service/drone-fw/src/main/java/org/sxkj/fw/record/dto/FwDroneFlightRecordDTO.java
@@ -16,9 +16,12 @@
  */
 package org.sxkj.fw.record.dto;
 
-import org.sxkj.fw.record.entity.FwDroneFlightRecordEntity;
+import com.fasterxml.jackson.annotation.JsonFormat;
+import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
-import lombok.EqualsAndHashCode;
+
+import java.time.LocalTime;
+import java.util.Date;
 
 /**
  * 无人机飞行记录表 数据传输对象实体类
@@ -27,8 +30,48 @@
  * @since 2026-01-08
  */
 @Data
-@EqualsAndHashCode(callSuper = true)
-public class FwDroneFlightRecordDTO extends FwDroneFlightRecordEntity {
+ public class FwDroneFlightRecordDTO  {
 	private static final long serialVersionUID = 1L;
 
+	@ApiModelProperty("主键id")
+	private Long id;
+
+	/**
+	 * 反无设备ID(关联ja_fw_device.id)
+	 */
+	@ApiModelProperty(value = "反无设备ID(关联ja_fw_device.id)")
+	private Long deviceId;
+	/**
+	 * 无人机名称
+	 */
+	@ApiModelProperty(value = "无人机名称")
+	private String droneName;
+	/**
+	 * 序列号
+	 */
+	@ApiModelProperty(value = "序列号")
+	private String serialNo;
+	/**
+	 * 首次告警时间
+	 */
+	@ApiModelProperty(value = "首次告警时间")
+	@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
+	private Date alarmTime;
+	/**
+	 * 触发原因/类型
+	 */
+	@ApiModelProperty(value = "触发原因/类型")
+	private String triggerType;
+	/**
+	 * 停留时长(HH:MM:SS)
+	 */
+	@ApiModelProperty(value = "停留时长(HH:MM:SS)")
+	@JsonFormat(pattern = "HH:mm:ss")
+	private LocalTime stayDuration;
+	/**
+	 * 区域编码
+	 */
+	@ApiModelProperty(value = "区域编码")
+	private String areaCode;
+
 }

--
Gitblit v1.9.3