From bb3652e04f5a66172d0a6cd6ec2535b82e7ca2ed Mon Sep 17 00:00:00 2001
From: rain <167982779@qq.com>
Date: Tue, 04 Jun 2024 17:19:51 +0800
Subject: [PATCH] 修改航线查询、添加方法，图斑查询方法。
---
src/main/java/com/dji/sample/wayline/controller/WaylineFileController.java | 25 +++++++++++++++++++++----
1 files changed, 21 insertions(+), 4 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 32f53ef..79f037e 100644
--- a/src/main/java/com/dji/sample/wayline/controller/WaylineFileController.java
+++ b/src/main/java/com/dji/sample/wayline/controller/WaylineFileController.java
@@ -3,13 +3,16 @@
import com.dji.sample.common.model.CustomClaim;
import com.dji.sample.common.model.PaginationData;
import com.dji.sample.common.model.ResponseResult;
+import com.dji.sample.common.util.MinioUrlUtils;
import com.dji.sample.log.aspect.SysLogAnnotation;
import com.dji.sample.wayline.model.dto.WaylineFileDTO;
import com.dji.sample.wayline.model.dto.WaylineFileUploadDTO;
import com.dji.sample.wayline.model.dto.WaylineListDTO;
+import com.dji.sample.wayline.model.entity.WaylineFileEntity;
import com.dji.sample.wayline.model.param.WaylineQueryParam;
import com.dji.sample.wayline.service.IWaylineFileService;
import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.beans.factory.annotation.Value;
import org.springframework.web.bind.annotation.*;
import org.springframework.web.multipart.MultipartFile;
@@ -78,7 +81,7 @@
try {
URL url = waylineFileService.getObjectUrl(workspaceId, waylineId);
- response.sendRedirect(url.toString());
+ response.sendRedirect(MinioUrlUtils.getUrl(url));
} catch (IOException | SQLException e) {
e.printStackTrace();
@@ -96,7 +99,7 @@
} catch (SQLException e) {
throw new RuntimeException(e);
}
- return ResponseResult.success(url);
+ return ResponseResult.success(MinioUrlUtils.getUrl(url));
}
/**
@@ -192,13 +195,15 @@
*/
@PostMapping("/{workspace_id}/waylines/file/upload")
@SysLogAnnotation(operModul = "航线库", operType = "上传", operDesc = "上传kmz航线文件")
- public ResponseResult importKmzFile(@PathVariable(name = "workspace_id") String workspaceId,HttpServletRequest request, MultipartFile file) {
+ public ResponseResult importKmzFile(@PathVariable(name = "workspace_id") String workspaceId,
+ HttpServletRequest request, MultipartFile file,
+ @RequestParam String patchesId) {
if (Objects.isNull(file)) {
return ResponseResult.error("未上传文件");
}
CustomClaim customClaim = (CustomClaim)request.getAttribute(TOKEN_CLAIM);
String creator = customClaim.getUsername();
- waylineFileService.importKmzFile(file, workspaceId, creator);
+ waylineFileService.importKmzFile(file, workspaceId, creator,patchesId);
return ResponseResult.success();
}
@@ -207,4 +212,16 @@
public ResponseResult<List<WaylineListDTO>> waylineList(@PathVariable(name = "workspace_id") String workspaceId,String droneName) {
return ResponseResult.success(waylineFileService.waylineList(workspaceId,droneName)) ;
}
+
+ @PutMapping("/{workspace_id}/wayline_update")
+ public ResponseResult upWayline(@RequestParam String waylineId,@RequestParam String name){
+ WaylineFileEntity entity=WaylineFileEntity
+ .builder()
+ .waylineId(waylineId)
+ .name(name)
+ .build();
+ if(waylineFileService.updateWayline(entity)==0){
+ return ResponseResult.error("更新失败");
+ }else return ResponseResult.success();
+ }
}
--
Gitblit v1.9.3