From 249d316e0b8c79b71b779b5716bc488e1d08a9b3 Mon Sep 17 00:00:00 2001
From: aix <vip_xiaobin810@163.com>
Date: Tue, 30 Jul 2024 14:48:09 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/ht-dev' into ht-dev
---
src/main/java/com/dji/sample/wayline/plane/controller/CreateWayLineController.java | 9 +++++----
1 files changed, 5 insertions(+), 4 deletions(-)
diff --git a/src/main/java/com/dji/sample/wayline/plane/controller/CreateWayLineController.java b/src/main/java/com/dji/sample/wayline/plane/controller/CreateWayLineController.java
index 26f7ef8..88b3bc8 100644
--- a/src/main/java/com/dji/sample/wayline/plane/controller/CreateWayLineController.java
+++ b/src/main/java/com/dji/sample/wayline/plane/controller/CreateWayLineController.java
@@ -64,11 +64,13 @@
return ResponseResult.success();
}
- @PutMapping("/{workspace_id}/updateWayLineFile/{id}")
+ @PostMapping("/{workspace_id}/updateWayLineFile")
public ResponseResult updateWayLineFile(@PathVariable(name = "workspace_id") String workspaceId,
- @PathVariable(name = "id") String id,
@RequestBody CreateWaylineParam param,
HttpServletRequest request) throws IOException {
+ String kmz=param.getWaylineName()+".kmz";
+// 初始化模板对象
+ MinioFileDownloader.deleteFileFromMinio(pojo.getEndpoint(), pojo.getAccessKey(), pojo.getSecretKey(), pojo.getBucket(), kmz);
CustomClaim customClaim = (CustomClaim) request.getAttribute(TOKEN_CLAIM);
String creator = customClaim.getUsername();
// 初始化模板对象
@@ -76,12 +78,11 @@
// 生成航线文件
CreateWaylineFileUtils.createWaylineFileByPolygon(xmlModel, patchesConfigPojo.getPlaneTemplate(), patchesConfigPojo.getPlaneTargetTemplate());
CreateWaylineFileUtils.createWaylineFileByPolygon(xmlModel, patchesConfigPojo.getPlaneWaylines(), patchesConfigPojo.getPlaneTargetWaylines());
- MinioFileDownloader.deleteFileFromMinio(pojo.getEndpoint(), pojo.getAccessKey(), pojo.getSecretKey(), pojo.getBucket(), param.getWaylineName());
// kmz、上传航线库
String destKMZFile = patchesConfigPojo.getPlaneKMZFile() + param.getWaylineName() + ".kmz"; // 输出的KMZ文件路径
ZipUtil.zipFolder(patchesConfigPojo.getSourceDir(), destKMZFile);
MultipartFile multipartFile = MultipartFileTOFileUtil.convert(new File(destKMZFile));
- waylineFileService.importPlaneKmzFile(multipartFile, workspaceId, creator, param.getWaylineName(), id);
+ waylineFileService.importPlaneKmzFile(multipartFile, workspaceId, creator, null, "1");
return ResponseResult.success();
}
}
\ No newline at end of file
--
Gitblit v1.9.3