From e6e997b1792e027115b384bb55e9bc4cddfe5960 Mon Sep 17 00:00:00 2001 From: renzexin Date: Thu, 15 Aug 2024 16:52:11 +0800 Subject: [PATCH] =?UTF-8?q?fix=20=E9=A1=B9=E7=9B=AE=E7=AE=A1=E7=90=86-shan?= =?UTF-8?q?gchuan?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../main/java/com/chushang/oss/entity/vo/FileVo.java | 11 +++++++++++ .../com/chushang/oss/service/FileSourceService.java | 10 ++++++++-- 2 files changed, 19 insertions(+), 2 deletions(-) create mode 100644 chushang-modules/chushang-module-oss/oss-feign/src/main/java/com/chushang/oss/entity/vo/FileVo.java diff --git a/chushang-modules/chushang-module-oss/oss-feign/src/main/java/com/chushang/oss/entity/vo/FileVo.java b/chushang-modules/chushang-module-oss/oss-feign/src/main/java/com/chushang/oss/entity/vo/FileVo.java new file mode 100644 index 0000000..89169c9 --- /dev/null +++ b/chushang-modules/chushang-module-oss/oss-feign/src/main/java/com/chushang/oss/entity/vo/FileVo.java @@ -0,0 +1,11 @@ +package com.chushang.oss.entity.vo; + +import lombok.Data; + +@Data +public class FileVo { + private String fid; + private String mimeType; + private String realPath; + private String fileName; +} diff --git a/chushang-modules/chushang-module-oss/oss-service/src/main/java/com/chushang/oss/service/FileSourceService.java b/chushang-modules/chushang-module-oss/oss-service/src/main/java/com/chushang/oss/service/FileSourceService.java index 753a3b7..a73b54f 100644 --- a/chushang-modules/chushang-module-oss/oss-service/src/main/java/com/chushang/oss/service/FileSourceService.java +++ b/chushang-modules/chushang-module-oss/oss-service/src/main/java/com/chushang/oss/service/FileSourceService.java @@ -23,6 +23,7 @@ import com.chushang.oss.config.UploadConfig; import com.chushang.oss.entity.FileSourceInfo; import com.chushang.oss.entity.dto.OcrDTO; import com.chushang.oss.entity.vo.FileSourceVo; +import com.chushang.oss.entity.vo.FileVo; import com.chushang.oss.enums.OcrTypeEnum; import com.chushang.oss.mapper.FileSourceMapper; import com.chushang.security.utils.SecurityUtils; @@ -253,7 +254,7 @@ public class FileSourceService return upload; } - public String uploadContract(MultipartFile file) throws Exception + public FileVo uploadContract(MultipartFile file) throws Exception { String ip = IPUtils.clientIp(ServletUtils.getRequest()); String fid = generateFid(); @@ -284,7 +285,12 @@ public class FileSourceService String upload = ossService.upload(file.getInputStream(), fileSourceInfo); fileSourceInfo.setRealPath(upload); save(fileSourceInfo); - return upload; + FileVo fileVo = new FileVo(); + fileVo.setRealPath(upload); + fileVo.setFid(fid); + fileVo.setMimeType(mimetype); + fileVo.setFileName(fName); + return fileVo; } public FileSourceVo addFile(byte[] bytes, String fileName, Boolean sealFlag, String formats, String fileType)