From 9d69d0d72795c9610cd977f92654cbb483284fce Mon Sep 17 00:00:00 2001 From: zhangran <786752558@qq.com> Date: Sun, 1 Aug 2021 19:38:12 +0800 Subject: [PATCH] =?UTF-8?q?add-=E4=B8=8A=E4=BC=A0=E6=96=87=E4=BB=B6?= =?UTF-8?q?=E5=89=8D=E6=A0=A1=E9=AA=8C?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../controller/ServerFileController.java | 2 +- .../cn/axzo/oss/common/enums/CodeEnum.java | 8 +- .../oss/common/enums/StorageUnitEnum.java | 43 ++++++++++ .../cn/axzo/oss/common/utils/Utility.java | 14 +++ .../dal/repository/AppChannelBucketDao.java | 8 ++ .../axzo/oss/dal/repository/FileAppDao.java | 7 ++ .../dal/repository/FileBusinessSceneDao.java | 8 ++ .../oss/dal/repository/FileChannelDao.java | 7 ++ .../dal/repository/FileUploadConfigDao.java | 8 ++ .../impl/AppChannelBucketDaoImpl.java | 16 +++- .../dal/repository/impl/FileAppDaoImpl.java | 14 +++ .../impl/FileBusinessSceneDaoImpl.java | 16 +++- .../repository/impl/FileChannelDaoImpl.java | 13 +++ .../impl/FileUploadConfigDaoImpl.java | 17 +++- .../cn/axzo/oss/service/api/FileService.java | 2 +- .../oss/service/impl/FileServiceImpl.java | 85 ++++++++++++++++++- 16 files changed, 261 insertions(+), 7 deletions(-) create mode 100644 oss-common/src/main/java/cn/axzo/oss/common/enums/StorageUnitEnum.java diff --git a/oss-client/src/main/java/cn/axzo/oss/client/controller/ServerFileController.java b/oss-client/src/main/java/cn/axzo/oss/client/controller/ServerFileController.java index e387220..7e40698 100644 --- a/oss-client/src/main/java/cn/axzo/oss/client/controller/ServerFileController.java +++ b/oss-client/src/main/java/cn/axzo/oss/client/controller/ServerFileController.java @@ -31,7 +31,7 @@ public class ServerFileController implements ServerFileServiceApi { @Override public CommonResponse upload(@Valid @RequestBody ServerFileUploadRequest request) { ServerFileUploadDto dto = BeanConvertUtil.copyBean(request, ServerFileUploadDto.class); - fileService.update(dto); + fileService.upload(dto); return null; } diff --git a/oss-common/src/main/java/cn/axzo/oss/common/enums/CodeEnum.java b/oss-common/src/main/java/cn/axzo/oss/common/enums/CodeEnum.java index c2db033..b129aa2 100644 --- a/oss-common/src/main/java/cn/axzo/oss/common/enums/CodeEnum.java +++ b/oss-common/src/main/java/cn/axzo/oss/common/enums/CodeEnum.java @@ -30,7 +30,13 @@ public enum CodeEnum implements EnumBase { /** * 101-200 业务场景 */ - S3_CLIENT_NULL(101,"oss client is null") + S3_CLIENT_NULL(101,"oss client is null"), + APP_CODE_NOT_FOUND(102,"app code not found"), + APP_CHANNEL_BUCKET_NOT_FOUND(103,"channel bucket not found"), + APP_CHANNEL_NOT_FOUND(104,"channel not found"), + NO_CHANNELS_AVAILABLE(105,"no channels available"), + NO_UPLOAD_CONFIG(106,"no upload config"), + FILE_SIZE_EXCEEDS_LIMIT(107,"file size exceeds limit"), ; diff --git a/oss-common/src/main/java/cn/axzo/oss/common/enums/StorageUnitEnum.java b/oss-common/src/main/java/cn/axzo/oss/common/enums/StorageUnitEnum.java new file mode 100644 index 0000000..cedcbca --- /dev/null +++ b/oss-common/src/main/java/cn/axzo/oss/common/enums/StorageUnitEnum.java @@ -0,0 +1,43 @@ +package cn.axzo.oss.common.enums; + +import java.util.Arrays; +import lombok.Getter; +import lombok.RequiredArgsConstructor; + +/** + * @ClassName: cn.axzo.oss.common.enums + * @description: + * @author: + * @date: 2021/8/119:04 + **/ +@Getter +@RequiredArgsConstructor +public enum StorageUnitEnum { + + /** + * B + */ + B(1, "B"), + /** + * KB + */ + KB(B.size * 1024, "KB"), + /** + * MB + */ + MB(KB.size * 1024, "MB"), + /** + * GB + */ + GB(MB.size * 1024, "GB"), + ; + + + private final Integer size; + private final String unit; + + public static StorageUnitEnum value(String unit) { + return Arrays.stream(values()).filter(storageUnitEnum -> storageUnitEnum.getUnit().equals(unit)) + .findFirst().orElse(null); + } +} diff --git a/oss-common/src/main/java/cn/axzo/oss/common/utils/Utility.java b/oss-common/src/main/java/cn/axzo/oss/common/utils/Utility.java index 25b4f95..0253a39 100644 --- a/oss-common/src/main/java/cn/axzo/oss/common/utils/Utility.java +++ b/oss-common/src/main/java/cn/axzo/oss/common/utils/Utility.java @@ -1,5 +1,6 @@ package cn.axzo.oss.common.utils; +import cn.axzo.oss.common.enums.StorageUnitEnum; import java.nio.charset.StandardCharsets; import java.security.MessageDigest; import java.security.NoSuchAlgorithmException; @@ -17,6 +18,7 @@ import org.apache.commons.codec.binary.Hex; @Slf4j public class Utility { + /** * 判断对象为null * @param obj @@ -88,4 +90,16 @@ public class Utility { } return ""; } + + /** + * 容量换算 + * @return + */ + public static int capacityConversion(int size, String storageUnit) { + StorageUnitEnum storageUnitEnum = StorageUnitEnum.valueOf(storageUnit); + if (objIsNull(storageUnitEnum)) { + return 0; + } + return storageUnitEnum.getSize() * size; + } } diff --git a/oss-dal/src/main/java/cn/axzo/oss/dal/repository/AppChannelBucketDao.java b/oss-dal/src/main/java/cn/axzo/oss/dal/repository/AppChannelBucketDao.java index d9db5c3..1319b72 100644 --- a/oss-dal/src/main/java/cn/axzo/oss/dal/repository/AppChannelBucketDao.java +++ b/oss-dal/src/main/java/cn/axzo/oss/dal/repository/AppChannelBucketDao.java @@ -2,6 +2,7 @@ package cn.axzo.oss.dal.repository; import cn.axzo.oss.dal.entity.AppChannelBucket; import com.baomidou.mybatisplus.extension.service.IService; +import java.util.List; /** *

@@ -13,4 +14,11 @@ import com.baomidou.mybatisplus.extension.service.IService; */ public interface AppChannelBucketDao extends IService { + /** + * 通过appcode获取文件渠道桶信息 + * + * @param appCode appcode + * @return + */ + List getByAppCode(String appCode); } diff --git a/oss-dal/src/main/java/cn/axzo/oss/dal/repository/FileAppDao.java b/oss-dal/src/main/java/cn/axzo/oss/dal/repository/FileAppDao.java index 642606b..517210f 100644 --- a/oss-dal/src/main/java/cn/axzo/oss/dal/repository/FileAppDao.java +++ b/oss-dal/src/main/java/cn/axzo/oss/dal/repository/FileAppDao.java @@ -1,5 +1,6 @@ package cn.axzo.oss.dal.repository; +import cn.axzo.oss.dal.entity.File; import cn.axzo.oss.dal.entity.FileApp; import com.baomidou.mybatisplus.extension.service.IService; @@ -13,4 +14,10 @@ import com.baomidou.mybatisplus.extension.service.IService; */ public interface FileAppDao extends IService { + /** + * 通过appCode获取应用信息 + * @param appCode + * @return + */ + FileApp getByAppCode(String appCode); } diff --git a/oss-dal/src/main/java/cn/axzo/oss/dal/repository/FileBusinessSceneDao.java b/oss-dal/src/main/java/cn/axzo/oss/dal/repository/FileBusinessSceneDao.java index 80078ec..7b2c8ea 100644 --- a/oss-dal/src/main/java/cn/axzo/oss/dal/repository/FileBusinessSceneDao.java +++ b/oss-dal/src/main/java/cn/axzo/oss/dal/repository/FileBusinessSceneDao.java @@ -13,4 +13,12 @@ import com.baomidou.mybatisplus.extension.service.IService; */ public interface FileBusinessSceneDao extends IService { + /** + * 指定appcode文件业务场景 + * + * @param bucketNo 应用编码 + * @param bizScene + * @return + */ + FileBusinessScene getByBucketNoAndScene(String bucketNo, String bizScene); } diff --git a/oss-dal/src/main/java/cn/axzo/oss/dal/repository/FileChannelDao.java b/oss-dal/src/main/java/cn/axzo/oss/dal/repository/FileChannelDao.java index 28cfecd..379a7fb 100644 --- a/oss-dal/src/main/java/cn/axzo/oss/dal/repository/FileChannelDao.java +++ b/oss-dal/src/main/java/cn/axzo/oss/dal/repository/FileChannelDao.java @@ -2,6 +2,7 @@ package cn.axzo.oss.dal.repository; import cn.axzo.oss.dal.entity.FileChannel; import com.baomidou.mybatisplus.extension.service.IService; +import java.util.List; /** *

@@ -13,4 +14,10 @@ import com.baomidou.mybatisplus.extension.service.IService; */ public interface FileChannelDao extends IService { + /** + * 通过channelCode获取最高优化级可用文件渠道 + * @param channelCodes + * @return + */ + List getByChannelCode(List channelCodes); } diff --git a/oss-dal/src/main/java/cn/axzo/oss/dal/repository/FileUploadConfigDao.java b/oss-dal/src/main/java/cn/axzo/oss/dal/repository/FileUploadConfigDao.java index 16e9364..7fb886b 100644 --- a/oss-dal/src/main/java/cn/axzo/oss/dal/repository/FileUploadConfigDao.java +++ b/oss-dal/src/main/java/cn/axzo/oss/dal/repository/FileUploadConfigDao.java @@ -13,4 +13,12 @@ import com.baomidou.mybatisplus.extension.service.IService; */ public interface FileUploadConfigDao extends IService { + /** + * 通过渠道码和桶名称获取获取指定上传配置 + * + * @param bucketNo + * @param directory + * @return + */ + FileUploadConfig getByUploadConfig(String bucketNo, String directory); } diff --git a/oss-dal/src/main/java/cn/axzo/oss/dal/repository/impl/AppChannelBucketDaoImpl.java b/oss-dal/src/main/java/cn/axzo/oss/dal/repository/impl/AppChannelBucketDaoImpl.java index d9f2272..1f17e61 100644 --- a/oss-dal/src/main/java/cn/axzo/oss/dal/repository/impl/AppChannelBucketDaoImpl.java +++ b/oss-dal/src/main/java/cn/axzo/oss/dal/repository/impl/AppChannelBucketDaoImpl.java @@ -1,9 +1,11 @@ package cn.axzo.oss.dal.repository.impl; +import cn.axzo.oss.common.enums.IsDeleteEnum; import cn.axzo.oss.dal.entity.AppChannelBucket; import cn.axzo.oss.dal.mapper.AppChannelBucketMapper; import cn.axzo.oss.dal.repository.AppChannelBucketDao; import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; +import java.util.List; import org.springframework.stereotype.Repository; /** @@ -15,6 +17,18 @@ import org.springframework.stereotype.Repository; * @since 2021-07-23 */ @Repository("appChannelBucketDao") -public class AppChannelBucketDaoImpl extends ServiceImpl implements AppChannelBucketDao { +public class AppChannelBucketDaoImpl extends + ServiceImpl implements AppChannelBucketDao { + /** + * 通过appcode获取文件渠道桶信息 + * + * @param appCode appcode + * @return + */ + @Override + public List getByAppCode(String appCode) { + return lambdaQuery().eq(AppChannelBucket::getAppCode, appCode) + .eq(AppChannelBucket::getIsDelete, IsDeleteEnum.NO.getCode()).list(); + } } diff --git a/oss-dal/src/main/java/cn/axzo/oss/dal/repository/impl/FileAppDaoImpl.java b/oss-dal/src/main/java/cn/axzo/oss/dal/repository/impl/FileAppDaoImpl.java index fce99b7..cf3850c 100644 --- a/oss-dal/src/main/java/cn/axzo/oss/dal/repository/impl/FileAppDaoImpl.java +++ b/oss-dal/src/main/java/cn/axzo/oss/dal/repository/impl/FileAppDaoImpl.java @@ -1,5 +1,6 @@ package cn.axzo.oss.dal.repository.impl; +import cn.axzo.oss.common.enums.IsDeleteEnum; import cn.axzo.oss.dal.entity.FileApp; import cn.axzo.oss.dal.mapper.FileAppMapper; import cn.axzo.oss.dal.repository.FileAppDao; @@ -17,4 +18,17 @@ import org.springframework.stereotype.Repository; @Repository("fileAppDao") public class FileAppDaoImpl extends ServiceImpl implements FileAppDao { + + /** + * 通过appCode获取应用信息 + * + * @param appCode + * @return + */ + @Override + public FileApp getByAppCode(String appCode) { + return lambdaQuery().eq(FileApp::getAppCode, appCode) + .eq(FileApp::getStatus, 1) + .eq(FileApp::getIsDelete, IsDeleteEnum.NO.getCode()).one(); + } } diff --git a/oss-dal/src/main/java/cn/axzo/oss/dal/repository/impl/FileBusinessSceneDaoImpl.java b/oss-dal/src/main/java/cn/axzo/oss/dal/repository/impl/FileBusinessSceneDaoImpl.java index 9cd9f12..51806ed 100644 --- a/oss-dal/src/main/java/cn/axzo/oss/dal/repository/impl/FileBusinessSceneDaoImpl.java +++ b/oss-dal/src/main/java/cn/axzo/oss/dal/repository/impl/FileBusinessSceneDaoImpl.java @@ -1,5 +1,6 @@ package cn.axzo.oss.dal.repository.impl; +import cn.axzo.oss.common.enums.IsDeleteEnum; import cn.axzo.oss.dal.entity.FileBusinessScene; import cn.axzo.oss.dal.mapper.FileBusinessSceneMapper; import cn.axzo.oss.dal.repository.FileBusinessSceneDao; @@ -15,6 +16,19 @@ import org.springframework.stereotype.Repository; * @since 2021-07-23 */ @Repository("fileBusinessSceneDao") -public class FileBusinessSceneDaoImpl extends ServiceImpl implements FileBusinessSceneDao { +public class FileBusinessSceneDaoImpl extends + ServiceImpl implements FileBusinessSceneDao { + /** + * 指定appcode文件业务场景 + * + * @param bucketNo + * @return + */ + @Override + public FileBusinessScene getByBucketNoAndScene(String bucketNo, String bizScen) { + return lambdaQuery().eq(FileBusinessScene::getAppChannelBucketNo, bucketNo) + .eq(FileBusinessScene::getBusinessScene,bizScen) + .eq(FileBusinessScene::getIsDelete, IsDeleteEnum.NO.getCode()).one(); + } } diff --git a/oss-dal/src/main/java/cn/axzo/oss/dal/repository/impl/FileChannelDaoImpl.java b/oss-dal/src/main/java/cn/axzo/oss/dal/repository/impl/FileChannelDaoImpl.java index 558d91d..6458b3a 100644 --- a/oss-dal/src/main/java/cn/axzo/oss/dal/repository/impl/FileChannelDaoImpl.java +++ b/oss-dal/src/main/java/cn/axzo/oss/dal/repository/impl/FileChannelDaoImpl.java @@ -4,6 +4,7 @@ import cn.axzo.oss.dal.entity.FileChannel; import cn.axzo.oss.dal.mapper.FileChannelMapper; import cn.axzo.oss.dal.repository.FileChannelDao; import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; +import java.util.List; import org.springframework.stereotype.Repository; /** @@ -17,4 +18,16 @@ import org.springframework.stereotype.Repository; @Repository("fileChannelDao") public class FileChannelDaoImpl extends ServiceImpl implements FileChannelDao { + /** + * 通过channelCode获取多个可用文件渠道 + * + * @param channelCodes + * @return + */ + @Override + public List getByChannelCode(List channelCodes) { + return lambdaQuery().in(FileChannel::getChannelCode,channelCodes) + .eq(FileChannel::getStatus,1) + .orderByAsc(FileChannel::getPriority).list(); + } } diff --git a/oss-dal/src/main/java/cn/axzo/oss/dal/repository/impl/FileUploadConfigDaoImpl.java b/oss-dal/src/main/java/cn/axzo/oss/dal/repository/impl/FileUploadConfigDaoImpl.java index 24f506a..9557cff 100644 --- a/oss-dal/src/main/java/cn/axzo/oss/dal/repository/impl/FileUploadConfigDaoImpl.java +++ b/oss-dal/src/main/java/cn/axzo/oss/dal/repository/impl/FileUploadConfigDaoImpl.java @@ -1,5 +1,6 @@ package cn.axzo.oss.dal.repository.impl; +import cn.axzo.oss.common.enums.IsDeleteEnum; import cn.axzo.oss.dal.entity.FileUploadConfig; import cn.axzo.oss.dal.mapper.FileUploadConfigMapper; import cn.axzo.oss.dal.repository.FileUploadConfigDao; @@ -15,6 +16,20 @@ import org.springframework.stereotype.Repository; * @since 2021-07-23 */ @Repository("fileUploadConfigDao") -public class FileUploadConfigDaoImpl extends ServiceImpl implements FileUploadConfigDao { +public class FileUploadConfigDaoImpl extends + ServiceImpl implements FileUploadConfigDao { + /** + * 通过渠道码和桶名称获取获取指定上传配置 + * + * @param bucketNo + * @param directory + * @return + */ + @Override + public FileUploadConfig getByUploadConfig(String bucketNo, String directory) { + return lambdaQuery().eq(FileUploadConfig::getAppChannelBucketNo, bucketNo) + .eq(FileUploadConfig::getDirectory, directory) + .eq(FileUploadConfig::getIsDelete, IsDeleteEnum.NO.getCode()).one(); + } } diff --git a/oss-service-api/src/main/java/cn/axzo/oss/service/api/FileService.java b/oss-service-api/src/main/java/cn/axzo/oss/service/api/FileService.java index ae5da6c..47a822e 100644 --- a/oss-service-api/src/main/java/cn/axzo/oss/service/api/FileService.java +++ b/oss-service-api/src/main/java/cn/axzo/oss/service/api/FileService.java @@ -23,5 +23,5 @@ public interface FileService { * * @param request */ - void update(ServerFileUploadDto request); + void upload(ServerFileUploadDto request); } diff --git a/oss-service/src/main/java/cn/axzo/oss/service/impl/FileServiceImpl.java b/oss-service/src/main/java/cn/axzo/oss/service/impl/FileServiceImpl.java index 8396c57..62f1a42 100644 --- a/oss-service/src/main/java/cn/axzo/oss/service/impl/FileServiceImpl.java +++ b/oss-service/src/main/java/cn/axzo/oss/service/impl/FileServiceImpl.java @@ -2,18 +2,34 @@ package cn.axzo.oss.service.impl; import cn.axzo.oss.common.constans.CommonConstants.FileStatus; import cn.axzo.oss.common.constans.CommonConstants.TableDelete; +import cn.axzo.oss.common.enums.CodeEnum; +import cn.axzo.oss.common.exception.BizException; import cn.axzo.oss.common.utils.JsonUtil; import cn.axzo.oss.common.utils.Utility; +import cn.axzo.oss.dal.entity.AppChannelBucket; import cn.axzo.oss.dal.entity.File; +import cn.axzo.oss.dal.entity.FileApp; +import cn.axzo.oss.dal.entity.FileBusinessScene; +import cn.axzo.oss.dal.entity.FileChannel; +import cn.axzo.oss.dal.entity.FileUploadConfig; +import cn.axzo.oss.dal.repository.AppChannelBucketDao; +import cn.axzo.oss.dal.repository.FileAppDao; +import cn.axzo.oss.dal.repository.FileBusinessSceneDao; +import cn.axzo.oss.dal.repository.FileChannelDao; import cn.axzo.oss.dal.repository.FileDao; +import cn.axzo.oss.dal.repository.FileUploadConfigDao; import cn.axzo.oss.manager.api.FileManager; import cn.axzo.oss.manager.api.dto.request.ServerFileDeleteDto; import cn.axzo.oss.manager.api.dto.request.ServerFileUploadDto; import cn.axzo.oss.service.api.FileService; import com.alibaba.fastjson.JSON; +import com.google.common.collect.Lists; +import java.util.ArrayList; +import java.util.List; import lombok.extern.slf4j.Slf4j; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; +import org.springframework.util.ObjectUtils; /** * @Author admin @@ -31,6 +47,17 @@ public class FileServiceImpl implements FileService { @Autowired private FileDao fileDao; + @Autowired + private FileAppDao fileAppDao; + @Autowired + private AppChannelBucketDao appChannelBucketDao; + @Autowired + private FileChannelDao fileChannelDao; + @Autowired + private FileBusinessSceneDao fileBusinessSceneDao; + @Autowired + private FileUploadConfigDao fileUploadConfigDao; + /** * 删除文件 * @@ -67,7 +94,7 @@ public class FileServiceImpl implements FileService { * @param dto */ @Override - public void update(ServerFileUploadDto dto) { + public void upload(ServerFileUploadDto dto) { log.info("update dto:{}", JSON.toJSONString(dto)); /** * 1.检查app @@ -77,5 +104,61 @@ public class FileServiceImpl implements FileService { * 5.检查文件大小，格式 * 6.上传至oss */ + FileApp fileAppByAppCode = fileAppDao.getByAppCode(dto.getAppCode()); + if (fileAppByAppCode == null) { + log.error("upload 未找到对应编码 appCode:{}", dto.getAppCode()); + throw new BizException(CodeEnum.APP_CODE_NOT_FOUND); + } + + List appChannelBuckets = appChannelBucketDao + .getByAppCode(dto.getAppCode()); + if (ObjectUtils.isEmpty(appChannelBuckets)) { + log.error("upload 文件渠道桶信息不存在 appCode:{}", dto.getAppCode()); + throw new BizException(CodeEnum.APP_CHANNEL_BUCKET_NOT_FOUND); + } + + // todo 判断权限 + + // 找到最优渠道 + ArrayList channels = Lists.newArrayList(); + appChannelBuckets.forEach(appChannelBucket -> channels.add(appChannelBucket.getChannelCode())); + + List fileChannels = fileChannelDao.getByChannelCode(channels); + if (ObjectUtils.isEmpty(fileChannels)) { + log.error("upload 最优渠道为空 channels:{}", channels); + throw new BizException(CodeEnum.APP_CHANNEL_NOT_FOUND); + } + + FileChannel fileChannel = fileChannels.get(0); + AppChannelBucket appChannelBucket = appChannelBuckets.stream().filter(bucket -> + bucket.getChannelCode().equals(fileChannel.getChannelCode())) + .findFirst().orElse(null); + + // 通过渠道桶编码获取到具体文件业务场景 + FileBusinessScene scene = fileBusinessSceneDao + .getByBucketNoAndScene(appChannelBucket.getAppChannelBucketNo(), dto.getBizScene()); + if (scene == null) { + log.error("upload 渠道不存在 appCode:{},bizScene:{}", dto.getAppCode(), dto.getBizScene()); + throw new BizException(CodeEnum.APP_CHANNEL_NOT_FOUND); + } + + FileUploadConfig fileUploadConfig = fileUploadConfigDao + .getByUploadConfig(scene.getAppChannelBucketNo(), scene.getDirectory()); + if (fileUploadConfig == null) { + log.error("upload 上传配置不存在 bucketNo:{},bucketName:{}", scene.getAppChannelBucketNo() + , scene.getBucketName()); + throw new BizException(CodeEnum.NO_UPLOAD_CONFIG); + } + + // 判断容量 + int size = Utility + .capacityConversion(fileUploadConfig.getStorageSize(), fileUploadConfig.getStorageUnit()); + if (dto.getFileContent().length > size) { + log.error("upload 文件大小超出上限 file size:{},storageSize:{}", dto.getFileContent().length + , size); + throw new BizException(CodeEnum.FILE_SIZE_EXCEEDS_LIMIT); + } + // todo 文件格式判断 + } }