feature:增加批量下载数据集文件为zip包的功能

Author: hefanli

backend/services/data-management-service/src/main/java/com/dataengine/datamanagement/application/DatasetFileApplicationService.java

@@ -4,6 +4,8 @@
 import com.dataengine.common.domain.model.FileUploadResult;
 import com.dataengine.common.domain.service.FileService;
 import com.dataengine.common.domain.utils.AnalyzerUtils;
+import com.dataengine.common.infrastructure.exception.BusinessException;
+import com.dataengine.common.infrastructure.exception.SystemErrorCode;
 import com.dataengine.datamanagement.domain.contants.DatasetConstant;
 import com.dataengine.datamanagement.domain.model.dataset.Dataset;
 import com.dataengine.datamanagement.domain.model.dataset.DatasetFile;
@@ -16,6 +18,7 @@
 import com.dataengine.datamanagement.interfaces.dto.UploadFilesPreRequest;
 import com.fasterxml.jackson.core.JsonProcessingException;
 import com.fasterxml.jackson.databind.ObjectMapper;
+import jakarta.servlet.http.HttpServletResponse;
 import lombok.extern.slf4j.Slf4j;
 import org.apache.ibatis.session.RowBounds;
 import org.springframework.beans.factory.annotation.Autowired;
@@ -25,21 +28,27 @@
 import org.springframework.data.domain.Page;
 import org.springframework.data.domain.PageImpl;
 import org.springframework.data.domain.Pageable;
+import org.springframework.http.HttpHeaders;
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
 import org.springframework.web.multipart.MultipartFile;
 
+import java.io.BufferedInputStream;
 import java.io.File;
 import java.io.IOException;
+import java.io.InputStream;
 import java.net.MalformedURLException;
 import java.nio.file.Files;
 import java.nio.file.Path;
 import java.nio.file.Paths;
 import java.nio.file.StandardCopyOption;
 import java.time.LocalDateTime;
+import java.time.format.DateTimeFormatter;
 import java.util.List;
 import java.util.Objects;
 import java.util.UUID;
+import java.util.zip.ZipEntry;
+import java.util.zip.ZipOutputStream;
 
 /**
  * 数据集文件应用服务
@@ -75,7 +84,7 @@ public DatasetFileApplicationService(DatasetFileRepository datasetFileRepository
     /**
      * 上传文件到数据集
      */
