diff --git a/src/main/java/com/bruce/common/controller/SysAttachmentController.java b/src/main/java/com/bruce/common/controller/SysAttachmentController.java index 360e4bc..5ecc8da 100644 --- a/src/main/java/com/bruce/common/controller/SysAttachmentController.java +++ b/src/main/java/com/bruce/common/controller/SysAttachmentController.java @@ -1,15 +1,16 @@ package com.bruce.common.controller; -import com.bruce.common.entity.SysAttachment; +import com.bruce.common.domain.entity.SysAttachment; +import com.bruce.common.domain.model.RequestResult; +import com.bruce.common.dto.request.SysAttachmentUploadRequest; import com.bruce.common.service.ISysAttachmentService; import io.swagger.v3.oas.annotations.Operation; import io.swagger.v3.oas.annotations.tags.Tag; import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.web.bind.annotation.ModelAttribute; import org.springframework.web.bind.annotation.PostMapping; import org.springframework.web.bind.annotation.RequestMapping; -import org.springframework.web.bind.annotation.RequestParam; import org.springframework.web.bind.annotation.RestController; -import org.springframework.web.multipart.MultipartFile; @Tag(name = "系统附件管理") @RestController @@ -21,9 +22,7 @@ public class SysAttachmentController { @Operation(summary = "上传附件") @PostMapping("/upload") - public SysAttachment upload(@RequestParam("file") MultipartFile file, - @RequestParam String sourceType, - @RequestParam(required = false) Long sourceId) { - return sysAttachmentService.upload(file, sourceType, sourceId); + public RequestResult upload(@ModelAttribute SysAttachmentUploadRequest request) { + return RequestResult.success(sysAttachmentService.upload(request)); } } diff --git a/src/main/java/com/bruce/common/dto/request/SysAttachmentUploadRequest.java b/src/main/java/com/bruce/common/dto/request/SysAttachmentUploadRequest.java new file mode 100644 index 0000000..1e8877c --- /dev/null +++ b/src/main/java/com/bruce/common/dto/request/SysAttachmentUploadRequest.java @@ -0,0 +1,19 @@ +package com.bruce.common.dto.request; + +import io.swagger.v3.oas.annotations.media.Schema; +import lombok.Data; +import org.springframework.web.multipart.MultipartFile; + +@Data +@Schema(description = "附件上传请求") +public class SysAttachmentUploadRequest { + + @Schema(description = "上传文件") + private MultipartFile file; + + @Schema(description = "来源类型") + private String sourceType; + + @Schema(description = "来源业务ID") + private Long sourceId; +} diff --git a/src/main/java/com/bruce/common/service/ISysAttachmentService.java b/src/main/java/com/bruce/common/service/ISysAttachmentService.java index 0d226a9..0bc4f13 100644 --- a/src/main/java/com/bruce/common/service/ISysAttachmentService.java +++ b/src/main/java/com/bruce/common/service/ISysAttachmentService.java @@ -1,10 +1,10 @@ package com.bruce.common.service; import com.baomidou.mybatisplus.extension.service.IService; -import com.bruce.common.entity.SysAttachment; -import org.springframework.web.multipart.MultipartFile; +import com.bruce.common.domain.entity.SysAttachment; +import com.bruce.common.dto.request.SysAttachmentUploadRequest; public interface ISysAttachmentService extends IService { - SysAttachment upload(MultipartFile file, String sourceType, Long sourceId); + SysAttachment upload(SysAttachmentUploadRequest request); } diff --git a/src/main/java/com/bruce/common/service/impl/SysAttachmentServiceImpl.java b/src/main/java/com/bruce/common/service/impl/SysAttachmentServiceImpl.java index c1b6940..b9fe4b6 100644 --- a/src/main/java/com/bruce/common/service/impl/SysAttachmentServiceImpl.java +++ b/src/main/java/com/bruce/common/service/impl/SysAttachmentServiceImpl.java @@ -2,7 +2,8 @@ package com.bruce.common.service.impl; import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; import com.bruce.common.config.AttachmentProperties; -import com.bruce.common.entity.SysAttachment; +import com.bruce.common.domain.entity.SysAttachment; +import com.bruce.common.dto.request.SysAttachmentUploadRequest; import com.bruce.common.mapper.SysAttachmentMapper; import com.bruce.common.service.ISysAttachmentService; import org.springframework.stereotype.Service; @@ -29,10 +30,15 @@ public class SysAttachmentServiceImpl extends ServiceImpl