From d81fdeef2ad2f7ecc548cebad6ab15455bf3da27 Mon Sep 17 00:00:00 2001
From: rain <167982779@qq.com>
Date: Tue, 30 Jul 2024 14:53:11 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/ht-dev' into ht-dev
---
src/main/java/com/dji/sample/media/controller/MediaController.java | 11 ++++++++---
1 files changed, 8 insertions(+), 3 deletions(-)
diff --git a/src/main/java/com/dji/sample/media/controller/MediaController.java b/src/main/java/com/dji/sample/media/controller/MediaController.java
index 3acd920..330e7f6 100644
--- a/src/main/java/com/dji/sample/media/controller/MediaController.java
+++ b/src/main/java/com/dji/sample/media/controller/MediaController.java
@@ -8,11 +8,14 @@
import com.dji.sample.media.model.param.SearchMediaParam;
import com.dji.sample.media.service.IMediaService;
import com.dji.sample.wayline.model.dto.WaylineJobDTO;
+import com.drew.imaging.ImageProcessingException;
import com.fasterxml.jackson.core.JsonProcessingException;
import lombok.extern.slf4j.Slf4j;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.web.bind.annotation.*;
+import java.awt.*;
+import java.io.IOException;
import java.util.List;
import java.util.Map;
import java.util.concurrent.ConcurrentHashMap;
@@ -33,6 +36,7 @@
/**
* Check if the file has been uploaded by the fingerprint.
* 检查文件是否已通过指纹上传。
+ *
* @param workspaceId
* @param file
* @return
@@ -48,19 +52,20 @@
/**
* When the file is uploaded to the storage server by pilot,
* the basic information of the file is reported through this interface.
+ *
* @param workspaceId
* @param file
* @return
*/
@PostMapping("/{workspace_id}/upload-callback")
- public ResponseResult<String> uploadCallback(@PathVariable(name = "workspace_id") String workspaceId, @RequestBody FileUploadDTO file) {
+ public ResponseResult<String> uploadCallback(@PathVariable(name = "workspace_id") String workspaceId, @RequestBody FileUploadDTO file) throws IOException, FontFormatException, ImageProcessingException {
mediaService.saveMediaFile(workspaceId, file);
return ResponseResult.success(file.getObjectKey());
-
}
/**
* Query the files that already exist in this workspace based on the workspace id and the collection of tiny fingerprints.
+ *
* @param workspaceId
* @param tinyFingerprints There is only one tiny_fingerprint parameter in the body.
* But it is not recommended to use Map to receive the parameter.
@@ -77,7 +82,7 @@
@GetMapping("/{workspace_id}/files/media_page")
public ResponseResult<PaginationData<MediaJobDTO>> mediaPage(
- @PathVariable(name = "workspace_id") String workspaceId, @RequestBody SearchMediaParam param) {
+ @PathVariable(name = "workspace_id") String workspaceId, @RequestBody SearchMediaParam param) {
PaginationData<MediaJobDTO> data = mediaService.mediaPage(workspaceId, param);
return ResponseResult.success(data);
--
Gitblit v1.9.3