From 4fa212add5bb7689331e9e070c802bfcb5dcafa2 Mon Sep 17 00:00:00 2001
From: rain <1679827795@qq.com>
Date: Mon, 02 Feb 2026 17:21:07 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
drone-service/drone-fw/src/main/java/org/sxkj/fw/record/dto/FwDroneFlightRecordDTO.java | 34 ++++++++++++++++++++++++++++++----
1 files changed, 30 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 de7edec..2d2d594 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
@@ -22,6 +22,11 @@
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;
/**
* 无人机飞行记录表 数据传输对象实体类
@@ -30,10 +35,11 @@
* @since 2026-01-08
*/
@Data
- public class FwDroneFlightRecordDTO {
+ public class FwDroneFlightRecordDTO implements Serializable {
private static final long serialVersionUID = 1L;
@ApiModelProperty("主键id")
+ @JsonSerialize(using = ToStringSerializer.class)
private Long id;
/**
@@ -65,13 +71,33 @@
/**
* 停留时长(HH:MM:SS)
*/
- @ApiModelProperty(value = "停留时长(HH:MM:SS)")
- @JsonFormat(pattern = "HH:mm:ss")
- private LocalTime stayDuration;
+ @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;
+
+ @ApiModelProperty(value = "部门集合",hidden = true)
+ private List<Long> deptList;
+
+ @ApiModelProperty(value = "部门id",hidden = true)
+ private String currentDeptId;
+ // setRegionName
+ @ApiModelProperty(value = "区域名称",hidden = true)
+ private String regionName;
+
}
--
Gitblit v1.9.3