-    public DatasetFile uploadFile(String datasetId, MultipartFile file, String description, String uploadedBy) {
+    public DatasetFile uploadFile(String datasetId, MultipartFile file) {
         Dataset dataset = datasetRepository.getById(datasetId);
         if (dataset == null) {
             throw new IllegalArgumentException("Dataset not found: " + datasetId);
@@ -182,6 +191,44 @@ public Resource downloadFile(String datasetId, String fileId) {
         }
     }
 
+    /**
+     * 下载文件
+     */
+    @Transactional(readOnly = true)
+    public void downloadDatasetFileAsZip(String datasetId, HttpServletResponse response) {
+        List<DatasetFile> allByDatasetId = datasetFileRepository.findAllByDatasetId(datasetId);
+        response.setContentType("application/zip");
+        String zipName = String.format("dataset_%s.zip",
+            LocalDateTime.now().format(DateTimeFormatter.ofPattern("yyyyMMddHHmmss")));
+        response.setHeader(HttpHeaders.CONTENT_DISPOSITION, "attachment; filename=" + zipName);
+        try (ZipOutputStream zos = new ZipOutputStream(response.getOutputStream())) {
+            for (DatasetFile file : allByDatasetId) {
+                addToZipFile(file, zos);
+            }
+        } catch (IOException e) {
+            log.error("Failed to download files in batches.", e);
+            throw BusinessException.of(SystemErrorCode.FILE_SYSTEM_ERROR);
+        }
+    }
+
+    private void addToZipFile(DatasetFile file, ZipOutputStream zos) throws IOException {
+        if (file.getFilePath() == null || !Files.exists(Paths.get(file.getFilePath()))) {
+            log.warn("The file hasn't been found on filesystem, id: {}", file.getId());
+            return;
+        }
+        try (InputStream fis = Files.newInputStream(Paths.get(file.getFilePath()));
+             BufferedInputStream bis = new BufferedInputStream(fis)) {
+            ZipEntry zipEntry = new ZipEntry(file.getFileName());
+            zos.putNextEntry(zipEntry);
+            byte[] buffer = new byte[8192];
+            int length;
+            while ((length = bis.read(buffer)) >= 0) {
+                zos.write(buffer, 0, length);
+            }
+            zos.closeEntry();
+        }
+    }
+
     private String getFileExtension(String fileName) {
         if (fileName == null || fileName.isEmpty()) {
             return null;

backend/services/data-management-service/src/main/java/com/dataengine/datamanagement/interfaces/rest/DatasetFileController.java

@@ -10,6 +10,7 @@
 import com.dataengine.datamanagement.interfaces.dto.PagedDatasetFileResponse;
 import com.dataengine.datamanagement.interfaces.dto.UploadFileRequest;
 import com.dataengine.datamanagement.interfaces.dto.UploadFilesPreRequest;
+import jakarta.servlet.http.HttpServletResponse;
 import jakarta.validation.Valid;
 import lombok.extern.slf4j.Slf4j;
 import org.springframework.beans.factory.annotation.Autowired;
@@ -24,6 +25,8 @@
 import org.springframework.web.bind.annotation.*;
 import org.springframework.web.multipart.MultipartFile;
 
+import java.time.LocalDateTime;
+import java.time.format.DateTimeFormatter;
 import java.util.stream.Collectors;
 
 /**
@@ -70,11 +73,9 @@ public ResponseEntity<Response<PagedDatasetFileResponse>> getDatasetFiles(
     @PostMapping(consumes = MediaType.MULTIPART_FORM_DATA_VALUE)
     public ResponseEntity<Response<DatasetFileResponse>> uploadDatasetFile(
         @PathVariable("datasetId") String datasetId,
-        @RequestPart(value = "file", required = false) MultipartFile file,
-        @RequestParam(value = "description", required = false) String description) {
+        @RequestPart(value = "file", required = false) MultipartFile file) {
         try {
-            DatasetFile datasetFile = datasetFileApplicationService.uploadFile(
-                datasetId, file, description, "system");
+            DatasetFile datasetFile = datasetFileApplicationService.uploadFile(datasetId, file);
 
             return ResponseEntity.status(HttpStatus.CREATED).body(Response.ok(DatasetConverter.INSTANCE.convertToResponse(datasetFile)));
         } catch (IllegalArgumentException e) {
@@ -111,7 +112,7 @@ public ResponseEntity<Response<Void>> deleteDatasetFile(
 
     @IgnoreResponseWrap
     @GetMapping(value = "/{fileId}/download", produces = MediaType.APPLICATION_OCTET_STREAM_VALUE)
-    public ResponseEntity<Resource> downloadDatasetFile(
+    public ResponseEntity<Resource> downloadDatasetFileById(
         @PathVariable("datasetId") String datasetId,
         @PathVariable("fileId") String fileId) {
         try {
@@ -130,6 +131,12 @@ public ResponseEntity<Resource> downloadDatasetFile(
         }
     }
 
+    @IgnoreResponseWrap
+    @GetMapping(value = "/download", produces = MediaType.APPLICATION_OCTET_STREAM_VALUE)
+    public void downloadDatasetFileAsZip(@PathVariable("datasetId") String datasetId, HttpServletResponse response) {
+        datasetFileApplicationService.downloadDatasetFileAsZip(datasetId, response);
+    }
+
     /**
      * 文件上传请求
      *

frontend/src/pages/DataManagement/dataset.api.ts

@@ -67,7 +67,7 @@ export function downloadFile(
   filename?: string
 ) {
   return download(
-    `/api/data-management/datasets/${id}/files/${fileId}/download`,
+    `/api/data-management/datasets/${id}/files/download`,
     null,
     filename
   );

frontend/src/pages/DataManagement/hooks/useFilesOperation.ts

@@ -54,7 +54,7 @@ export function useFilesOperation(dataset: Dataset) {
     await downloadFile(dataset.id, file.id, file.fileName);
     // 假设导出成功
     message.success({
-      content: `已导出 ${selectedFiles.length} 个文件`,
+      content: `已导出 1 个文件`,
     });
     setSelectedFiles([]); // 清空选中状态
   };