From 256ed3d2cfab96d000e315cc76663a7b728f17d4 Mon Sep 17 00:00:00 2001
From: aix <vip_xiaobin810@163.com>
Date: Thu, 01 Aug 2024 15:35:47 +0800
Subject: [PATCH] mqtt初始配置

---
 src/main/java/com/dji/sample/media/controller/FileController.java |   14 ++++++++------
 1 files changed, 8 insertions(+), 6 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 8a0093f..7fad72c 100644
--- a/src/main/java/com/dji/sample/media/controller/FileController.java
+++ b/src/main/java/com/dji/sample/media/controller/FileController.java
@@ -9,9 +9,11 @@
 import com.dji.sample.media.model.MediaFileQueryParam;
 import com.dji.sample.media.service.IFileService;
 import com.dji.sample.media.util.ImageDownloaderAndCompressor;
+import com.dji.sample.media.util.MinioFileDownloader;
 import com.drew.imaging.ImageProcessingException;
 import org.apache.ibatis.annotations.Update;
 import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.mock.web.MockHttpServletResponse;
 import org.springframework.web.bind.annotation.*;
 
 import javax.servlet.http.HttpServletRequest;
@@ -78,7 +80,7 @@
                                     @RequestParam(defaultValue = "1") int page,
                                     @RequestParam(name = "page_size", defaultValue = "10") int pageSize
     ) {
-        return ResponseResult.success(fileService.getJobId(page, pageSize, workspaceId));
+        return ResponseResult.success(fileService.mediaQuerys(page, pageSize, workspaceId));
     }
 
     @PutMapping("/examine")
@@ -110,10 +112,11 @@
                                        @RequestParam(name = "updateStart", required = false) Long photoStart,
                                        @RequestParam(name = "updateEnd", required = false) Long photoEnd,
                                        @RequestParam(name = "jobName", required = false) String jobName,
+                                       @RequestParam(name = "jobId", required = false) String jobId,
                                        @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,jobId));
 
     }
 
@@ -171,9 +174,8 @@
         }
     }
 
-    @GetMapping("/download-images")
-    public void downloadImages(@RequestParam String jobId, HttpServletResponse response) {
-    fileService.downloadImages(jobId,response);
+    @PostMapping("/download-images")
+    public ResponseResult downloadImages(@RequestBody List<String> jobIds) {
+        return fileService.downloadImages(jobIds);
     }
-
 }
\ No newline at end of file

--
Gitblit v1.9.3