From 87b702c24b657757cd949cee8cf8a1b04059fea6 Mon Sep 17 00:00:00 2001
From: shahaibo <1023316923@qq.com>
Date: Tue, 8 Apr 2025 11:09:28 +0800
Subject: [PATCH] =?UTF-8?q?TASK:=E6=A8=A1=E5=9D=97=E5=8C=96=EF=BC=9B?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../ai/da/controller/ProjectController.java   |  4 +-
 .../ai/da/service/UserLikeGroupService.java   |  2 +-
 .../impl/UserLikeGroupServiceImpl.java        | 46 +++++++++----------
 3 files changed, 26 insertions(+), 26 deletions(-)

diff --git a/src/main/java/com/ai/da/controller/ProjectController.java b/src/main/java/com/ai/da/controller/ProjectController.java
index 23924622..c1cc22f4 100644
--- a/src/main/java/com/ai/da/controller/ProjectController.java
+++ b/src/main/java/com/ai/da/controller/ProjectController.java
@@ -121,8 +121,8 @@ public class ProjectController {
     @GetMapping("/downloadZip")
     @ApiOperationSupport(order = 11)
     @ApiOperation(value = "下载", notes = "传入project")
-    public void downloadZip(@RequestParam(value = "threeDSimpleId") Long threeDSimpleId, @RequestParam(value = "sizeType") String sizeType, @RequestParam(value = "size") String size, HttpServletResponse response) throws MinioException, IOException {
-        userLikeGroupService.downloadZip(threeDSimpleId, sizeType, size, response);
+    public Response<String> downloadZip(@RequestParam(value = "threeDSimpleId") Long threeDSimpleId, @RequestParam(value = "sizeType") String sizeType, @RequestParam(value = "size") String size, HttpServletResponse response) throws MinioException, IOException {
+        return Response.success(userLikeGroupService.downloadZip(threeDSimpleId, sizeType, size, response));
     }
 
     @PostMapping("/delete")
diff --git a/src/main/java/com/ai/da/service/UserLikeGroupService.java b/src/main/java/com/ai/da/service/UserLikeGroupService.java
index 9048d7ca..f96de208 100644
--- a/src/main/java/com/ai/da/service/UserLikeGroupService.java
+++ b/src/main/java/com/ai/da/service/UserLikeGroupService.java
@@ -102,7 +102,7 @@ public interface UserLikeGroupService extends IService<UserLikeGroup> {
 
     void getThreeDGlb(Long threeDSimpleId, HttpServletResponse response) throws MinioException, IOException;
 
-    void downloadZip(Long threeDSimpleId, String sizeType, String size, HttpServletResponse response) throws MinioException, IOException;
+    String downloadZip(Long threeDSimpleId, String sizeType, String size, HttpServletResponse response) throws MinioException, IOException;
 
     Boolean delete(Long projectId);
 }
diff --git a/src/main/java/com/ai/da/service/impl/UserLikeGroupServiceImpl.java b/src/main/java/com/ai/da/service/impl/UserLikeGroupServiceImpl.java
index 6bcd733a..d61325b8 100644
--- a/src/main/java/com/ai/da/service/impl/UserLikeGroupServiceImpl.java
+++ b/src/main/java/com/ai/da/service/impl/UserLikeGroupServiceImpl.java
@@ -2145,7 +2145,7 @@ public class UserLikeGroupServiceImpl extends ServiceImpl<UserLikeGroupMapper, U
     }
 
     @Override
-    public void downloadZip(Long threeDSimpleId, String sizeType, String size, HttpServletResponse response) throws MinioException, IOException {
+    public String downloadZip(Long threeDSimpleId, String sizeType, String size, HttpServletResponse response) throws MinioException, IOException {
         QueryWrapper<ThreeDDetail> qw = new QueryWrapper<>();
         qw.lambda().eq(ThreeDDetail::getThreeDSimpleId, threeDSimpleId);
         qw.lambda().eq(ThreeDDetail::getSizeType, sizeType);
@@ -2154,29 +2154,29 @@ public class UserLikeGroupServiceImpl extends ServiceImpl<UserLikeGroupMapper, U
         if (ObjectUtils.isAllFieldNull(threeDDetail)) {
             throw new BusinessException("3D file is not exist");
         }
-        InputStream inputStream = minioUtil.download(threeDDetail.getUrl());
+        return minioUtil.getPreSignedUrl(threeDDetail.getUrl(), 24 * 60);
 
-        // 设置响应头
-        response.setContentType("application/zip"); // 确保 ZIP 格式
-        response.setHeader("Access-Control-Expose-Headers", "Content-Disposition");
-        String fileName = threeDDetail.getName();
-        if (!fileName.toLowerCase().endsWith(".zip")) {
-            fileName += ".zip";
-        }
-        response.setHeader("Content-Disposition", "attachment; filename*=UTF-8''" + URLEncoder.encode(fileName, StandardCharsets.UTF_8.toString()));
-
-        // 将文件内容写入响应输出流
-        try {
-            byte[] buffer = new byte[8192];
-            int bytesRead;
-            while ((bytesRead = inputStream.read(buffer)) != -1) {
-                response.getOutputStream().write(buffer, 0, bytesRead);
-            }
-            inputStream.close();
-            response.getOutputStream().flush();
-        } catch (Exception e) {
-            throw new RuntimeException("Failed to download ZIP file", e);
-        }
+//        // 设置响应头
+//        response.setContentType("application/zip"); // 确保 ZIP 格式
+//        response.setHeader("Access-Control-Expose-Headers", "Content-Disposition");
+//        String fileName = threeDDetail.getName();
+//        if (!fileName.toLowerCase().endsWith(".zip")) {
+//            fileName += ".zip";
+//        }
+//        response.setHeader("Content-Disposition", "attachment; filename*=UTF-8''" + URLEncoder.encode(fileName, StandardCharsets.UTF_8.toString()));
+//
+//        // 将文件内容写入响应输出流
+//        try {
+//            byte[] buffer = new byte[8192];
+//            int bytesRead;
+//            while ((bytesRead = inputStream.read(buffer)) != -1) {
+//                response.getOutputStream().write(buffer, 0, bytesRead);
+//            }
+//            inputStream.close();
+//            response.getOutputStream().flush();
+//        } catch (Exception e) {
+//            throw new RuntimeException("Failed to download ZIP file", e);
+//        }
     }
 
     @Override