From 82e4e5f6129be2e691138cd8b8ea3262e64943af Mon Sep 17 00:00:00 2001
From: rain <167982779@qq.com>
Date: Thu, 04 Jul 2024 15:54:19 +0800
Subject: [PATCH] 修改播放地址
---
src/main/java/com/dji/sample/wayline/controller/WaylineFileController.java | 34 ++++++++++++++++++++++++++++++----
1 files changed, 30 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 a241604..bb55f48 100644
--- a/src/main/java/com/dji/sample/wayline/controller/WaylineFileController.java
+++ b/src/main/java/com/dji/sample/wayline/controller/WaylineFileController.java
@@ -3,12 +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;
@@ -77,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();
@@ -95,7 +99,7 @@
} catch (SQLException e) {
throw new RuntimeException(e);
}
- return ResponseResult.success(url);
+ return ResponseResult.success(MinioUrlUtils.getUrl(url));
}
/**
@@ -191,13 +195,35 @@
*/
@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(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);
+ waylineFileService.importKmzFile(file, workspaceId, creator,patchesId,spotInFreckle);
return ResponseResult.success();
}
+
+ @GetMapping("/{workspace_id}/waylines_list")
+ @SysLogAnnotation(operModul = "航线库", operType = "查询", operDesc = "查询当前工作区航线库列表")
+ 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