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/dto/FwDroneFlightRecordDTO.java | 71 +++++++++++++++++++++++++++++++++--
1 files changed, 66 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..4dd0103 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,80 @@
*/
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;
+import java.io.Serializable;
+import java.util.List;
+
+import com.fasterxml.jackson.databind.annotation.JsonSerialize;
+import com.fasterxml.jackson.databind.ser.std.ToStringSerializer;
+import org.sxkj.fw.common.FwBaseInfo;
/**
* 无人机飞行记录表 数据传输对象实体类
*
* @author lw
- * @since 2026-01-07
+ * @since 2026-01-08
*/
@Data
-@EqualsAndHashCode(callSuper = true)
-public class FwDroneFlightRecordDTO extends FwDroneFlightRecordEntity {
+ public class FwDroneFlightRecordDTO extends FwBaseInfo implements Serializable {
private static final long serialVersionUID = 1L;
+ @ApiModelProperty("主键id")
+ @JsonSerialize(using = ToStringSerializer.class)
+ 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