From c1915a7e947710572826a746e975e8d09516a0e7 Mon Sep 17 00:00:00 2001
From: rain <167982779@qq.com>
Date: Mon, 08 Apr 2024 16:29:58 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/ht-dev' into ht-dev
---
src/main/java/com/dji/sample/media/controller/FileController.java | 9 +++++++--
1 files changed, 7 insertions(+), 2 deletions(-)
diff --git a/src/main/java/com/dji/sample/media/controller/FileController.java b/src/main/java/com/dji/sample/media/controller/FileController.java
index e2daa1b..4834b0f 100644
--- a/src/main/java/com/dji/sample/media/controller/FileController.java
+++ b/src/main/java/com/dji/sample/media/controller/FileController.java
@@ -36,14 +36,19 @@
* @return
*/
@GetMapping("/{workspace_id}/files")
- public ResponseResult<PaginationData<MediaFileDTO>> getFilesList(@RequestParam(defaultValue = "1") Long page,
+ public ResponseResult<PaginationData<MediaFileEntity>> getFilesList(@RequestParam(defaultValue = "1") Long page,
@RequestParam(name = "page_size", defaultValue = "10") Long pageSize,
@PathVariable(name = "workspace_id") String workspaceId,
MediaFileQueryParam mediaFileQueryParam) {
- PaginationData<MediaFileDTO> filesList = fileService.getMediaFilesPaginationByWorkspaceId(workspaceId, page, pageSize,mediaFileQueryParam);
+ PaginationData<MediaFileEntity> filesList = fileService.getMediaFilesPaginationByWorkspaceId(workspaceId, page, pageSize,mediaFileQueryParam);
return ResponseResult.success(filesList);
}
+ @GetMapping("/{workspace_id}/files/{job_id}")
+ public ResponseResult findFilesList(@PathVariable(name = "workspace_id") String workspaceId,@PathVariable(name = "job_id") String jobId) {
+ return ResponseResult.success(fileService.listMediaFileEntity(workspaceId,jobId));
+ }
+
@PostMapping("/{workspace_id}/updateFile")
public ResponseResult updateFile(HttpServletRequest request, @PathVariable(name = "workspace_id") String workspaceId, @RequestBody MediaFileEntity mediaFileEntity) {
CustomClaim claims = (CustomClaim) request.getAttribute(TOKEN_CLAIM);
--
Gitblit v1.9.3