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/service/IArdRouteInfoService.java | 54 +++++++++++++++++++++++++++++++++++++++++++++++++-----
1 files changed, 49 insertions(+), 5 deletions(-)
diff --git a/ard-route/src/main/java/com/ard/route/service/IArdRouteInfoService.java b/ard-route/src/main/java/com/ard/route/service/IArdRouteInfoService.java
index ea45b09..103ac9b 100644
--- a/ard-route/src/main/java/com/ard/route/service/IArdRouteInfoService.java
+++ b/ard-route/src/main/java/com/ard/route/service/IArdRouteInfoService.java
@@ -1,7 +1,11 @@
package com.ard.route.service;
+import com.ard.data.noflyzone.domain.Vertex;
import com.ard.oss.model.MinioUploadResult;
+import com.ard.route.domain.dto.ArdNoflyDto;
import com.ard.route.domain.route.ArdRouteInfo;
+import com.ard.route.domain.sixhe.ArdRouteChange;
+import com.ard.work.domain.dto.wayline.WayLineUploadDTO;
import org.springframework.web.multipart.MultipartFile;
import java.util.List;
@@ -82,18 +86,58 @@
* 修改航线分组ID
*
* @param id ID
- * @param GroupId 分组ID
+ * @param groupId 分组ID
* @return 结果
*/
- public int updateRouteInfomationGroupId(String id,String GroupId);
+ public int updateRouteInfomationGroupId(String id,String groupId);
/**
* 判断行点是否在禁飞区
*
- * @param longitude 经度
- * @param latitude 纬度
+ * @param ardNoflyDto 禁飞区DTO实体类
* @return 结果
*/
- public Boolean selectRouteInfomationNoFly(Double longitude, Double latitude);
+ public Boolean selectRouteInfomationNoFly(ArdNoflyDto ardNoflyDto);
+
+ /**
+ * 上传航线到边缘服务器
+ *
+ * @param id ID
+ * @param boxSn 云盒SN编号
+ * @return 结果
+ */
+ public Boolean uploadRouteToSixHe(String id, String boxSn);
+
+ /**
+ * 开始航线
+ *
+ * @param boxSn 云盒SN编号
+ * @return 结果
+ */
+ public Boolean routeBegins(String id, String boxSn);
+
+ /**
+ * 暂停航线
+ *
+ * @param boxSn 云盒SN编号
+ * @return 结果
+ */
+ public Boolean routeSuspension(String boxSn);
+
+ /**
+ * 恢复航线
+ *
+ * @param boxSn 云盒SN编号
+ * @return 结果
+ */
+ public Boolean routeResumption(String boxSn);
+
+ /**
+ * 结束航线
+ *
+ * @param boxSn 云盒SN编号
+ * @return 结果
+ */
+ public Boolean routeEnd(String boxSn);
}
--
Gitblit v1.9.3