From 82a90f791678dddbc6e1b98ee9e8028b61a38dfe Mon Sep 17 00:00:00 2001
From: rain <167982779@qq.com>
Date: Tue, 02 Jul 2024 19:17:13 +0800
Subject: [PATCH] 修改环境冲突
---
src/main/java/com/dji/sample/wayline/controller/WaylineFileController.java | 6 ++++--
1 files changed, 4 insertions(+), 2 deletions(-)
diff --git a/src/main/java/com/dji/sample/wayline/controller/WaylineFileController.java b/src/main/java/com/dji/sample/wayline/controller/WaylineFileController.java
index 79f037e..bb55f48 100644
--- a/src/main/java/com/dji/sample/wayline/controller/WaylineFileController.java
+++ b/src/main/java/com/dji/sample/wayline/controller/WaylineFileController.java
@@ -197,13 +197,15 @@
@SysLogAnnotation(operModul = "航线库", operType = "上传", operDesc = "上传kmz航线文件")
public ResponseResult importKmzFile(@PathVariable(name = "workspace_id") String workspaceId,
HttpServletRequest request, MultipartFile file,
- @RequestParam String patchesId) {
+ @RequestParam(required = false) String patchesId,
+ @RequestParam(required = false) String spotInFreckle
+ ) {
if (Objects.isNull(file)) {
return ResponseResult.error("未上传文件");
}
CustomClaim customClaim = (CustomClaim)request.getAttribute(TOKEN_CLAIM);
String creator = customClaim.getUsername();
- waylineFileService.importKmzFile(file, workspaceId, creator,patchesId);
+ waylineFileService.importKmzFile(file, workspaceId, creator,patchesId,spotInFreckle);
return ResponseResult.success();
}
--
Gitblit v1.9.3