From 35c8aca3b8107ee2a4fbb5790ce1eeb70f4bb461 Mon Sep 17 00:00:00 2001
From: rain <167982779@qq.com>
Date: Fri, 22 Mar 2024 18:15:43 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/ht-dev' into ht-dev
---
src/main/java/com/dji/sample/wayline/controller/WaylineFileController.java | 10 ++++++----
1 files changed, 6 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 0544e71..5ceaab9 100644
--- a/src/main/java/com/dji/sample/wayline/controller/WaylineFileController.java
+++ b/src/main/java/com/dji/sample/wayline/controller/WaylineFileController.java
@@ -3,6 +3,7 @@
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;
@@ -10,6 +11,7 @@
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 +80,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 +98,7 @@
} catch (SQLException e) {
throw new RuntimeException(e);
}
- return ResponseResult.success(url);
+ return ResponseResult.success(MinioUrlUtils.getUrl(url));
}
/**
@@ -204,7 +206,7 @@
@GetMapping("/{workspace_id}/waylines_list")
@SysLogAnnotation(operModul = "航线库", operType = "查询", operDesc = "查询当前工作区航线库列表")
- public ResponseResult<List<WaylineListDTO>> waylineList(@PathVariable(name = "workspace_id") String workspaceId) {
- return ResponseResult.success(waylineFileService.waylineList(workspaceId)) ;
+ public ResponseResult<List<WaylineListDTO>> waylineList(@PathVariable(name = "workspace_id") String workspaceId,String droneName) {
+ return ResponseResult.success(waylineFileService.waylineList(workspaceId,droneName)) ;
}
}
--
Gitblit v1.9.3