From 1050a0dbace06b1510d53de5baedfc0ca07c8d71 Mon Sep 17 00:00:00 2001
From: zhaowenyu <35589726@qq.com>
Date: Mon, 02 Mar 2026 08:26:19 +0800
Subject: [PATCH] 2026-03-02 优化航线轨迹，没有任务的情况下，不记录轨迹信息
---
ard-work/src/main/java/com/ard/work/domain/entity/ArdDroneInfo.java | 74 +++++++++++++++++++++++-------------
1 files changed, 47 insertions(+), 27 deletions(-)
diff --git a/ard-work/src/main/java/com/ard/work/domain/entity/ArdDroneInfo.java b/ard-work/src/main/java/com/ard/work/domain/entity/ArdDroneInfo.java
index 9aa97bf..4237158 100644
--- a/ard-work/src/main/java/com/ard/work/domain/entity/ArdDroneInfo.java
+++ b/ard-work/src/main/java/com/ard/work/domain/entity/ArdDroneInfo.java
@@ -3,73 +3,99 @@
import com.ard.common.annotation.Excel;
import com.ard.common.core.domain.BaseEntity;
import com.ard.work.domain.receiver.BoxInfoReceiver;
-import com.fasterxml.jackson.annotation.JsonProperty;
+import com.fasterxml.jackson.annotation.JsonFormat;
import lombok.*;
import java.util.Date;
import java.util.Objects;
/**
- * 无人机盒子对象 uav_box
- *
- * @author ruoyi
+ * 无人机盒子对象 ard_drone
+ *
+ * @author ard
* @date 2025-03-04
*/
-
@Data
@Builder
@AllArgsConstructor
@NoArgsConstructor
-public class ArdDroneInfo extends BaseEntity{
+@EqualsAndHashCode(callSuper = false)
+public class ArdDroneInfo extends BaseEntity {
private static final long serialVersionUID = 1L;
- /** 主键 */
+ /**
+ * 主键
+ */
private String id;
- /** 盒子编码 */
+ /**
+ * 盒子编码
+ */
@Excel(name = "盒子编码")
private String boxSn;
- /** 盒子名称 */
+ /**
+ * 盒子名称
+ */
@Excel(name = "盒子名称")
private String boxName;
- /** 盒子版本 */
+ /**
+ * 盒子版本
+ */
@Excel(name = "盒子版本")
private String boxVersion;
- /** 启动时间 */
+ /**
+ * 启动时间
+ */
+ @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
@Excel(name = "启动时间")
private Date startTime;
- /** 在线状态 */
+ /**
+ * 在线状态
+ */
@Excel(name = "在线状态")
private Integer onLine;
- /** 视频服务器地址 */
+ /**
+ * 视频服务器地址
+ */
@Excel(name = "视频服务器地址")
private String videoServer;
- /** 视频服务器端口 */
+ /**
+ * 视频服务器端口
+ */
@Excel(name = "视频服务器端口")
private Integer videoPort;
- /** 最后任务id */
+ /**
+ * 最后任务id
+ */
@Excel(name = "最后任务id")
private Integer lastTaskId;
- /** 用户ID */
+ /**
+ * 用户ID
+ */
@Excel(name = "用户ID")
private Long userId;
- /** 部门ID */
+ /**
+ * 部门ID
+ */
@Excel(name = "部门ID")
private Long deptId;
- /** 服务器管理ID */
+ /**
+ * 服务器管理ID
+ */
@Excel(name = "服务器管理ID")
- private String serverInfoId;
+ private String serverId;
+
/**
* 服务器实体对象
@@ -77,14 +103,8 @@
private ArdServerInfo ardServerInfo;
/**
- * 判断两个无人机对象的属性是否相同
+ * 无人机直播地址
*/
- public boolean isSameAs(BoxInfoReceiver other) {
- return Objects.equals(this.boxName, other.getBoxName()) &&
- Objects.equals(this.boxVersion, other.getBoxVersion()) &&
- Objects.equals(this.lastTaskId, other.getLastTaskId()) &&
- Objects.equals(this.onLine, other.getOnLine());
- // 对比其他属性
- }
+ private String webrtcUrl;
}
--
Gitblit v1.9.3