fix: fixed an issue where files inside folders could not be previewed

Author: hefanli

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

@@ -37,6 +37,7 @@
 import org.apache.commons.compress.archivers.zip.ZipArchiveEntry;
 import org.apache.commons.compress.archivers.zip.ZipArchiveOutputStream;
 import org.apache.commons.io.IOUtils;
+import org.apache.commons.lang3.StringUtils;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.beans.factory.annotation.Value;
 import org.springframework.core.io.Resource;
@@ -203,14 +204,15 @@ private DatasetFile getDatasetFile(Path path, Map<String, DatasetFile> datasetFi
      * 获取文件详情
      */
     @Transactional(readOnly = true)
-    public DatasetFile getDatasetFile(Dataset dataset, String fileId) {
-        if (dataset != null && !CommonUtils.isUUID(fileId) && !fileId.startsWith(".")) {
+    public DatasetFile getDatasetFile(Dataset dataset, String fileId, String prefix) {
+        prefix = StringUtils.isBlank(prefix) ? "" : prefix;
+        if (dataset != null && !CommonUtils.isUUID(fileId) && !fileId.startsWith(".") && !prefix.startsWith(".")) {
             DatasetFile file = new DatasetFile();
             file.setId(fileId);
             file.setFileName(fileId);
             file.setDatasetId(dataset.getId());
             file.setFileSize(0L);
-            file.setFilePath(dataset.getPath() + File.separator + fileId);
+            file.setFilePath(dataset.getPath() + File.separator + prefix + fileId);
             return file;
         }
         DatasetFile file = datasetFileRepository.getById(fileId);
@@ -229,7 +231,7 @@ public DatasetFile getDatasetFile(Dataset dataset, String fileId) {
     @Transactional
     public void deleteDatasetFile(String datasetId, String fileId) {
         Dataset dataset = datasetRepository.getById(datasetId);
-        DatasetFile file = getDatasetFile(dataset, fileId);
+        DatasetFile file = getDatasetFile(dataset, fileId, null);
         dataset.setFiles(new ArrayList<>(Collections.singleton(file)));
         datasetFileRepository.removeById(fileId);
         if (CommonUtils.isUUID(fileId)) {
@@ -655,7 +657,7 @@ public void renameFile(String datasetId, String fileId, RenameFileRequest reques
             throw BusinessException.of(DataManagementErrorCode.DATASET_NOT_FOUND);
         }
 
-        DatasetFile file = getDatasetFile(dataset, fileId);
+        DatasetFile file = getDatasetFile(dataset, fileId, null);
         String newName = Optional.ofNullable(request.getNewName()).orElse("").trim();
         if (newName.isEmpty()) {
             throw BusinessException.of(CommonErrorCode.PARAM_ERROR);

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

@@ -68,7 +68,7 @@ public ResponseEntity<Response<DatasetFileResponse>> getDatasetFileById(
             @PathVariable("fileId") String fileId) {
         try {
             Dataset dataset = datasetApplicationService.getDataset(datasetId);
-            DatasetFile datasetFile = datasetFileApplicationService.getDatasetFile(dataset, fileId);
+            DatasetFile datasetFile = datasetFileApplicationService.getDatasetFile(dataset, fileId, null);
             return ResponseEntity.ok(Response.ok(DatasetConverter.INSTANCE.convertToResponse(datasetFile)));
         } catch (IllegalArgumentException e) {
             return ResponseEntity.status(HttpStatus.NOT_FOUND).body(Response.error(SystemErrorCode.UNKNOWN_ERROR, null));
@@ -90,10 +90,12 @@ public ResponseEntity<Response<Void>> deleteDatasetFile(
     @IgnoreResponseWrap
     @GetMapping(value = "/{fileId}/download", produces = MediaType.APPLICATION_OCTET_STREAM_VALUE + ";charset=UTF-8")
     public ResponseEntity<Resource> downloadDatasetFileById(@PathVariable("datasetId") String datasetId,
-                                                            @PathVariable("fileId") String fileId) {
+                                                            @PathVariable("fileId") String fileId,
+                                                            @RequestParam(value = "prefix", required = false, defaultValue = "") String prefix) {
         try {
+            log.info("downloadDatasetFileById datasetId:{}, fileId:{}, prefix:{}", datasetId, fileId, prefix);
             Dataset dataset = datasetApplicationService.getDataset(datasetId);
-            DatasetFile datasetFile = datasetFileApplicationService.getDatasetFile(dataset, fileId);
+            DatasetFile datasetFile = datasetFileApplicationService.getDatasetFile(dataset, fileId, prefix);
             Resource resource = datasetFileApplicationService.downloadFile(datasetFile);
 
             return ResponseEntity.ok()

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

@@ -84,7 +84,8 @@ export function useFilesOperation(dataset: Dataset) {
 
   const handleDownloadFile = async (file: DatasetFile) => {
     // 实际导出逻辑
-    await downloadFileByIdUsingGet(dataset.id, file.id, file.fileName);
+    const prefix = pagination.prefix || "";
+    await downloadFileByIdUsingGet(dataset.id, prefix, file.id, file.fileName);
     // 假设导出成功
     message.success({
       content: `已导出 1 个文件`,
@@ -117,7 +118,8 @@ export function useFilesOperation(dataset: Dataset) {
       setPreviewFileDetail(detail);
 
       const image = isImageFile(detail?.fileName || file.fileName, detail?.fileType);
-      const { blob, blobUrl } = await downloadFileByIdUsingGet(datasetId, file.id, file.fileName, "preview");
+      const prefix = pagination.prefix || "";
+      const { blob, blobUrl } = await downloadFileByIdUsingGet(datasetId, prefix, file.id, file.fileName, "preview");
 
       if (image) {
         setPreviewUrl(blobUrl);

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

@@ -108,13 +108,14 @@ export function renameDirectoryUsingPut(
 
 export function downloadFileByIdUsingGet(
   id: string | number,
+  prefix: string,
   fileId: string | number,
   fileName: string,
   action: string = "download"
 ) {
   return download(
     `/api/data-management/datasets/${id}/files/${fileId}/download`,
-    null,
+    { prefix: prefix },
     fileName,
     action
   );