From 86384846e317381e7bb9e31ee76760e4ecb3ee67 Mon Sep 17 00:00:00 2001
From: rain <167982779@qq.com>
Date: Mon, 29 Jul 2024 11:49:57 +0800
Subject: [PATCH] 新增2m压缩图，修改喇叭功能，修改面状航线的修改接口
---
src/main/java/com/dji/sample/wayline/plane/controller/CreateWayLineController.java | 11 ++++++++---
1 files changed, 8 insertions(+), 3 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 d52356e..26f7ef8 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
@@ -2,6 +2,8 @@
import com.dji.sample.common.model.CustomClaim;
import com.dji.sample.common.model.ResponseResult;
+import com.dji.sample.media.model.MinioPojo;
+import com.dji.sample.media.util.MinioFileDownloader;
import com.dji.sample.patches.config.pojo.PatchesConfigPojo;
import com.dji.sample.patches.utils.MultipartFileTOFileUtil;
import com.dji.sample.patches.utils.TimerUtil;
@@ -33,6 +35,9 @@
private PatchesConfigPojo patchesConfigPojo;
@Autowired
private IWaylineFileService waylineFileService;
+
+ @Autowired
+ private MinioPojo pojo;
@PostMapping("/createPoints")
public ResponseResult createPoints(@RequestBody CreateWaylineParam param) {
@@ -66,17 +71,17 @@
HttpServletRequest request) throws IOException {
CustomClaim customClaim = (CustomClaim) request.getAttribute(TOKEN_CLAIM);
String creator = customClaim.getUsername();
- String newName = param.getWaylineName() + TimerUtil.getNowDay();
// 初始化模板对象
XMLTemplateModel xmlModel = XMLTemplateModel.initPolygon(param);
// 生成航线文件
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() + newName + ".kmz"; // 输出的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, newName, id);
+ waylineFileService.importPlaneKmzFile(multipartFile, workspaceId, creator, param.getWaylineName(), id);
return ResponseResult.success();
}
}
\ No newline at end of file
--
Gitblit v1.9.3