From d016b04e9beb8d1cb039188dd979d8805d9aa394 Mon Sep 17 00:00:00 2001
From: rain <167982779@qq.com>
Date: Tue, 02 Apr 2024 16:31:28 +0800
Subject: [PATCH] Waylinefile新增根据ID修改文件名称,workspace新增根据id查找信息

---
 src/main/java/com/dji/sample/wayline/controller/WaylineFileController.java |   19 +++++++++++++++++--
 1 files changed, 17 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 32f53ef..35c12e6 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));
     }
 
     /**
@@ -207,4 +210,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