From 2463dc3827e1cb3dac87ed334546ca2a57539595 Mon Sep 17 00:00:00 2001
From: rain <167982779@qq.com>
Date: Wed, 31 Jul 2024 17:15:45 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/ht-dev' into ht-dev
---
src/main/java/com/dji/sample/media/controller/FileController.java | 12 +++++++-----
1 files changed, 7 insertions(+), 5 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..09c9b03 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;
@@ -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