From 86384846e317381e7bb9e31ee76760e4ecb3ee67 Mon Sep 17 00:00:00 2001
From: rain <167982779@qq.com>
Date: Mon, 29 Jul 2024 11:49:57 +0800
Subject: [PATCH] 新增2m压缩图,修改喇叭功能,修改面状航线的修改接口

---
 src/main/java/com/dji/sample/media/controller/FileController.java |   23 +++++------------------
 1 files changed, 5 insertions(+), 18 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 5200eea..66db157 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;
@@ -171,23 +173,8 @@
         }
     }
 
-
-    private static final String BASE_URL = "http://dev.jxpskj.com:9000/cloud-bucket";
-
-    @GetMapping("/download-images")
-    public void downloadImages(@RequestParam String jobId, HttpServletResponse response) {
-        List<MediaFileEntity> entities = fileService.getMedia(jobId);
-        List<String> urls = entities.stream()
-                .map(MediaFileEntity::getObjectKey)
-                .map(objectKey -> BASE_URL + objectKey)
-                .collect(Collectors.toList());
-
-        String outputFolder = "images"; // 存放图片的文件夹
-        new File(outputFolder).mkdirs(); // 创建文件夹
-
-        downloadAndSaveImages(urls, outputFolder);
-        zipAndSendFolder(outputFolder, response);
-        cleanUp(outputFolder);
+    @PostMapping("/download-images")
+    public ResponseResult downloadImages(@RequestBody List<String> jobIds) {
+        return fileService.downloadImages(jobIds);
     }
-
 }
\ No newline at end of file

--
Gitblit v1.9.3