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/FwDroneAlarmRecordDTO.java |  106 +++++++++++++++++++++++++++++++++++++++++++++++++++--
 1 files changed, 102 insertions(+), 4 deletions(-)

diff --git a/drone-service/drone-fw/src/main/java/org/sxkj/fw/record/dto/FwDroneAlarmRecordDTO.java b/drone-service/drone-fw/src/main/java/org/sxkj/fw/record/dto/FwDroneAlarmRecordDTO.java
index 8944a93..91c51e2 100644
--- a/drone-service/drone-fw/src/main/java/org/sxkj/fw/record/dto/FwDroneAlarmRecordDTO.java
+++ b/drone-service/drone-fw/src/main/java/org/sxkj/fw/record/dto/FwDroneAlarmRecordDTO.java
@@ -16,9 +16,15 @@
  */
 package org.sxkj.fw.record.dto;
 
-import org.sxkj.fw.record.entity.FwDroneAlarmRecordEntity;
+import com.baomidou.mybatisplus.annotation.IdType;
+import com.baomidou.mybatisplus.annotation.TableId;
+import com.fasterxml.jackson.annotation.JsonFormat;
+import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
-import lombok.EqualsAndHashCode;
+
+import java.math.BigDecimal;
+import java.time.LocalTime;
+import java.util.Date;
 
 /**
  * 无人机告警表 数据传输对象实体类
@@ -27,8 +33,100 @@
  * @since 2026-01-08
  */
 @Data
-@EqualsAndHashCode(callSuper = true)
-public class FwDroneAlarmRecordDTO extends FwDroneAlarmRecordEntity {
+public class FwDroneAlarmRecordDTO {
 	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 droneSerialNo;
+	/**
+	 * 无人机类型(微型机/植保机...)
+	 */
+	@ApiModelProperty(value = "无人机类型(微型机/植保机...)")
+	private String droneType;
+	/**
+	 * 告警类型:实时告警/历史告警
+	 */
+	@ApiModelProperty(value = "告警类型:实时告警/历史告警")
+	private String alarmType;
+	/**
+	 * 告警时间
+	 */
+	@ApiModelProperty(value = "告警时间")
+	@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
+	private Date alarmTime;
+	/**
+	 * 触发原因
+	 */
+	@ApiModelProperty(value = "触发原因")
+	private String triggerReason;
+	/**
+	 * 飞行状态:侦测中/反制中
+	 */
+	@ApiModelProperty(value = "飞行状态:侦测中/反制中")
+	private String flightStatus;
+	/**
+	 * 当前经度
+	 */
+	@ApiModelProperty(value = "当前经度")
+	private Double longitude;
+	/**
+	 * 当前纬度
+	 */
+	@ApiModelProperty(value = "当前纬度")
+	private Double latitude;
+	/**
+	 * 信号频段(MHz)
+	 */
+	@ApiModelProperty(value = "信号频段(MHz)")
+	private Integer signalFreqMhz;
+	/**
+	 * 飞行高度(m)
+	 */
+	@ApiModelProperty(value = "飞行高度(m)")
+	private Integer flightHeightM;
+	/**
+	 * 飞行速度(m/s)
+	 */
+	@ApiModelProperty(value = "飞行速度(m/s)")
+	private BigDecimal flightSpeedMs;
+	/**
+	 * 停留时长(秒)
+	 */
+	@ApiModelProperty(value = "停留时长 (秒) ")
+ 	private String stayDuration;
+	/**
+	 * 反制方式:信号干扰/诱导驱离/无
+	 */
+	@ApiModelProperty(value = "反制方式:信号干扰/诱导驱离/无")
+	private String counterWay;
+	/**
+	 * 区域id ja_fw_area_divide
+	 */
+	@ApiModelProperty(value = "区域id ja_fw_area_divide")
+	private String areaDivideId;
+	/**
+	 * 场景id ja_fw_defense_scene.id
+	 */
+	@ApiModelProperty(value = "场景id ja_fw_defense_scene.id")
+	private String defenseSceneId;
+	/**
+	 * 区域编码
+	 */
+	@ApiModelProperty(value = "区域编码")
+	private String areaCode;
 }

--
Gitblit v1.9.3