From b35dd737c03ee80d45753939ade49a59f556197f Mon Sep 17 00:00:00 2001
From: rain <167982779@qq.com>
Date: Wed, 22 May 2024 16:45:41 +0800
Subject: [PATCH] 航线问题修复，水印格式修改，图斑图片加水印
---
src/main/java/com/dji/sample/media/controller/FileController.java | 24 ++++++++++++++++++++++--
1 files changed, 22 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 e0545b7..f750d05 100644
--- a/src/main/java/com/dji/sample/media/controller/FileController.java
+++ b/src/main/java/com/dji/sample/media/controller/FileController.java
@@ -36,11 +36,11 @@
* @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);
}
@@ -55,7 +55,15 @@
mediaFileEntity.setUserId(claims.getId());
return ResponseResult.success(fileService.updateMediaFile(workspaceId, mediaFileEntity));
}
+ @DeleteMapping("/{workspace_id}/deleteFile")
+ public ResponseResult deleteFile(@PathVariable(name = "workspace_id") String workspaceId, @RequestParam String fileId) {
+ int count=fileService.deleteMedia(workspaceId, fileId);
+ if(count==0){
+ return ResponseResult.error("删除失败");
+ }
+ return ResponseResult.success();
+ }
/**
@@ -76,4 +84,16 @@
e.printStackTrace();
}
}
+// @PostMapping("/{workspace_id}/files/download")
+// public ResponseResult<String> waterMarkFile(){
+// //获取media实体信息
+//
+// //对mediaUrl进行下载
+//
+// //对图片进行水印
+//
+// //将带有水印的图片存入本地
+//
+// //将链接返回
+// }
}
--
Gitblit v1.9.3