From c00662a72ca1582c064a2bd76aa92fd22fbfedc6 Mon Sep 17 00:00:00 2001
From: rain <167982779@qq.com>
Date: Thu, 30 May 2024 13:53:07 +0800
Subject: [PATCH] 修改水印部分信息，添加图斑图片审核，大屏图斑图片添加水印
---
src/main/java/com/dji/sample/media/controller/FileController.java | 52 ++++++++++++++++++++++++++++++++--------------------
1 files changed, 32 insertions(+), 20 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 f750d05..3d75488 100644
--- a/src/main/java/com/dji/sample/media/controller/FileController.java
+++ b/src/main/java/com/dji/sample/media/controller/FileController.java
@@ -3,17 +3,21 @@
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.media.model.FileUploadDTO;
import com.dji.sample.media.model.MediaFileDTO;
import com.dji.sample.media.model.MediaFileEntity;
import com.dji.sample.media.model.MediaFileQueryParam;
import com.dji.sample.media.service.IFileService;
+import org.apache.ibatis.annotations.Update;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.web.bind.annotation.*;
import javax.servlet.http.HttpServletRequest;
import javax.servlet.http.HttpServletResponse;
+
import java.io.IOException;
import java.net.URL;
+import java.util.List;
import static com.dji.sample.component.AuthInterceptor.TOKEN_CLAIM;
@@ -32,21 +36,39 @@
/**
* Get information about all the media files in this workspace based on the workspace id.
* 根据工作空间id获取有关此工作空间中所有媒体文件的信息。
+ *
* @param workspaceId
* @return
*/
@GetMapping("/{workspace_id}/files")
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<MediaFileEntity> filesList = fileService.getMediaFilesPaginationByWorkspaceId(workspaceId, page, pageSize,mediaFileQueryParam);
+ @RequestParam(name = "page_size", defaultValue = "10") Long pageSize,
+ @PathVariable(name = "workspace_id") String workspaceId,
+ MediaFileQueryParam mediaFileQueryParam) {
+ PaginationData<MediaFileEntity> filesList = fileService.getMediaFilesPaginationByWorkspaceId(workspaceId, page, pageSize, mediaFileQueryParam);
return ResponseResult.success(filesList);
}
+ @GetMapping("/listAdded")
+ public ResponseResult listIsadd() {
+ List<MediaFileEntity> entityList = fileService.listByIsadd();
+ return ResponseResult.success(entityList);
+ }
+
+ @PutMapping("/examine")
+ public ResponseResult examineData(@RequestParam String fileId) {
+ int is = fileService.updateExamByFileId(fileId);
+ if (is != 0) {
+ return ResponseResult.success();
+ } else {
+ return ResponseResult.error("更新状态失败");
+ }
+
+ }
+
@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));
+ 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")
@@ -55,11 +77,12 @@
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){
+ int count = fileService.deleteMedia(workspaceId, fileId);
+ if (count == 0) {
return ResponseResult.error("删除失败");
}
return ResponseResult.success();
@@ -69,6 +92,7 @@
/**
* Query the download address of the file according to the media file id,
* and redirect to this address directly for download.
+ *
* @param workspaceId
* @param fileId
* @param response
@@ -84,16 +108,4 @@
e.printStackTrace();
}
}
-// @PostMapping("/{workspace_id}/files/download")
-// public ResponseResult<String> waterMarkFile(){
-// //获取media实体信息
-//
-// //对mediaUrl进行下载
-//
-// //对图片进行水印
-//
-// //将带有水印的图片存入本地
-//
-// //将链接返回
-// }
}
--
Gitblit v1.9.3