From 64b008538e12248b0c55e4fbc45f85415fbc4ce4 Mon Sep 17 00:00:00 2001 From: sol Date: Tue, 23 Sep 2025 21:53:00 +0800 Subject: [PATCH] refactor(file): Adjust the file creation logic to set the default value and creation time uniformly --- .../com/bgasol/model/file/file/dto/FileCreateDto.java | 7 +------ .../com/bgasol/web/file/file/service/FileService.java | 8 +++++++- 2 files changed, 8 insertions(+), 7 deletions(-) diff --git a/cloud/model/model-file/src/main/java/com/bgasol/model/file/file/dto/FileCreateDto.java b/cloud/model/model-file/src/main/java/com/bgasol/model/file/file/dto/FileCreateDto.java index d4dd7ce..a3d9e95 100644 --- a/cloud/model/model-file/src/main/java/com/bgasol/model/file/file/dto/FileCreateDto.java +++ b/cloud/model/model-file/src/main/java/com/bgasol/model/file/file/dto/FileCreateDto.java @@ -43,11 +43,6 @@ public class FileCreateDto extends BaseCreateDto { @JsonIgnore @Schema(hidden = true) public FileEntity toEntity() { - FileEntity entity = super.toEntity(FILE_MAPSTRUCT_IMPL.toEntity(this)); - if (ObjectUtils.isEmpty(entity.getSource())) { - this.source = "default"; - } - entity.setCreateTime(new Date()); - return entity; + return super.toEntity(FILE_MAPSTRUCT_IMPL.toEntity(this)); } } diff --git a/cloud/web/web-file-8082/src/main/java/com/bgasol/web/file/file/service/FileService.java b/cloud/web/web-file-8082/src/main/java/com/bgasol/web/file/file/service/FileService.java index 419ccfb..0b1c2ff 100644 --- a/cloud/web/web-file-8082/src/main/java/com/bgasol/web/file/file/service/FileService.java +++ b/cloud/web/web-file-8082/src/main/java/com/bgasol/web/file/file/service/FileService.java @@ -18,6 +18,7 @@ import org.springframework.web.multipart.MultipartFile; import java.io.IOException; import java.io.InputStream; +import java.util.Date; @Service @RequiredArgsConstructor @@ -46,6 +47,12 @@ public class FileService extends BaseService { * 通过文件流保存文件 */ public FileEntity save(MultipartFile multipartFile, FileEntity fileEntity) { + fileEntity.setCreateTime(new Date()); + fileEntity.setBucket(minioConfig.getBucket()); + if (ObjectUtils.isEmpty(fileEntity.getSource())) { + fileEntity.setSource("default"); + } + if (ObjectUtils.isEmpty(multipartFile)) { return this.save(fileEntity); } @@ -101,7 +108,6 @@ public class FileService extends BaseService { } catch (IOException e) { throw new BaseException("获取文件HASH失败"); } - fileEntity.setBucket(minioConfig.getBucket()); } /**