diff --git a/common/src/main/java/com/sdm/common/common/Constants.java b/common/src/main/java/com/sdm/common/common/Constants.java deleted file mode 100644 index eaa07fad..00000000 --- a/common/src/main/java/com/sdm/common/common/Constants.java +++ /dev/null @@ -1,146 +0,0 @@ -package com.sdm.common.common; - -import io.swagger.v3.oas.annotations.media.Schema; - -public class Constants { - public enum DataType { - DIRECTORY(1), - FILE(2); - int value; - - DataType(int i) { - value = i; - } - - public int getValue() { - return value; - } - } - - public enum FileIsLast { - YES(true), - NO(false); - Boolean value; - - FileIsLast(boolean i) { - value = i; - } - - public boolean getValue() { - return value; - } - } - - public enum FilePermission { - READ((byte) 0x01), - WRITE((byte) 0x02), - DELETE((byte) 0x04), - DOWNLOAD((byte) 0x08), - UPLOAD((byte) 0x10), - NONE((byte) -1), - ZERO((byte) 0), - ALL((byte) (READ.value | WRITE.value | DELETE.value | DOWNLOAD.value | UPLOAD.value)); - byte value; - - FilePermission(byte i) { - } - - public byte getValue() { - return value; - } - } - - @Schema(description = "文件夹类型枚举") - public enum DirType { - /** - * 知识库文件夹 - */ - @Schema(description = "知识库文件夹", example = "1") - KNOWLEDGE_BASE_DIR("knowledge", 1), - - /** - * 项目节点文件夹 - */ - @Schema(description = "项目节点文件夹", example = "2") - PROJECT_NODE_DIR("projectNode", 2), - - /** - * 头像库文件夹 - */ - @Schema(description = "头像库文件夹", example = "3") - AVATAR_DIR("avatar", 3), - - /** - * 仿真参数库文件夹 - */ - @Schema(description = "仿真参数库文件夹", example = "4") - SIMULATION_PARAMETER_DIR("simulationParameter", 4), - - /** - * 训练模型文件夹 - */ - @Schema(description = "训练模型文件", example = "5") - TRAIN_MODEL_DIR("trainModel", 5); - - String dirName; - int value; - - DirType(String dirName, int value) { - this.dirName = dirName; - this.value = value; - } - - public int getValue() { - return value; - } - - public String getDirName() { - return dirName; - } - - // 根据value获取对应的枚举 - public static DirType getDirTypeByValue(int value) { - for (DirType dirType : values()) { - if (dirType.value == value) { - return dirType; - } - } - return null; - } - } - - // 仿真参数库数据类型 - public enum SimulationParameterDataType { - //库类型 - LIBRARY(1), - // 分类类型 - CATEGORY(2), - // 对象类型 - OBJECT(3); - int value; - - SimulationParameterDataType(int i) { - value = i; - } - - public int getValue() { - return value; - } - } - - public enum NodeTypeEnum { - NODE("node"), - TASK("task"), - RUN("run"), - PERFORMANCE("performance"); - String value; - - NodeTypeEnum(String i) { - value = i; - } - - public String getValue() { - return value; - } - } -} diff --git a/common/src/main/java/com/sdm/common/entity/enums/DataTypeEnum.java b/common/src/main/java/com/sdm/common/entity/enums/DataTypeEnum.java new file mode 100644 index 00000000..ee0c67bd --- /dev/null +++ b/common/src/main/java/com/sdm/common/entity/enums/DataTypeEnum.java @@ -0,0 +1,15 @@ +package com.sdm.common.entity.enums; + +public enum DataTypeEnum { + DIRECTORY(1), + FILE(2); + int value; + + DataTypeEnum(int i) { + value = i; + } + + public int getValue() { + return value; + } +} \ No newline at end of file diff --git a/common/src/main/java/com/sdm/common/entity/enums/DirTypeEnum.java b/common/src/main/java/com/sdm/common/entity/enums/DirTypeEnum.java new file mode 100644 index 00000000..408dbb1b --- /dev/null +++ b/common/src/main/java/com/sdm/common/entity/enums/DirTypeEnum.java @@ -0,0 +1,62 @@ +package com.sdm.common.entity.enums; + +import io.swagger.v3.oas.annotations.media.Schema; + +@Schema(description = "文件夹类型枚举") +public enum DirTypeEnum { + /** + * 知识库文件夹 + */ + @Schema(description = "知识库文件夹", example = "1") + KNOWLEDGE_BASE_DIR("knowledge", 1), + + /** + * 项目节点文件夹 + */ + @Schema(description = "项目节点文件夹", example = "2") + PROJECT_NODE_DIR("projectNode", 2), + + /** + * 头像库文件夹 + */ + @Schema(description = "头像库文件夹", example = "3") + AVATAR_DIR("avatar", 3), + + /** + * 仿真参数库文件夹 + */ + @Schema(description = "仿真参数库文件夹", example = "4") + SIMULATION_PARAMETER_DIR("simulationParameter", 4), + + /** + * 训练模型文件夹 + */ + @Schema(description = "训练模型文件", example = "5") + TRAIN_MODEL_DIR("trainModel", 5); + + String dirName; + int value; + + DirTypeEnum(String dirName, int value) { + this.dirName = dirName; + this.value = value; + } + + public int getValue() { + return value; + } + + public String getDirName() { + return dirName; + } + + // 根据value获取对应的枚举 + public static DirTypeEnum getDirTypeByValue(int value) { + for (DirTypeEnum dirTypeEnum : values()) { + if (dirTypeEnum.value == value) { + return dirTypeEnum; + } + } + return null; + } +} diff --git a/common/src/main/java/com/sdm/common/entity/enums/FileIsLastEnum.java b/common/src/main/java/com/sdm/common/entity/enums/FileIsLastEnum.java new file mode 100644 index 00000000..7f3e9f30 --- /dev/null +++ b/common/src/main/java/com/sdm/common/entity/enums/FileIsLastEnum.java @@ -0,0 +1,15 @@ +package com.sdm.common.entity.enums; + +public enum FileIsLastEnum { + YES(true), + NO(false); + Boolean value; + + FileIsLastEnum(boolean i) { + value = i; + } + + public boolean getValue() { + return value; + } +} \ No newline at end of file diff --git a/common/src/main/java/com/sdm/common/entity/enums/FilePermissionEnum.java b/common/src/main/java/com/sdm/common/entity/enums/FilePermissionEnum.java new file mode 100644 index 00000000..568661e8 --- /dev/null +++ b/common/src/main/java/com/sdm/common/entity/enums/FilePermissionEnum.java @@ -0,0 +1,20 @@ +package com.sdm.common.entity.enums; + +public enum FilePermissionEnum { + READ((byte) 0x01), + WRITE((byte) 0x02), + DELETE((byte) 0x04), + DOWNLOAD((byte) 0x08), + UPLOAD((byte) 0x10), + NONE((byte) -1), + ZERO((byte) 0), + ALL((byte) (READ.value | WRITE.value | DELETE.value | DOWNLOAD.value | UPLOAD.value)); + byte value; + + FilePermissionEnum(byte i) { + } + + public byte getValue() { + return value; + } +} diff --git a/common/src/main/java/com/sdm/common/entity/enums/NodeTypeEnum.java b/common/src/main/java/com/sdm/common/entity/enums/NodeTypeEnum.java new file mode 100644 index 00000000..8cb07d85 --- /dev/null +++ b/common/src/main/java/com/sdm/common/entity/enums/NodeTypeEnum.java @@ -0,0 +1,18 @@ +package com.sdm.common.entity.enums; + + +public enum NodeTypeEnum { + NODE("node"), + TASK("task"), + RUN("run"), + PERFORMANCE("performance"); + String value; + + NodeTypeEnum(String i) { + value = i; + } + + public String getValue() { + return value; + } +} \ No newline at end of file diff --git a/common/src/main/java/com/sdm/common/entity/enums/SimulationParameterDataTypeEnum.java b/common/src/main/java/com/sdm/common/entity/enums/SimulationParameterDataTypeEnum.java new file mode 100644 index 00000000..11e31296 --- /dev/null +++ b/common/src/main/java/com/sdm/common/entity/enums/SimulationParameterDataTypeEnum.java @@ -0,0 +1,20 @@ +package com.sdm.common.entity.enums; + +// 仿真参数库数据类型 +public enum SimulationParameterDataTypeEnum { + //库类型 + LIBRARY(1), + // 分类类型 + CATEGORY(2), + // 对象类型 + OBJECT(3); + int value; + + SimulationParameterDataTypeEnum(int i) { + value = i; + } + + public int getValue() { + return value; + } +} diff --git a/data/src/main/java/com/sdm/data/aop/PermissionCheckAspect.java b/data/src/main/java/com/sdm/data/aop/PermissionCheckAspect.java index eb1c40c8..b8d86ab9 100644 --- a/data/src/main/java/com/sdm/data/aop/PermissionCheckAspect.java +++ b/data/src/main/java/com/sdm/data/aop/PermissionCheckAspect.java @@ -1,7 +1,7 @@ package com.sdm.data.aop; import com.sdm.common.common.ThreadLocalContext; -import com.sdm.common.common.Constants; +import com.sdm.common.entity.enums.FilePermissionEnum; import com.sdm.data.service.IFileUserPermissionService; import org.aspectj.lang.JoinPoint; import org.aspectj.lang.annotation.Aspect; @@ -39,6 +39,6 @@ public class PermissionCheckAspect { @Retention(RetentionPolicy.RUNTIME) @Target(ElementType.METHOD) public @interface FilePermissionCheck { - Constants.FilePermission value(); + FilePermissionEnum value(); } } diff --git a/data/src/main/java/com/sdm/data/service/IFileUserPermissionService.java b/data/src/main/java/com/sdm/data/service/IFileUserPermissionService.java index 5241cc86..7d0d856d 100644 --- a/data/src/main/java/com/sdm/data/service/IFileUserPermissionService.java +++ b/data/src/main/java/com/sdm/data/service/IFileUserPermissionService.java @@ -1,6 +1,6 @@ package com.sdm.data.service; -import com.sdm.common.common.Constants; +import com.sdm.common.entity.enums.FilePermissionEnum; import com.sdm.data.model.entity.FileUserPermission; import com.baomidou.mybatisplus.extension.service.IService; @@ -20,5 +20,5 @@ public interface IFileUserPermissionService extends IService * @param permission 权限类型 * @return 是否有权限 */ - boolean hasFilePermission(Long fileId, Long userId, Constants.FilePermission permission); + boolean hasFilePermission(Long fileId, Long userId, FilePermissionEnum permission); } diff --git a/data/src/main/java/com/sdm/data/service/impl/DataAnalysisServiceImpl.java b/data/src/main/java/com/sdm/data/service/impl/DataAnalysisServiceImpl.java index c25c6059..572339aa 100644 --- a/data/src/main/java/com/sdm/data/service/impl/DataAnalysisServiceImpl.java +++ b/data/src/main/java/com/sdm/data/service/impl/DataAnalysisServiceImpl.java @@ -1,11 +1,9 @@ package com.sdm.data.service.impl; import com.alibaba.fastjson2.JSONObject; -import com.baomidou.mybatisplus.core.toolkit.ObjectUtils; -import com.github.pagehelper.PageHelper; import com.github.pagehelper.PageInfo; -import com.sdm.common.common.Constants; import com.sdm.common.common.SdmResponse; +import com.sdm.common.entity.enums.FileIsLastEnum; import com.sdm.common.entity.resp.PageDataResp; import com.sdm.common.utils.FileSizeUtils; import com.sdm.common.utils.PageUtils; @@ -67,7 +65,7 @@ public class DataAnalysisServiceImpl implements IDataAnalysisService { List simulationTaskFileMetadataInfos = fileMetadataInfoService .lambdaQuery() .in(FileMetadataInfo::getId, fileIdList) - .eq(FileMetadataInfo::getIsLatest, Constants.FileIsLast.YES.getValue()) + .eq(FileMetadataInfo::getIsLatest, FileIsLastEnum.YES.getValue()) .list(); PageInfo pageInfo = new PageInfo<>(simulationTaskFileMetadataInfos); diff --git a/data/src/main/java/com/sdm/data/service/impl/DataStorageAnalysisImpl.java b/data/src/main/java/com/sdm/data/service/impl/DataStorageAnalysisImpl.java index 1ab3a0c2..33efd8a1 100644 --- a/data/src/main/java/com/sdm/data/service/impl/DataStorageAnalysisImpl.java +++ b/data/src/main/java/com/sdm/data/service/impl/DataStorageAnalysisImpl.java @@ -3,7 +3,6 @@ package com.sdm.data.service.impl; import com.alibaba.fastjson2.JSONObject; import com.github.pagehelper.PageHelper; import com.github.pagehelper.PageInfo; -import com.sdm.common.common.Constants; import com.sdm.common.common.SdmResponse; import com.sdm.common.common.ThreadLocalContext; import com.sdm.common.entity.req.system.UserListReq; diff --git a/data/src/main/java/com/sdm/data/service/impl/FileUserPermissionServiceImpl.java b/data/src/main/java/com/sdm/data/service/impl/FileUserPermissionServiceImpl.java index f11abd8d..ef3318cd 100644 --- a/data/src/main/java/com/sdm/data/service/impl/FileUserPermissionServiceImpl.java +++ b/data/src/main/java/com/sdm/data/service/impl/FileUserPermissionServiceImpl.java @@ -1,7 +1,7 @@ package com.sdm.data.service.impl; import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; -import com.sdm.common.common.Constants; +import com.sdm.common.entity.enums.FilePermissionEnum; import com.sdm.data.dao.FileUserPermissionMapper; import com.sdm.data.model.entity.FileUserPermission; import com.sdm.data.service.IFileMetadataInfoService; @@ -23,7 +23,7 @@ public class FileUserPermissionServiceImpl extends ServiceImpl INIT_DIR = List.of( - Constants.DirType.KNOWLEDGE_BASE_DIR, Constants.DirType.PROJECT_NODE_DIR, - Constants.DirType.AVATAR_DIR, Constants.DirType.SIMULATION_PARAMETER_DIR, Constants.DirType.TRAIN_MODEL_DIR); + private static final List INIT_DIR = List.of( + DirTypeEnum.KNOWLEDGE_BASE_DIR, DirTypeEnum.PROJECT_NODE_DIR, + DirTypeEnum.AVATAR_DIR, DirTypeEnum.SIMULATION_PARAMETER_DIR, DirTypeEnum.TRAIN_MODEL_DIR); @Value("${fileSystem.minio}") @@ -242,7 +240,7 @@ public class MinioFileIDataFileServiceImpl implements IDataFileService { return SdmResponse.failed("请选择目录类型:1 知识库文件夹，2 项目节点文件夹，3 头像库文件夹，4 仿真参数库文件夹,5 训练模型文件夹"); } - Constants.DirType dirTypeByValue = Constants.DirType.getDirTypeByValue(req.getDirType()); + DirTypeEnum dirTypeByValue = DirTypeEnum.getDirTypeByValue(req.getDirType()); if (dirTypeByValue == null) { return SdmResponse.failed("请选择正确的目录类型:1 知识库文件夹，2 项目节点文件夹，3 头像库文件夹，4 仿真参数库文件夹,5 训练模型文件夹"); } @@ -321,7 +319,7 @@ public class MinioFileIDataFileServiceImpl implements IDataFileService { return SdmResponse.failed("目录已存在"); } - boolean hasWritePermission = fileUserPermissionService.hasFilePermission(parDirId, ThreadLocalContext.getUserId(), Constants.FilePermission.WRITE); + boolean hasWritePermission = fileUserPermissionService.hasFilePermission(parDirId, ThreadLocalContext.getUserId(), FilePermissionEnum.WRITE); if (!hasWritePermission) { return SdmResponse.failed("没有写入权限"); } @@ -369,7 +367,7 @@ public class MinioFileIDataFileServiceImpl implements IDataFileService { dirInfo.setObjectKey(minioObjectKey); dirInfo.setBucketName(minioService.getBucketName()); dirInfo.setOriginalName(originalName); - dirInfo.setDataType(Constants.DataType.DIRECTORY.getValue()); + dirInfo.setDataType(DataTypeEnum.DIRECTORY.getValue()); dirInfo.setIsRoot(isRoot); dirInfo.setDirType(dirType); if (!isRoot && parentId != null) { @@ -405,7 +403,7 @@ public class MinioFileIDataFileServiceImpl implements IDataFileService { fileInfo.setProjectId(projectId); fileInfo.setAnalysisDirectionId(analysisDirectionId); fileInfo.setRemarks(remarks); - fileInfo.setDataType(Constants.DataType.FILE.getValue()); + fileInfo.setDataType(DataTypeEnum.FILE.getValue()); fileInfo.setFileType(fileType); fileInfo.setParentId(parentId); fileInfo.setIsRoot(false); @@ -423,7 +421,7 @@ public class MinioFileIDataFileServiceImpl implements IDataFileService { if (StringUtils.hasText(ThreadLocalContext.getCommonHeader().getJobNumber())) { FileUserPermission permission = new FileUserPermission(); permission.setTFilemetaId(directoryId); - permission.setPermission(Constants.FilePermission.ALL.getValue()); + permission.setPermission(FilePermissionEnum.ALL.getValue()); permission.setUserId(ThreadLocalContext.getUserId()); fileUserPermissionService.save(permission); } @@ -438,7 +436,7 @@ public class MinioFileIDataFileServiceImpl implements IDataFileService { private void createFilePermission(Long fileId) { FileUserPermission permission = new FileUserPermission(); permission.setTFilemetaId(fileId); - permission.setPermission(Constants.FilePermission.ALL.getValue()); + permission.setPermission(FilePermissionEnum.ALL.getValue()); permission.setUserId(ThreadLocalContext.getUserId()); fileUserPermissionService.save(permission); } @@ -492,7 +490,7 @@ public class MinioFileIDataFileServiceImpl implements IDataFileService { String dirMinioObjectKey = deleteDirMetadataInfo.getObjectKey(); Long deleteDirId = deleteDirMetadataInfo.getId(); - boolean hasDeletePermission = fileUserPermissionService.hasFilePermission(deleteDirId, ThreadLocalContext.getUserId(), Constants.FilePermission.DELETE); + boolean hasDeletePermission = fileUserPermissionService.hasFilePermission(deleteDirId, ThreadLocalContext.getUserId(), FilePermissionEnum.DELETE); if (!hasDeletePermission) { return SdmResponse.failed("没有删除权限"); } @@ -544,7 +542,7 @@ public class MinioFileIDataFileServiceImpl implements IDataFileService { String deleteFileMinioObejctKey = deleteFileMetadataInfo.getObjectKey(); - boolean hasDeletePermission = fileUserPermissionService.hasFilePermission(deleteFileMetadataInfo.getId(), ThreadLocalContext.getUserId(), Constants.FilePermission.DELETE); + boolean hasDeletePermission = fileUserPermissionService.hasFilePermission(deleteFileMetadataInfo.getId(), ThreadLocalContext.getUserId(), FilePermissionEnum.DELETE); if (!hasDeletePermission) { return SdmResponse.failed("没有删除权限"); } @@ -598,7 +596,7 @@ public class MinioFileIDataFileServiceImpl implements IDataFileService { List files = fileMetadataInfoService .lambdaQuery() .in(FileMetadataInfo::getId, fileIdList) - .eq(FileMetadataInfo::getIsLatest, Constants.FileIsLast.YES.getValue()) + .eq(FileMetadataInfo::getIsLatest, FileIsLastEnum.YES.getValue()) // 这里是知识库文件只展示已经审批通过的文件 .eq(FileMetadataInfo::getApproveType, NumberConstants.ZERO) .list(); @@ -649,7 +647,7 @@ public class MinioFileIDataFileServiceImpl implements IDataFileService { .eq(ObjectUtils.isNotEmpty(req.getUploadUserId()), FileMetadataInfo::getCreatorId, req.getUploadUserId()) .eq(ObjectUtils.isNotEmpty(req.getQueryTarget()), FileMetadataInfo::getDataType, req.getQueryTarget()) .like(ObjectUtils.isNotEmpty(req.getFileName()), FileMetadataInfo::getOriginalName, req.getFileName()) - .eq(FileMetadataInfo::getIsLatest, Constants.FileIsLast.YES.getValue()) + .eq(FileMetadataInfo::getIsLatest, FileIsLastEnum.YES.getValue()) .eq(FileMetadataInfo::getApproveType, NumberConstants.ZERO) .list(); if (ObjectUtils.isEmpty(list)) { @@ -699,7 +697,7 @@ public class MinioFileIDataFileServiceImpl implements IDataFileService { .collect(Collectors.toMap(FileUserPermission::getUserId, FileUserPermission::getPermission)); users.forEach(user -> { - user.setPermission(userPermissionMap.getOrDefault(user.getUserId(), Constants.FilePermission.ZERO.getValue())); + user.setPermission(userPermissionMap.getOrDefault(user.getUserId(), FilePermissionEnum.ZERO.getValue())); }); return SdmResponse.success(cidUserResp); } @@ -784,7 +782,7 @@ public class MinioFileIDataFileServiceImpl implements IDataFileService { @Override @Transactional(rollbackFor = Exception.class) public boolean initSystemDirectory(String company) { - for (Constants.DirType dirType : INIT_DIR) { + for (DirTypeEnum dirType : INIT_DIR) { String dirMinioObjectKey = getDirMinioObjectKey(dirType.getDirName()); try { // 检查目录是否已存在 @@ -825,7 +823,7 @@ public class MinioFileIDataFileServiceImpl implements IDataFileService { return SdmResponse.failed("文件不存在"); } - boolean hasWritePermission = fileUserPermissionService.hasFilePermission(fileMetadataInfo.getId(), ThreadLocalContext.getUserId(), Constants.FilePermission.WRITE); + boolean hasWritePermission = fileUserPermissionService.hasFilePermission(fileMetadataInfo.getId(), ThreadLocalContext.getUserId(), FilePermissionEnum.WRITE); if (!hasWritePermission) { return SdmResponse.failed("没有写入权限"); } @@ -858,7 +856,7 @@ public class MinioFileIDataFileServiceImpl implements IDataFileService { String oldDirMinioObjectKey = dirMetadataInfo.getObjectKey(); - boolean hasWritePermission = fileUserPermissionService.hasFilePermission(dirMetadataInfo.getId(), ThreadLocalContext.getUserId(), Constants.FilePermission.WRITE); + boolean hasWritePermission = fileUserPermissionService.hasFilePermission(dirMetadataInfo.getId(), ThreadLocalContext.getUserId(), FilePermissionEnum.WRITE); if (!hasWritePermission) { return SdmResponse.failed("没有写入权限"); } @@ -899,7 +897,7 @@ public class MinioFileIDataFileServiceImpl implements IDataFileService { } String fileObjectKey = fileMetadataInfo.getObjectKey(); - boolean hasDownloadPermission = fileUserPermissionService.hasFilePermission(fileMetadataInfo.getId(), ThreadLocalContext.getUserId(), Constants.FilePermission.DOWNLOAD); + boolean hasDownloadPermission = fileUserPermissionService.hasFilePermission(fileMetadataInfo.getId(), ThreadLocalContext.getUserId(), FilePermissionEnum.DOWNLOAD); if (!hasDownloadPermission) { response.sendError(HttpServletResponse.SC_NON_AUTHORITATIVE_INFORMATION, "用户无权限"); return; @@ -957,7 +955,7 @@ public class MinioFileIDataFileServiceImpl implements IDataFileService { } else { return SdmResponse.failed("目录ID不能为空"); } - FileMetadataInfo dirMetadataInfo = fileMetadataInfoService.lambdaQuery().eq(FileMetadataInfo::getId, dirId).eq(FileMetadataInfo::getDataType, Constants.DataType.DIRECTORY.getValue()).one(); + FileMetadataInfo dirMetadataInfo = fileMetadataInfoService.lambdaQuery().eq(FileMetadataInfo::getId, dirId).eq(FileMetadataInfo::getDataType, DataTypeEnum.DIRECTORY.getValue()).one(); if (dirMetadataInfo == null) { return SdmResponse.failed("目录不存在"); } @@ -979,7 +977,7 @@ public class MinioFileIDataFileServiceImpl implements IDataFileService { String fileMinioObjectKey = getFileMinioObjectKey(dirMetadataInfo.getObjectKey() + modifiedFileName); - boolean hasUploadPermission = fileUserPermissionService.hasFilePermission(dirMetadataInfo.getId(), ThreadLocalContext.getUserId(), Constants.FilePermission.UPLOAD); + boolean hasUploadPermission = fileUserPermissionService.hasFilePermission(dirMetadataInfo.getId(), ThreadLocalContext.getUserId(), FilePermissionEnum.UPLOAD); if (!hasUploadPermission) { return SdmResponse.failed("没有上传权限"); } @@ -1088,7 +1086,7 @@ public class MinioFileIDataFileServiceImpl implements IDataFileService { return SdmResponse.failed("请选择目录类型:1 知识库文件夹，2 项目节点文件夹，3 头像库文件夹，4 仿真参数库文件夹,5 训练模型文件夹"); } - Constants.DirType dirTypeByValue = Constants.DirType.getDirTypeByValue(dirType); + DirTypeEnum dirTypeByValue = DirTypeEnum.getDirTypeByValue(dirType); if (dirTypeByValue == null) { return SdmResponse.failed("请选择正确的目录类型:1 知识库文件夹，2 项目节点文件夹，3 头像库文件夹，4 仿真参数库文件夹,5 训练模型文件夹"); } @@ -1110,7 +1108,7 @@ public class MinioFileIDataFileServiceImpl implements IDataFileService { } else { fileMetadataInfoLambdaQueryChainWrapper.eq(FileMetadataInfo::getParentId, parentDirId); } - List list = fileMetadataInfoLambdaQueryChainWrapper.eq(FileMetadataInfo::getDataType, Constants.DataType.DIRECTORY.getValue()).list(); + List list = fileMetadataInfoLambdaQueryChainWrapper.eq(FileMetadataInfo::getDataType, DataTypeEnum.DIRECTORY.getValue()).list(); List dtoList = list.stream().map(entity -> { FileMetadataInfoResp dto = new FileMetadataInfoResp(); @@ -1133,7 +1131,7 @@ public class MinioFileIDataFileServiceImpl implements IDataFileService { return SdmResponse.failed("文件不存在"); } - boolean hasUploadPermission = fileUserPermissionService.hasFilePermission(fileMetadataInfo.getId(), ThreadLocalContext.getUserId(), Constants.FilePermission.UPLOAD); + boolean hasUploadPermission = fileUserPermissionService.hasFilePermission(fileMetadataInfo.getId(), ThreadLocalContext.getUserId(), FilePermissionEnum.UPLOAD); if (!hasUploadPermission) { return SdmResponse.failed("没有更新权限"); } @@ -1256,7 +1254,7 @@ public class MinioFileIDataFileServiceImpl implements IDataFileService { @Transactional(rollbackFor = Exception.class) public SdmResponse uploadAvatar(MultipartFile avatar) { // 先创建 avatar 目录 - String dirMinioObjectKey = getDirMinioObjectKey(Constants.DirType.AVATAR_DIR.getDirName()); + String dirMinioObjectKey = getDirMinioObjectKey(DirTypeEnum.AVATAR_DIR.getDirName()); Optional fileMetadataInfoByObjectKey = getFileMetadataInfoByObjectKey(dirMinioObjectKey); // 检查目录是否已存在 if (!fileMetadataInfoByObjectKey.isPresent()) { @@ -1317,7 +1315,7 @@ public class MinioFileIDataFileServiceImpl implements IDataFileService { @Transactional(rollbackFor = Exception.class) public SdmResponse uploadSimulationParamFile(MultipartFile paramFile) { // 先创建 simulationParameter 目录 - String dirMinioObjectKey = getDirMinioObjectKey(Constants.DirType.SIMULATION_PARAMETER_DIR.getDirName()); + String dirMinioObjectKey = getDirMinioObjectKey(DirTypeEnum.SIMULATION_PARAMETER_DIR.getDirName()); Optional fileMetadataInfoByObjectKey = getFileMetadataInfoByObjectKey(dirMinioObjectKey); // 检查目录是否已存在 if (!fileMetadataInfoByObjectKey.isPresent()) { @@ -1376,7 +1374,7 @@ public class MinioFileIDataFileServiceImpl implements IDataFileService { @Transactional(rollbackFor = Exception.class) public SdmResponse uploadTrainModelDataFile(MultipartFile trainModelFile) { // 先创建 trainModel 目录 - String dirMinioObjectKey = getDirMinioObjectKey(Constants.DirType.TRAIN_MODEL_DIR.getDirName()); + String dirMinioObjectKey = getDirMinioObjectKey(DirTypeEnum.TRAIN_MODEL_DIR.getDirName()); Optional fileMetadataInfoByObjectKey = getFileMetadataInfoByObjectKey(dirMinioObjectKey); // 检查目录是否已存在 if (!fileMetadataInfoByObjectKey.isPresent()) { diff --git a/data/src/main/java/com/sdm/data/service/impl/SimulationParameterLibraryServiceImpl.java b/data/src/main/java/com/sdm/data/service/impl/SimulationParameterLibraryServiceImpl.java index 7af7e2f9..081ebc1d 100644 --- a/data/src/main/java/com/sdm/data/service/impl/SimulationParameterLibraryServiceImpl.java +++ b/data/src/main/java/com/sdm/data/service/impl/SimulationParameterLibraryServiceImpl.java @@ -4,8 +4,8 @@ import com.alibaba.fastjson2.JSONObject; import com.alibaba.nacos.client.naming.utils.CollectionUtils; import com.fasterxml.jackson.databind.JsonNode; import com.fasterxml.jackson.databind.ObjectMapper; -import com.sdm.common.common.Constants; import com.sdm.common.common.SdmResponse; +import com.sdm.common.entity.enums.SimulationParameterDataTypeEnum; import com.sdm.data.model.entity.SimulationParameterLibrary; import com.sdm.data.dao.SimulationParameterLibraryMapper; import com.sdm.data.model.entity.SimulationParameterLibraryCategory; @@ -97,14 +97,14 @@ public class SimulationParameterLibraryServiceImpl extends ServiceImpl { JSONObject jsonObject = new JSONObject(); jsonObject.put("id", simulationParameterLibrary.getId()); - jsonObject.put("type", Constants.SimulationParameterDataType.LIBRARY.getValue()); + jsonObject.put("type", SimulationParameterDataTypeEnum.LIBRARY.getValue()); jsonObject.put("name", simulationParameterLibrary.getParameterLibraryName()); jsonObjects.add(jsonObject); }); return SdmResponse.success(jsonObjects); } - if (type == Constants.SimulationParameterDataType.LIBRARY.getValue()) { + if (type == SimulationParameterDataTypeEnum.LIBRARY.getValue()) { // 获取指定仿真参数库分类 SimulationParameterLibrary simulationParameterLibrary = this.getById(id); if (simulationParameterLibrary != null) { @@ -118,7 +118,7 @@ public class SimulationParameterLibraryServiceImpl extends ServiceImpl { JSONObject jsonObject = new JSONObject(); jsonObject.put("id", simulationParameterLibraryCategory.getId()); - jsonObject.put("type", Constants.SimulationParameterDataType.CATEGORY.getValue()); + jsonObject.put("type", SimulationParameterDataTypeEnum.CATEGORY.getValue()); jsonObject.put("name", simulationParameterLibraryCategory.getParameterLibraryCategoryName()); jsonObjects.add(jsonObject); }); @@ -126,7 +126,7 @@ public class SimulationParameterLibraryServiceImpl extends ServiceImpl simulationParameterLibraryCategoryObjects = simulationParameterLibraryCategoryObjectService .lambdaQuery().eq(SimulationParameterLibraryCategoryObject::getParameterLibraryCategoryId, id).list(); @@ -136,7 +136,7 @@ public class SimulationParameterLibraryServiceImpl extends ServiceImpl { JSONObject jsonObject = new JSONObject(); jsonObject.put("id", simulationParameterLibraryCategoryObject.getId()); - jsonObject.put("type", Constants.SimulationParameterDataType.OBJECT.getValue()); + jsonObject.put("type", SimulationParameterDataTypeEnum.OBJECT.getValue()); jsonObject.put("name", simulationParameterLibraryCategoryObject.getParameterLibraryCategoryObjectName()); jsonObjects.add(jsonObject); }); @@ -148,12 +148,12 @@ public class SimulationParameterLibraryServiceImpl extends ServiceImpl pbsTasks = pbsMapper.getPbsTaskByFlowNodeId(flowNodeId); boolean isSyncFinish = true; for (PbsTask pbsTask : pbsTasks) { diff --git a/project/src/main/java/com/sdm/project/service/impl/DemandServiceImpl.java b/project/src/main/java/com/sdm/project/service/impl/DemandServiceImpl.java index 1eab9f6a..4e6d81e3 100644 --- a/project/src/main/java/com/sdm/project/service/impl/DemandServiceImpl.java +++ b/project/src/main/java/com/sdm/project/service/impl/DemandServiceImpl.java @@ -3,9 +3,9 @@ package com.sdm.project.service.impl; import cn.hutool.core.date.DateUtil; import com.alibaba.fastjson2.JSONObject; -import com.sdm.common.common.Constants; import com.sdm.common.common.SdmResponse; import com.sdm.common.common.ThreadLocalContext; +import com.sdm.common.entity.enums.DirTypeEnum; import com.sdm.common.entity.req.data.CreateDirReq; import com.sdm.common.entity.req.system.UserQueryReq; import com.sdm.common.entity.resp.system.CIDUserResp; @@ -140,7 +140,7 @@ public class DemandServiceImpl extends BaseService implements IDemandService { createDirReq.setUuId(uuid); createDirReq.setParentUuId(null); createDirReq.setDirName(req.getDemandName()); - createDirReq.setDirType(Constants.DirType.PROJECT_NODE_DIR.getValue()); + createDirReq.setDirType(DirTypeEnum.PROJECT_NODE_DIR.getValue()); log.info("创建需求时，调用创建文件夹的参数为：{}", createDirReq); SdmResponse response = dataClientFeignClient.createDir(createDirReq); log.info("创建需求时，调用创建文件夹的返回值为：{}", response); diff --git a/project/src/main/java/com/sdm/project/service/impl/NodeServiceImpl.java b/project/src/main/java/com/sdm/project/service/impl/NodeServiceImpl.java index 37219f6d..17790e62 100644 --- a/project/src/main/java/com/sdm/project/service/impl/NodeServiceImpl.java +++ b/project/src/main/java/com/sdm/project/service/impl/NodeServiceImpl.java @@ -2,10 +2,11 @@ package com.sdm.project.service.impl; import com.alibaba.fastjson2.JSONObject; import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; -import com.sdm.common.common.Constants; import com.sdm.common.common.SdmResponse; import com.sdm.common.common.ThreadLocalContext; import com.sdm.common.entity.constants.SystemConstants; +import com.sdm.common.entity.enums.DirTypeEnum; +import com.sdm.common.entity.enums.NodeTypeEnum; import com.sdm.common.entity.req.data.CreateDirReq; import com.sdm.common.entity.req.project.DelNodeReq; import com.sdm.common.entity.req.project.RenameNodeReq; @@ -365,7 +366,7 @@ public class NodeServiceImpl extends ServiceImpl projectNodePoList = mapper.queryNodeListByNodeId(addNodeList.get(0).getPid()); if (CollectionUtils.isEmpty(projectNodePoList)) { @@ -375,7 +376,7 @@ public class NodeServiceImpl extends ServiceImpl