From 3339af3ec5d084083d27ac03f978687ad026b0a5 Mon Sep 17 00:00:00 2001
From: zhaowenyu <35589726@qq.com>
Date: Mon, 09 Mar 2026 11:19:44 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/dev' into dev
---
ard-route/src/main/java/com/ard/route/domain/route/ArdRouteInfo.java | 46 ++++++++++++++++++++++++++++------------------
1 files changed, 28 insertions(+), 18 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 b2746ad..24ad7b9 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,10 +1,13 @@
package com.ard.route.domain.route;
-import com.ard.common.annotation.Excel;
import com.ard.common.core.domain.BaseEntity;
+import com.ard.inspection.domain.ArdPointCloud;
import com.ard.route.domain.djuav.UavRouteReq;
import lombok.Data;
import lombok.EqualsAndHashCode;
+
+import java.io.Serializable;
+import java.util.List;
/**
* 航线(kmz)对象 ard_route_info
@@ -14,47 +17,39 @@
*/
@EqualsAndHashCode(callSuper = true)
@Data
-public class ArdRouteInfo extends BaseEntity {
-
- private static final long serialVersionUID = 1L;
+public class ArdRouteInfo extends BaseEntity implements Serializable{
/** ID */
private String id;
/** 文件名称 */
- @Excel(name = "文件名称")
private String name;
/** 文件路径 */
- @Excel(name = "文件路径")
private String path;
-// /** 文件路径1 */
-// @Excel(name = "文件路径1")
-// private String path1;
-
/** 分组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;
/**
- * 是否只读 是否只读
+ * 是否只读
* 0：否
* 1：是
*/
- @Excel(name = "是否只读")
private String readOnly;
/**
@@ -62,8 +57,14 @@
* 0：正序
* 1：倒序
*/
- @Excel(name = "时间排序")
private String orderByTime;
+
+ /**
+ * 是否循环 isLoop
+ * 0：否
+ * 1：是
+ */
+ private String isLoop;
/**
* 生成kmz文件实体类
@@ -73,7 +74,16 @@
/** 航线数据 */
private byte[] routeData;
+ /** 点云数据 */
+ private byte[] cloudData;
+
/** 行点总数 */
private Integer pointCount;
+ /** 航线任务ID */
+ private String missionId;
+
+ /** 点云数据 */
+ private List<ArdPointCloud> ardPointCloudList;
+
}
--
Gitblit v1.9.3