From d320c9596a321dce1028ac36d23bcd04535e87a6 Mon Sep 17 00:00:00 2001 From: kils Date: Mon, 13 May 2024 16:53:39 +0800 Subject: [PATCH] =?UTF-8?q?feat:=20=E5=9B=BE=E7=89=87=E6=96=87=E4=BB=B6?= =?UTF-8?q?=E6=94=AF=E6=8C=81=E7=BC=A9=E7=95=A5=E5=9B=BE=20(#63)?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../system/config/file/FileRecorderImpl.java | 5 ++++- .../admin/system/model/entity/FileDO.java | 10 ++++++++++ .../admin/system/model/resp/FileResp.java | 12 ++++++++++++ .../system/service/impl/FileServiceImpl.java | 16 ++++++++++++---- .../db/changelog/mysql/continew-admin_table.sql | 2 ++ .../postgresql/continew-admin_table.sql | 4 ++++ 6 files changed, 44 insertions(+), 5 deletions(-) diff --git a/continew-admin-system/src/main/java/top/continew/admin/system/config/file/FileRecorderImpl.java b/continew-admin-system/src/main/java/top/continew/admin/system/config/file/FileRecorderImpl.java index a8f95079..f07f3d37 100644 --- a/continew-admin-system/src/main/java/top/continew/admin/system/config/file/FileRecorderImpl.java +++ b/continew-admin-system/src/main/java/top/continew/admin/system/config/file/FileRecorderImpl.java @@ -17,6 +17,7 @@ package top.continew.admin.system.config.file; import cn.hutool.core.date.DateUtil; +import cn.hutool.core.util.ClassUtil; import cn.hutool.core.util.EscapeUtil; import cn.hutool.core.util.StrUtil; import lombok.RequiredArgsConstructor; @@ -60,7 +61,9 @@ public class FileRecorderImpl implements FileRecorder { file.setUrl(fileInfo.getUrl()); file.setExtension(fileInfo.getExt()); file.setType(FileTypeEnum.getByExtension(file.getExtension())); - StorageDO storage = storageMapper.lambdaQuery().eq(StorageDO::getCode, fileInfo.getPlatform()).one(); + file.setThumbnailUrl(fileInfo.getThUrl()); + file.setThumbnailSize(fileInfo.getThSize()); + StorageDO storage = (StorageDO)fileInfo.getAttr().get(ClassUtil.getClassName(StorageDO.class, false)); file.setStorageId(storage.getId()); file.setCreateTime(DateUtil.toLocalDateTime(fileInfo.getCreateTime())); file.setUpdateUser(LoginHelper.getUserId()); diff --git a/continew-admin-system/src/main/java/top/continew/admin/system/model/entity/FileDO.java b/continew-admin-system/src/main/java/top/continew/admin/system/model/entity/FileDO.java index c27d46ca..1f1c76b1 100644 --- a/continew-admin-system/src/main/java/top/continew/admin/system/model/entity/FileDO.java +++ b/continew-admin-system/src/main/java/top/continew/admin/system/model/entity/FileDO.java @@ -70,6 +70,16 @@ public class FileDO extends BaseDO { */ private FileTypeEnum type; + /** + * 缩略图大小(字节) + */ + private Long thumbnailSize; + + /** + * 缩略图URL + */ + private String thumbnailUrl; + /** * 存储 ID */ diff --git a/continew-admin-system/src/main/java/top/continew/admin/system/model/resp/FileResp.java b/continew-admin-system/src/main/java/top/continew/admin/system/model/resp/FileResp.java index 76b35661..d4c56904 100644 --- a/continew-admin-system/src/main/java/top/continew/admin/system/model/resp/FileResp.java +++ b/continew-admin-system/src/main/java/top/continew/admin/system/model/resp/FileResp.java @@ -69,6 +69,18 @@ public class FileResp extends BaseDetailResp { "5"}, example = "2") private FileTypeEnum type; + /** + * 缩略图大小(字节) + */ + @Schema(description = "缩略图大小(字节)", example = "1024") + private Long thumbnailSize; + + /** + * 缩略图URL + */ + @Schema(description = "缩略图URL", example = "https://examplebucket.oss-cn-hangzhou.aliyuncs.com/example/example.jpg.min.jpg") + private String thumbnailUrl; + /** * 存储 ID */ diff --git a/continew-admin-system/src/main/java/top/continew/admin/system/service/impl/FileServiceImpl.java b/continew-admin-system/src/main/java/top/continew/admin/system/service/impl/FileServiceImpl.java index 52f32607..f6c94d22 100644 --- a/continew-admin-system/src/main/java/top/continew/admin/system/service/impl/FileServiceImpl.java +++ b/continew-admin-system/src/main/java/top/continew/admin/system/service/impl/FileServiceImpl.java @@ -17,8 +17,7 @@ package top.continew.admin.system.service.impl; import cn.hutool.core.collection.CollUtil; -import cn.hutool.core.util.StrUtil; -import cn.hutool.core.util.URLUtil; +import cn.hutool.core.util.*; import jakarta.annotation.Resource; import lombok.RequiredArgsConstructor; import lombok.extern.slf4j.Slf4j; @@ -85,7 +84,11 @@ public class FileServiceImpl extends BaseServiceImpl img.size(100, 100)) + .setPlatform(storage.getCode()) + .putAttr(ClassUtil.getClassName(StorageDO.class, false), storage); uploadPretreatment.setProgressMonitor(new ProgressListener() { @Override public void start() { @@ -133,7 +136,12 @@ public class FileServiceImpl extends BaseServiceImpl