From 94a6e4e4bc39153e64f8599e626475c4ce5bdb88 Mon Sep 17 00:00:00 2001
From: rain <167982779@qq.com>
Date: Tue, 16 Jul 2024 13:49:01 +0800
Subject: [PATCH] 修改喊话功能的重新喊话和音频展示接口,新增缩略图展示接口

---
 src/main/java/com/dji/sample/media/controller/FileController.java |   25 +++++++++++++++++++++----
 1 files changed, 21 insertions(+), 4 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 b034651..89feb4d 100644
--- a/src/main/java/com/dji/sample/media/controller/FileController.java
+++ b/src/main/java/com/dji/sample/media/controller/FileController.java
@@ -20,6 +20,7 @@
 import java.io.IOException;
 import java.net.URL;
 import java.util.List;
+import java.util.Objects;
 
 import static com.dji.sample.component.AuthInterceptor.TOKEN_CLAIM;
 
@@ -65,11 +66,12 @@
 
     @GetMapping("/getMediaInfo")
     public ResponseResult mediaInfo(@RequestParam String fileName) {
+
         Object info = fileService.mediaInfo(fileName);
-        if (info == null) {
-            return ResponseResult.error("图片正在解析中");
+        if (info!=null){
+            return ResponseResult.success(info);
         }
-        return ResponseResult.success(fileService.mediaInfo(fileName));
+        return ResponseResult.success("图片正在加载");
     }
 
     @GetMapping("/{workspace_id}/files/{job_id}")
@@ -89,7 +91,22 @@
                                        @RequestParam(required = false) String type
     ) {
 
-        return ResponseResult.success(fileService.MediaQuery(page, pageSize, updateStart, updateEnd, photoStart, photoEnd, jobName, workspaceId, type));
+        return ResponseResult.success(fileService.mediaQuery(page, pageSize, updateStart, updateEnd, photoStart, photoEnd, jobName, workspaceId, type));
+
+    }
+    @GetMapping("nailDataShow/{workspace_id}")
+    public ResponseResult getNailMeidaData(@PathVariable(name = "workspace_id") String workspaceId,
+                                       @RequestParam Integer page,
+                                       @RequestParam(name = "page_size", defaultValue = "10") Integer pageSize,
+                                       @RequestParam(name = "photoStart", required = false) Long updateStart,
+                                       @RequestParam(name = "photoEnd", required = false) Long updateEnd,
+                                       @RequestParam(name = "updateStart", required = false) Long photoStart,
+                                       @RequestParam(name = "updateEnd", required = false) Long photoEnd,
+                                       @RequestParam(name = "jobName", required = false) String jobName,
+                                       @RequestParam(required = false) String type
+    ) {
+
+        return ResponseResult.success(fileService.mediaNailQuery(page, pageSize, updateStart, updateEnd, photoStart, photoEnd, jobName, workspaceId, type));
 
     }
 

--
Gitblit v1.9.3