From 19763ebd20ad16435f3c1ccfdc8abd1518712cc1 Mon Sep 17 00:00:00 2001
From: zhaowenyu <35589726@qq.com>
Date: Wed, 24 Dec 2025 15:09:58 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/dev' into dev
---
ard-admin/src/main/java/com/ard/web/controller/route/ArdRouteInfoController.java | 52 +++++++++++++++++++++++++++++++++++++++++++++++-----
1 files changed, 47 insertions(+), 5 deletions(-)
diff --git a/ard-admin/src/main/java/com/ard/web/controller/route/ArdRouteInfoController.java b/ard-admin/src/main/java/com/ard/web/controller/route/ArdRouteInfoController.java
index 09eb7de..2f4abf0 100644
--- a/ard-admin/src/main/java/com/ard/web/controller/route/ArdRouteInfoController.java
+++ b/ard-admin/src/main/java/com/ard/web/controller/route/ArdRouteInfoController.java
@@ -132,10 +132,52 @@
/**
* 上传航线到边缘服务器
*/
-// @ApiOperation("上传航线到边缘服务器")
-// @PostMapping
-// public AjaxResult uploadRouteInformation(@RequestBody ArdRouteInfo ArdRouteInfor) {
-// return success(ardRouteInfoService.selectArdRouteInforByName(ArdRouteInfor.getName()));
-// }
+ @ApiOperation("上传航线到边缘服务器")
+ @PostMapping("/uploadRouteToSixHe/{id}/{boxSn}")
+ public AjaxResult uploadRouteToSixHe(@PathVariable("id") String id,
+ @PathVariable("boxSn") String boxSn) {
+ return success(ardRouteInfoService.uploadRouteToSixHe(id,boxSn));
+ }
+
+ /**
+ * 开始航线
+ */
+ @ApiOperation("开始航线")
+ @PostMapping("/routeBegins/{id}/{boxSn}")
+ public AjaxResult routeBegins(@PathVariable("id") String id,
+ @PathVariable("boxSn") String boxSn) {
+ ardRouteInfoService.routeBegins(id,boxSn);
+ return AjaxResult.success();
+ }
+
+ /**
+ * 暂停航线
+ */
+ @ApiOperation("暂停航线")
+ @PostMapping("/routeSuspension/{boxSn}")
+ public AjaxResult routeSuspension(@PathVariable("boxSn") String boxSn) {
+ ardRouteInfoService.routeSuspension(boxSn);
+ return AjaxResult.success();
+ }
+
+ /**
+ * 恢复航线
+ */
+ @ApiOperation("恢复航线")
+ @PostMapping("/routeResumption/{boxSn}")
+ public AjaxResult routeResumption(@PathVariable("boxSn") String boxSn) {
+ ardRouteInfoService.routeResumption(boxSn);
+ return AjaxResult.success();
+ }
+
+ /**
+ * 结束航线
+ */
+ @ApiOperation("结束航线")
+ @PostMapping("/routeEnd/{boxSn}")
+ public AjaxResult routeEnd(@PathVariable("boxSn") String boxSn) {
+ ardRouteInfoService.routeEnd(boxSn);
+ return AjaxResult.success();
+ }
}
--
Gitblit v1.9.3