From 564f850ec67ae36474213fdc9f0d7f2e2071a874 Mon Sep 17 00:00:00 2001 From: sol Date: Wed, 30 Jul 2025 12:20:34 +0800 Subject: [PATCH] refactor(file): Refactoring the file to upload the relevant code --- .../com/bgasol/model/file/file/api/FileApi.java | 2 -- .../bgasol/model/file/file/dto/FileCreateDto.java | 3 +-- .../bgasol/model/file/file/dto/FileUpdateDto.java | 10 +++++++--- .../web/file/file/controller/FileController.java | 14 +++++++------- 4 files changed, 15 insertions(+), 14 deletions(-) diff --git a/cloud/model/model-file/src/main/java/com/bgasol/model/file/file/api/FileApi.java b/cloud/model/model-file/src/main/java/com/bgasol/model/file/file/api/FileApi.java index bfefe7d..73e520c 100644 --- a/cloud/model/model-file/src/main/java/com/bgasol/model/file/file/api/FileApi.java +++ b/cloud/model/model-file/src/main/java/com/bgasol/model/file/file/api/FileApi.java @@ -7,9 +7,7 @@ import com.bgasol.model.file.file.dto.FileUpdateDto; import com.bgasol.model.file.file.entity.FileEntity; import feign.Response; import org.springframework.cloud.openfeign.FeignClient; -import org.springframework.core.io.InputStreamResource; import org.springframework.http.MediaType; -import org.springframework.http.ResponseEntity; import org.springframework.web.bind.annotation.*; @FeignClient( 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 dfe3cff..12cd6b5 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 @@ -1,6 +1,5 @@ package com.bgasol.model.file.file.dto; -import com.baomidou.mybatisplus.annotation.TableField; import com.bgasol.common.core.base.dto.BaseCreateDto; import com.bgasol.model.file.file.entity.FileEntity; import com.fasterxml.jackson.annotation.JsonIgnore; @@ -22,7 +21,7 @@ public class FileCreateDto extends BaseCreateDto { @Schema(description = "要上传的文件块") private MultipartFile uploadFile; - @TableField("name") + @Schema(description = "文件名称") private String name; @Schema(description = "文件状态") diff --git a/cloud/model/model-file/src/main/java/com/bgasol/model/file/file/dto/FileUpdateDto.java b/cloud/model/model-file/src/main/java/com/bgasol/model/file/file/dto/FileUpdateDto.java index 0de2ab0..f39b728 100644 --- a/cloud/model/model-file/src/main/java/com/bgasol/model/file/file/dto/FileUpdateDto.java +++ b/cloud/model/model-file/src/main/java/com/bgasol/model/file/file/dto/FileUpdateDto.java @@ -1,10 +1,11 @@ package com.bgasol.model.file.file.dto; -import com.baomidou.mybatisplus.annotation.TableField; +import com.bgasol.common.core.base.dto.BaseCreateDto; import com.bgasol.common.core.base.dto.BaseUpdateDto; import com.bgasol.model.file.file.entity.FileEntity; import com.fasterxml.jackson.annotation.JsonIgnore; import io.swagger.v3.oas.annotations.media.Schema; +import jakarta.validation.constraints.NotBlank; import lombok.Getter; import lombok.NoArgsConstructor; import lombok.Setter; @@ -18,11 +19,14 @@ import static com.bgasol.model.file.file.mapstruct.FileMapstruct.FILE_MAPSTRUCT_ @SuperBuilder @NoArgsConstructor @Schema(description = "更新文件") -public class FileUpdateDto extends BaseUpdateDto { +public class FileUpdateDto extends BaseCreateDto { + @Schema(description = "主键") + private String id; + @Schema(description = "要上传的文件块") private MultipartFile uploadFile; - @TableField("name") + @Schema(description = "文件名称") private String name; @Schema(description = "文件状态") diff --git a/cloud/web/web-file-8082/src/main/java/com/bgasol/web/file/file/controller/FileController.java b/cloud/web/web-file-8082/src/main/java/com/bgasol/web/file/file/controller/FileController.java index 287cf28..ae70380 100644 --- a/cloud/web/web-file-8082/src/main/java/com/bgasol/web/file/file/controller/FileController.java +++ b/cloud/web/web-file-8082/src/main/java/com/bgasol/web/file/file/controller/FileController.java @@ -2,6 +2,7 @@ package com.bgasol.web.file.file.controller; import cn.dev33.satoken.annotation.SaCheckPermission; import com.bgasol.common.core.base.controller.BaseController; +import com.bgasol.common.core.base.dto.BaseUpdateDto; import com.bgasol.common.core.base.vo.BaseVo; import com.bgasol.common.core.base.vo.PageVo; import com.bgasol.model.file.file.dto.FileCreateDto; @@ -33,7 +34,7 @@ public class FileController extends BaseController< FileEntity, FilePageDto, FileCreateDto, - FileUpdateDto> { + BaseUpdateDto> { private final FileService fileService; private final OssService ossService; @@ -52,21 +53,20 @@ public class FileController extends BaseController< } @Override - @PostMapping + @PostMapping(consumes = MediaType.MULTIPART_FORM_DATA_VALUE) @Operation(summary = "保存|上传文件", operationId = "saveFile") @SaCheckPermission("file:save") - public BaseVo save(@Valid FileCreateDto fileCreateDto) { + public BaseVo save(FileCreateDto fileCreateDto) { FileEntity save = fileService.save(fileCreateDto.getUploadFile(), fileCreateDto.toEntity()); return BaseVo.success(save, "文件上传成功"); } - @Override - @PutMapping + @PutMapping(consumes = MediaType.MULTIPART_FORM_DATA_VALUE) @Operation(summary = "更新|上传文件", operationId = "updateFile") @SaCheckPermission("file:update") public BaseVo update(FileUpdateDto fileUpdateDto) { - FileEntity save = fileService.update(fileUpdateDto.getUploadFile(), fileUpdateDto.toEntity()); - return BaseVo.success(save, "文件上传成功"); + FileEntity update = fileService.update(fileUpdateDto.getUploadFile(), fileUpdateDto.toEntity()); + return BaseVo.success(update, "文件更新成功"); } @Override