From 3f43e40ed1a1e9f66b3ad2862da9dbc4b710c712 Mon Sep 17 00:00:00 2001
From: nishiwei <13126973358@163.com>
Date: Fri, 23 Oct 2026 14:09:47 +0800
Subject: [PATCH] 智云3.0机场1适配内容提交
---
ard-work/src/main/java/com/ard/work/domain/entity/ArdFlightTask.java | 36 +++++++++++++++++++++++++++++++++---
1 files changed, 33 insertions(+), 3 deletions(-)
diff --git a/ard-work/src/main/java/com/ard/work/domain/entity/ArdFlightTask.java b/ard-work/src/main/java/com/ard/work/domain/entity/ArdFlightTask.java
index 8e4602b..fbbf3f4 100644
--- a/ard-work/src/main/java/com/ard/work/domain/entity/ArdFlightTask.java
+++ b/ard-work/src/main/java/com/ard/work/domain/entity/ArdFlightTask.java
@@ -1,12 +1,16 @@
package com.ard.work.domain.entity;
import com.ard.common.core.domain.BaseEntity;
-import lombok.Data;
+import com.fasterxml.jackson.annotation.JsonFormat;
+import lombok.*;
import java.util.Date;
-import java.util.List;
+@EqualsAndHashCode(callSuper = true)
@Data
+@Builder
+@AllArgsConstructor
+@NoArgsConstructor
public class ArdFlightTask extends BaseEntity {
private Integer taskId; // 任务ID
@@ -16,8 +20,34 @@
private Integer photoCount; // 图片数量
private Integer videoCount; // 录像数量
private String videoPath; // 视频路径
+ @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
private Date startTime; // 任务开始时间
+ @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
private Date endTime; // 任务结束时间
+ private Long duration; // 持续时长(单位:秒)
+ private Integer flightDuration; // 飞行时长(单位:秒)
+ private Integer flightMileage; // 飞行里程
+ private Float aveSpeed; // 平均速度
+ private Float maxSpeed; // 最大速度
private String serverId; // 服务器ID
- private List<ArdMedia> mediaList; // 媒体文件列表
+ private Integer flightMode; // 飞行模式(来自飞控遥测)
+ private String routeId; // 关联航线ID(ard_route_info.id),非空即为航线飞行
+
+ /**
+ * 判断是否为航线飞行
+ */
+ public boolean isRouteFlight() {
+ return routeId != null && !routeId.isEmpty();
+ }
+
+ // 计算持续时长,单位:秒
+ public Long getDuration() {
+ if (startTime != null && endTime != null) {
+ // 计算时间差(毫秒)
+ long durationMillis = endTime.getTime() - startTime.getTime();
+ // 将毫秒转换为秒
+ return durationMillis / 1000;
+ }
+ return null;
+ }
}
--
Gitblit v1.9.3