From 4e48664942bbefe70699ca43d25cbbd56ecc8daa Mon Sep 17 00:00:00 2001
From: xiebin <vip_xiaobin810@163.com>
Date: Mon, 19 Jan 2026 15:17:12 +0800
Subject: [PATCH] update-维修计划状态更新、新增定时器修改状态
---
drone-service/drone-fw/src/main/java/org/sxkj/fw/record/dto/FwDroneFlightRecordDTO.java | 64 +++++++++++++++++++++++++++++--
1 files changed, 59 insertions(+), 5 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 f5ee57b..db91633 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,19 +16,73 @@
*/
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;
/**
* 无人机飞行记录表 数据传输对象实体类
*
* @author lw
- * @since 2026-01-07
+ * @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 = "停留时长(秒)")
+ private String stayDuration;
+ /**
+ * 区域编码
+ */
+ @ApiModelProperty(value = "区域编码")
+ private String areaCode;
+
+ @ApiModelProperty(value = "开始时间")
+ private String startTime;
+
+ @ApiModelProperty(value = "结束时间")
+ private String endTime;
+
+ @ApiModelProperty(value = "设备类型")
+ private String deviceType;
+
+ @ApiModelProperty(value = "区域名称")
+ private String areaName;
+
}
--
Gitblit v1.9.3