From e90d0fe42b652c9230c5e544d177dbedb3e57580 Mon Sep 17 00:00:00 2001
From: zhaowenyu <35589726@qq.com>
Date: Wed, 19 Nov 2025 13:51:26 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/dev' into dev
---
ard-work/src/main/java/com/ard/work/domain/entity/ArdFlightTask.java | 23 ++++++++++++++++++++---
1 files changed, 20 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..62a8d23 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,21 @@
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 String serverId; // 服务器ID
- private List<ArdMedia> mediaList; // 媒体文件列表
+
+ // 计算持续时长，单位：秒
+ public Long getDuration() {
+ if (startTime != null && endTime != null) {
+ // 计算时间差（毫秒）
+ long durationMillis = endTime.getTime() - startTime.getTime();
+ // 将毫秒转换为秒
+ return durationMillis / 1000;
+ }
+ return null;
+ }
}
--
Gitblit v1.9.3