From 04de920362c9dcc1cc6077b54acba8eeff5090fd Mon Sep 17 00:00:00 2001
From: zhaowenyu <35589726@qq.com>
Date: Thu, 05 Feb 2026 14:09:03 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/dev' into dev
---
ard-route/src/main/java/com/ard/route/domain/route/ArdRouteInfo.java | 47 +++++++++++++++++++++++++++++++++++------------
1 files changed, 35 insertions(+), 12 deletions(-)
diff --git a/ard-route/src/main/java/com/ard/route/domain/route/ArdRouteInfo.java b/ard-route/src/main/java/com/ard/route/domain/route/ArdRouteInfo.java
index b8648a9..54fece0 100644
--- a/ard-route/src/main/java/com/ard/route/domain/route/ArdRouteInfo.java
+++ b/ard-route/src/main/java/com/ard/route/domain/route/ArdRouteInfo.java
@@ -1,9 +1,9 @@
package com.ard.route.domain.route;
-import com.ard.common.annotation.Excel;
import com.ard.common.core.domain.BaseEntity;
-import com.ard.route.domain.UavRouteReq;
+import com.ard.route.domain.djuav.UavRouteReq;
import lombok.Data;
+import lombok.EqualsAndHashCode;
/**
* 航线(kmz)对象 ard_route_info
@@ -11,6 +11,7 @@
* @author xia
* @date 2025-10-23
*/
+@EqualsAndHashCode(callSuper = true)
@Data
public class ArdRouteInfo extends BaseEntity {
@@ -20,32 +21,48 @@
private String id;
/** 文件名称 */
- @Excel(name = "文件名称")
private String name;
/** 文件路径 */
- @Excel(name = "文件路径")
private String path;
/** 分组ID */
- @Excel(name = "分组ID")
private String groupId;
- /** 航线类型 */
- @Excel(name = "航线类型")
+ /**
+ * 航线类型
+ * 1：逐点巡检
+ * 2：沿线巡检
+ * 3：巡检航线
+ * */
private String type;
/** 飞行器产品 */
- @Excel(name = "飞行器产品")
private String aircraft;
/** 负载类型 */
- @Excel(name = "负载类型")
private String payload;
- /** 是否导入 */
- @Excel(name = "是否导入")
- private String isImport;
+ /**
+ * 是否只读
+ * 0：否
+ * 1：是
+ */
+ private String readOnly;
+
+ /**
+ * 时间排序
+ * 0：正序
+ * 1：倒序
+ */
+ private String orderByTime;
+
+ /**
+ * 是否循环 isLoop
+ * 0：否
+ * 1：是
+ */
+ private String isLoop;
/**
* 生成kmz文件实体类
@@ -55,4 +72,10 @@
/** 航线数据 */
private byte[] routeData;
+ /** 行点总数 */
+ private Integer pointCount;
+
+ /** 航线任务ID */
+ private String missionId;
+
}
--
Gitblit v1.9.3