From e90d0fe42b652c9230c5e544d177dbedb3e57580 Mon Sep 17 00:00:00 2001
From: zhaowenyu <35589726@qq.com>
Date: Wed, 19 Nov 2025 13:51:26 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/dev' into dev
---
ard-admin/src/main/java/com/ard/web/controller/route/UavRouteController.java | 22 +++++++++++++++++-----
1 files changed, 17 insertions(+), 5 deletions(-)
diff --git a/ard-admin/src/main/java/com/ard/web/controller/route/UavRouteController.java b/ard-admin/src/main/java/com/ard/web/controller/route/UavRouteController.java
index 150ada9..24c0144 100644
--- a/ard-admin/src/main/java/com/ard/web/controller/route/UavRouteController.java
+++ b/ard-admin/src/main/java/com/ard/web/controller/route/UavRouteController.java
@@ -1,7 +1,7 @@
package com.ard.web.controller.route;
import com.ard.common.core.domain.AjaxResult;
-import com.ard.route.domain.UavRouteReq;
+import com.ard.route.domain.djuav.UavRouteReq;
import com.ard.route.service.UavRouteService;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiOperation;
@@ -25,9 +25,10 @@
*/
@ApiOperation("编辑kmz文件")
@PreAuthorize("@ss.hasPermi('route:kmz:updateKmz')")
- @PostMapping("/updateKmz")
- public AjaxResult updateKmz(@RequestBody UavRouteReq uavRouteReq) {
- return success(routeService.updateKmz(uavRouteReq));
+ @PostMapping("/updateKmz/{fileName}")
+ public AjaxResult updateKmz(@RequestBody UavRouteReq uavRouteReq,
+ @PathVariable("fileName") String fileName){
+ return success(routeService.updateKmz(uavRouteReq,fileName));
}
/**
@@ -36,9 +37,20 @@
@ApiOperation("生成kmz文件")
@PreAuthorize("@ss.hasPermi('route:kmz:buildKmz')")
@PostMapping("/buildKmz/{fileName}")
- public AjaxResult buildKmz(@RequestBody UavRouteReq uavRouteReq,@PathVariable("fileName") String fileName){
+ public AjaxResult buildKmz(@RequestBody UavRouteReq uavRouteReq,
+ @PathVariable("fileName") String fileName){
return success(routeService.buildKmz(uavRouteReq,fileName));
}
+ /**
+ * 解析kmz文件
+ */
+ @ApiOperation("解析kmz文件")
+ @PreAuthorize("@ss.hasPermi('route:kmz:parseKmz')")
+ @PostMapping("/parseKmz")
+ public AjaxResult parseKmz(@RequestParam("fileUrl") String fileUrl){
+ return success(routeService.parseKmz(fileUrl));
+ }
+
}
--
Gitblit v1.9.3