From 24d8ee49a177560933570fd4b791ae3ed631491b Mon Sep 17 00:00:00 2001 From: Jerry Yan <792602257@qq.com> Date: Fri, 6 Feb 2026 17:23:37 +0800 Subject: [PATCH] =?UTF-8?q?feat:=20=E4=BC=98=E5=8C=96=E6=96=87=E4=BB=B6?= =?UTF-8?q?=E5=88=A0=E9=99=A4=E9=80=BB=E8=BE=91=EF=BC=8C=E6=94=AF=E6=8C=81?= =?UTF-8?q?=E7=BA=A7=E8=81=94=E5=88=A0=E9=99=A4=E7=89=88=E6=9C=AC=E5=92=8C?= =?UTF-8?q?=E6=B4=BE=E7=94=9F=E6=96=87=E4=BB=B6?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit - 删除文件时，如果存在多个版本，一并删除所有版本 - 删除PDF/doc/docx/xls/xlsx时，一并删除其派生的txt文件 - 文件删除失败时记录日志但不影响删除成功 --- .../DatasetFileApplicationService.java | 99 +++++++++++++++---- .../persistence/mapper/DatasetFileMapper.java | 9 ++ .../repository/DatasetFileRepository.java | 9 ++ .../impl/DatasetFileRepositoryImpl.java | 5 + .../resources/mappers/DatasetFileMapper.xml | 14 ++- 5 files changed, 116 insertions(+), 20 deletions(-) diff --git a/backend/services/data-management-service/src/main/java/com/datamate/datamanagement/application/DatasetFileApplicationService.java b/backend/services/data-management-service/src/main/java/com/datamate/datamanagement/application/DatasetFileApplicationService.java index 869a174..8852a15 100644 --- a/backend/services/data-management-service/src/main/java/com/datamate/datamanagement/application/DatasetFileApplicationService.java +++ b/backend/services/data-management-service/src/main/java/com/datamate/datamanagement/application/DatasetFileApplicationService.java @@ -575,30 +575,95 @@ public class DatasetFileApplicationService { return file; } - /** - * 删除文件 - */ + /** + * 删除文件 + */ @Transactional public void deleteDatasetFile(String datasetId, String fileId) { DatasetFile file = getDatasetFile(datasetId, fileId); - Dataset dataset = datasetRepository.getById(datasetId); - datasetFileRepository.removeById(fileId); - if (!isArchivedStatus(file)) { - dataset.setFiles(new ArrayList<>(Collections.singleton(file))); - dataset.removeFile(file); - datasetRepository.updateById(dataset); + if (file == null) { + log.warn("File not found: datasetId={}, fileId={}", datasetId, fileId); + return; } - datasetFilePreviewService.deletePreviewFileQuietly(datasetId, fileId); - // 删除文件时，上传到数据集中的文件会同时删除数据库中的记录和文件系统中的文件，归集过来的文件仅删除数据库中的记录 - if (file.getFilePath().startsWith(dataset.getPath())) { + String logicalPath = file.getLogicalPath(); + + List allVersions = datasetFileRepository.findAllByDatasetIdAndLogicalPath(datasetId, logicalPath); + + for (DatasetFile versionFile : allVersions) { + deleteDatasetFileInternal(datasetId, versionFile); + } + } + + private void deleteDatasetFileInternal(String datasetId, DatasetFile file) { + Dataset dataset = datasetRepository.getById(datasetId); + if (file == null || dataset == null) { + return; + } + + if (isSourceDocument(file)) { + deleteDerivedTextFileQuietly(datasetId, file.getId()); + } + + try { + datasetFileRepository.removeById(file.getId()); + } catch (Exception e) { + log.error("Failed to delete file record from database: fileId={}", file.getId(), e); + } + + if (!isArchivedStatus(file)) { + try { + dataset.setFiles(new ArrayList<>(Collections.singleton(file))); + dataset.removeFile(file); + datasetRepository.updateById(dataset); + } catch (Exception e) { + log.error("Failed to update dataset: datasetId={}", datasetId, e); + } + } + + datasetFilePreviewService.deletePreviewFileQuietly(datasetId, file.getId()); + + if (file.getFilePath() != null && file.getFilePath().startsWith(dataset.getPath())) { try { Path filePath = Paths.get(file.getFilePath()); Files.deleteIfExists(filePath); - } catch (IOException ex) { - throw BusinessException.of(SystemErrorCode.FILE_SYSTEM_ERROR); - } - } - } + } catch (IOException ex) { + log.error("Failed to delete physical file: filePath={}", file.getFilePath(), ex); + } + } + } + + private void deleteDerivedTextFileQuietly(String datasetId, String sourceFileId) { + if (sourceFileId == null || sourceFileId.isBlank()) { + return; + } + + try { + List derivedFiles = datasetFileRepository.findAllByDatasetId(datasetId).stream() + .filter(f -> isDerivedFileFromSource(f, sourceFileId)) + .toList(); + + for (DatasetFile derivedFile : derivedFiles) { + deleteDatasetFileInternal(datasetId, derivedFile); + } + } catch (Exception e) { + log.error("Failed to delete derived text files for sourceFileId: {}", sourceFileId, e); + } + } + + private boolean isDerivedFileFromSource(DatasetFile file, String sourceFileId) { + if (file == null || file.getMetadata() == null || file.getMetadata().isBlank()) { + return false; + } + try { + ObjectMapper mapper = new ObjectMapper(); + Map metadataMap = mapper.readValue(file.getMetadata(), new TypeReference>() {}); + Object derivedFromFileId = metadataMap.get(DERIVED_METADATA_KEY); + return derivedFromFileId != null && sourceFileId.equals(String.valueOf(derivedFromFileId)); + } catch (Exception e) { + log.debug("Failed to parse metadata for derived detection: fileId={}", file.getId(), e); + return false; + } + } /** * 下载文件 diff --git a/backend/services/data-management-service/src/main/java/com/datamate/datamanagement/infrastructure/persistence/mapper/DatasetFileMapper.java b/backend/services/data-management-service/src/main/java/com/datamate/datamanagement/infrastructure/persistence/mapper/DatasetFileMapper.java index d55c6cc..62a6b95 100644 --- a/backend/services/data-management-service/src/main/java/com/datamate/datamanagement/infrastructure/persistence/mapper/DatasetFileMapper.java +++ b/backend/services/data-management-service/src/main/java/com/datamate/datamanagement/infrastructure/persistence/mapper/DatasetFileMapper.java @@ -46,4 +46,13 @@ public interface DatasetFileMapper extends BaseMapper { * @return 文件数统计列表 */ List countNonDerivedByDatasetIds(@Param("datasetIds") List datasetIds); + + /** + * 查询指定逻辑路径的所有文件（包括所有状态） + * + * @param datasetId 数据集ID + * @param logicalPath 逻辑路径 + * @return 文件列表 + */ + List findAllByDatasetIdAndLogicalPath(@Param("datasetId") String datasetId, @Param("logicalPath") String logicalPath); } diff --git a/backend/services/data-management-service/src/main/java/com/datamate/datamanagement/infrastructure/persistence/repository/DatasetFileRepository.java b/backend/services/data-management-service/src/main/java/com/datamate/datamanagement/infrastructure/persistence/repository/DatasetFileRepository.java index 5d50fd6..75bb7f1 100644 --- a/backend/services/data-management-service/src/main/java/com/datamate/datamanagement/infrastructure/persistence/repository/DatasetFileRepository.java +++ b/backend/services/data-management-service/src/main/java/com/datamate/datamanagement/infrastructure/persistence/repository/DatasetFileRepository.java @@ -37,6 +37,15 @@ public interface DatasetFileRepository extends IRepository { */ DatasetFile findLatestByDatasetIdAndLogicalPath(String datasetId, String logicalPath); + /** + * 查询指定逻辑路径的所有文件（包括所有状态） + * + * @param datasetId 数据集ID + * @param logicalPath 逻辑路径 + * @return 文件列表 + */ + List findAllByDatasetIdAndLogicalPath(String datasetId, String logicalPath); + IPage findByCriteria(String datasetId, String fileType, String status, String name, Boolean hasAnnotation, IPage page); diff --git a/backend/services/data-management-service/src/main/java/com/datamate/datamanagement/infrastructure/persistence/repository/impl/DatasetFileRepositoryImpl.java b/backend/services/data-management-service/src/main/java/com/datamate/datamanagement/infrastructure/persistence/repository/impl/DatasetFileRepositoryImpl.java index db68750..0af1c33 100644 --- a/backend/services/data-management-service/src/main/java/com/datamate/datamanagement/infrastructure/persistence/repository/impl/DatasetFileRepositoryImpl.java +++ b/backend/services/data-management-service/src/main/java/com/datamate/datamanagement/infrastructure/persistence/repository/impl/DatasetFileRepositoryImpl.java @@ -84,6 +84,11 @@ public class DatasetFileRepositoryImpl extends CrudRepository findAllByDatasetIdAndLogicalPath(String datasetId, String logicalPath) { + return datasetFileMapper.findAllByDatasetIdAndLogicalPath(datasetId, logicalPath); + } + public IPage findByCriteria(String datasetId, String fileType, String status, String name, Boolean hasAnnotation, IPage page) { LambdaQueryWrapper wrapper = new LambdaQueryWrapper() diff --git a/backend/services/data-management-service/src/main/resources/mappers/DatasetFileMapper.xml b/backend/services/data-management-service/src/main/resources/mappers/DatasetFileMapper.xml index ef3ccb5..ede5679 100644 --- a/backend/services/data-management-service/src/main/resources/mappers/DatasetFileMapper.xml +++ b/backend/services/data-management-service/src/main/resources/mappers/DatasetFileMapper.xml @@ -64,7 +64,7 @@ AND (status IS NULL OR status <> 'ARCHIVED') - SELECT FROM t_dm_dataset_files WHERE dataset_id = #{datasetId} @@ -74,8 +74,16 @@ LIMIT 1 - + SELECT + FROM t_dm_dataset_files + WHERE dataset_id = #{datasetId} + AND logical_path = #{logicalPath} + ORDER BY version DESC, upload_time DESC + + +