From 74d1c21ebb6b3b916904d95d13d289df23dcdedd Mon Sep 17 00:00:00 2001
From: rain <167982779@qq.com>
Date: Tue, 20 Aug 2024 18:06:46 +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 ea7fd8c..20bfd52 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
@@ -18,6 +18,7 @@
import org.springframework.web.multipart.MultipartFile;
import javax.servlet.http.HttpServletRequest;
+import javax.validation.Valid;
import java.io.File;
import java.io.IOException;
@@ -40,13 +41,13 @@
private MinioPojo pojo;
@PostMapping("/createPoints")
- public ResponseResult createPoints(@RequestBody CreateWaylineParam param) {
+ public ResponseResult createPoints(@RequestBody @Valid CreateWaylineParam param) {
return ResponseResult.success(PlaneCourseUtils.createWaylinePoints(param));
}
@PostMapping("/{workspace_id}/saveWayLineFile")
public ResponseResult saveWayLineFile(@PathVariable(name = "workspace_id") String workspaceId,
- @RequestBody CreateWaylineParam param,
+ @RequestBody @Valid CreateWaylineParam param,
HttpServletRequest request
) throws IOException {
CustomClaim customClaim = (CustomClaim) request.getAttribute(TOKEN_CLAIM);
@@ -60,7 +61,7 @@
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");
+ waylineFileService.importKmzFile(multipartFile, workspaceId, creator, null, "1",2);
return ResponseResult.success();
}
@@ -81,7 +82,7 @@
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, null, "1");
+ waylineFileService.importPlaneKmzFile(multipartFile, workspaceId, creator, null, "1",1);
return ResponseResult.success();
}
}
\ No newline at end of file
--
Gitblit v1.9.3