From 75e6eea8cd3fac9cc888e2ffc9cdb126fab8429d Mon Sep 17 00:00:00 2001
From: rain <167982779@qq.com>
Date: Wed, 14 Aug 2024 15:45:55 +0800
Subject: [PATCH] 任务下发、更新、取消，优化图斑逻辑
---
src/main/java/com/dji/sample/wayline/plane/controller/CreateWayLineController.java | 21 ++++++++++-----------
1 files changed, 10 insertions(+), 11 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 fd31b92..27d0d52 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
@@ -53,15 +53,15 @@
CustomClaim customClaim = (CustomClaim) request.getAttribute(TOKEN_CLAIM);
String creator = customClaim.getUsername();
// 初始化模板对象
-// XMLTemplateModel xmlModel = XMLTemplateModel.initPolygon(param);
-//// 生成航线文件
-// CreateWaylineFileUtils.createWaylineFileByPolygon(xmlModel, patchesConfigPojo.getPlaneTemplate(), patchesConfigPojo.getPlaneTargetTemplate());
-// CreateWaylineFileUtils.createWaylineFileByPolygon(xmlModel, patchesConfigPojo.getPlaneWaylines(), patchesConfigPojo.getPlaneTargetWaylines());
-//// kmz、上传航线库
-// String destKMZFile = patchesConfigPojo.getPlaneKMZFile() + param.getWaylineName() + ".kmz"; // 输出的KMZ文件路径
-// ZipUtil.zipFolder(patchesConfigPojo.getSourceDir(), destKMZFile);
-// MultipartFile multipartFile = MultipartFileTOFileUtil.convert(new File(destKMZFile));
-// waylineFileService.importKmzFile(multipartFile, workspaceId, creator, null, "1");
+ XMLTemplateModel xmlModel = XMLTemplateModel.initPolygon(param);
+// 生成航线文件
+ CreateWaylineFileUtils.createWaylineFileByPolygon(xmlModel, patchesConfigPojo.getPlaneTemplate(), patchesConfigPojo.getPlaneTargetTemplate());
+ CreateWaylineFileUtils.createWaylineFileByPolygon(xmlModel, patchesConfigPojo.getPlaneWaylines(), patchesConfigPojo.getPlaneTargetWaylines());
+// kmz、上传航线库
+ String destKMZFile = patchesConfigPojo.getPlaneKMZFile() + param.getWaylineName() + ".kmz"; // 输出的KMZ文件路径
+ ZipUtil.zipFolder(patchesConfigPojo.getSourceDir(), destKMZFile);
+ MultipartFile multipartFile = MultipartFileTOFileUtil.convert(new File(destKMZFile));
+ waylineFileService.importKmzFile(multipartFile, workspaceId, creator, null, "1");
return ResponseResult.success();
}
@@ -70,11 +70,10 @@
@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();
-// 初始化模板对象
+// 初始化模板对象
XMLTemplateModel xmlModel = XMLTemplateModel.initPolygon(param);
// 生成航线文件
CreateWaylineFileUtils.createWaylineFileByPolygon(xmlModel, patchesConfigPojo.getPlaneTemplate(), patchesConfigPojo.getPlaneTargetTemplate());
--
Gitblit v1.9.3