toolchaintechnologycenter/spdm-backend
1
0
Fork 1
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

常量位置修改

Browse Source
This commit is contained in:
gulongcheng
2025-11-10 10:52:17 +08:00
parent 0a2d47b7d7
commit 544b83899b
18 changed files with 212 additions and 211 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
data/src/main/java/com/sdm/data/aop/PermissionCheckAspect.java
View File

@@ -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();
}
}

4
data/src/main/java/com/sdm/data/service/IFileUserPermissionService.java
View File

@@ -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<FileUserPermission>
* @param permission 权限类型
* @return 是否有权限
*/
boolean hasFilePermission(Long fileId, Long userId, Constants.FilePermission permission);
boolean hasFilePermission(Long fileId, Long userId, FilePermissionEnum permission);
}

6
data/src/main/java/com/sdm/data/service/impl/DataAnalysisServiceImpl.java
View File

@@ -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<FileMetadataInfo> simulationTaskFileMetadataInfos = fileMetadataInfoService
.lambdaQuery()
.in(FileMetadataInfo::getId, fileIdList)
.eq(FileMetadataInfo::getIsLatest, Constants.FileIsLast.YES.getValue())
.eq(FileMetadataInfo::getIsLatest, FileIsLastEnum.YES.getValue())
.list();
PageInfo<FileMetadataInfo> pageInfo = new PageInfo<>(simulationTaskFileMetadataInfos);

1
data/src/main/java/com/sdm/data/service/impl/DataStorageAnalysisImpl.java
View File

@@ -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;

4
data/src/main/java/com/sdm/data/service/impl/FileUserPermissionServiceImpl.java
View File

@@ -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<FileUserPermissio
private IFileMetadataInfoService fileMetadataInfoService;
@Override
public boolean hasFilePermission(Long fileId, Long userId, Constants.FilePermission permission) {
public boolean hasFilePermission(Long fileId, Long userId, FilePermissionEnum permission) {
return true;
/*FileMetadataInfo fileMetadataInfo = fileMetadataInfoService.getById(fileId);
if(ObjectUtils.isNull(fileMetadataInfo)){

56
data/src/main/java/com/sdm/data/service/impl/MinioFileIDataFileServiceImpl.java
View File

@@ -5,12 +5,10 @@ import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
import com.baomidou.mybatisplus.extension.conditions.query.LambdaQueryChainWrapper;
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.constants.NumberConstants;
import com.sdm.common.entity.enums.ApprovalFileDataStatusEnum;
import com.sdm.common.entity.enums.ApproveFileDataTypeEnum;
import com.sdm.common.entity.enums.*;
import com.sdm.common.entity.req.data.CreateDirReq;
import com.sdm.common.entity.req.data.DelDirReq;
import com.sdm.common.entity.req.data.RenameDirReq;
@@ -67,9 +65,9 @@ import java.util.stream.Collectors;
@Slf4j
@Service
public class MinioFileIDataFileServiceImpl implements IDataFileService {
private static final List<Constants.DirType> 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<DirTypeEnum> 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<FileMetadataInfo> 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<FileMetadataInfo> list = fileMetadataInfoLambdaQueryChainWrapper.eq(FileMetadataInfo::getDataType, Constants.DataType.DIRECTORY.getValue()).list();
List<FileMetadataInfo> list = fileMetadataInfoLambdaQueryChainWrapper.eq(FileMetadataInfo::getDataType, DataTypeEnum.DIRECTORY.getValue()).list();
List<FileMetadataInfoResp> 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<FileMetadataInfo> fileMetadataInfoByObjectKey = getFileMetadataInfoByObjectKey(dirMinioObjectKey);
// 检查目录是否已存在
if (!fileMetadataInfoByObjectKey.isPresent()) {
@@ -1317,7 +1315,7 @@ public class MinioFileIDataFileServiceImpl implements IDataFileService {
@Transactional(rollbackFor = Exception.class)
public SdmResponse<Long> uploadSimulationParamFile(MultipartFile paramFile) {
// 先创建 simulationParameter 目录
String dirMinioObjectKey = getDirMinioObjectKey(Constants.DirType.SIMULATION_PARAMETER_DIR.getDirName());
String dirMinioObjectKey = getDirMinioObjectKey(DirTypeEnum.SIMULATION_PARAMETER_DIR.getDirName());
Optional<FileMetadataInfo> fileMetadataInfoByObjectKey = getFileMetadataInfoByObjectKey(dirMinioObjectKey);
// 检查目录是否已存在
if (!fileMetadataInfoByObjectKey.isPresent()) {
@@ -1376,7 +1374,7 @@ public class MinioFileIDataFileServiceImpl implements IDataFileService {
@Transactional(rollbackFor = Exception.class)
public SdmResponse<Long> uploadTrainModelDataFile(MultipartFile trainModelFile) {
// 先创建 trainModel 目录
String dirMinioObjectKey = getDirMinioObjectKey(Constants.DirType.TRAIN_MODEL_DIR.getDirName());
String dirMinioObjectKey = getDirMinioObjectKey(DirTypeEnum.TRAIN_MODEL_DIR.getDirName());
Optional<FileMetadataInfo> fileMetadataInfoByObjectKey = getFileMetadataInfoByObjectKey(dirMinioObjectKey);
// 检查目录是否已存在
if (!fileMetadataInfoByObjectKey.isPresent()) {

18
data/src/main/java/com/sdm/data/service/impl/SimulationParameterLibraryServiceImpl.java
View File

@@ -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<Simulatio
simulationParameterLibraries.forEach(simulationParameterLibrary -> {
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<Simulatio
simulationParameterLibraryCategories.forEach(simulationParameterLibraryCategory -> {
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<Simulatio
}
}
if (type == Constants.SimulationParameterDataType.CATEGORY.getValue()) {
if (type == SimulationParameterDataTypeEnum.CATEGORY.getValue()) {
// 获取指定仿真参数库分类下的参数对象
List<SimulationParameterLibraryCategoryObject> simulationParameterLibraryCategoryObjects = simulationParameterLibraryCategoryObjectService
.lambdaQuery().eq(SimulationParameterLibraryCategoryObject::getParameterLibraryCategoryId, id).list();
@@ -136,7 +136,7 @@ public class SimulationParameterLibraryServiceImpl extends ServiceImpl<Simulatio
simulationParameterLibraryCategoryObjects.forEach(simulationParameterLibraryCategoryObject -> {
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<Simulatio
@Override
public SdmResponse deleteSimulationParameter(Integer type, Long id) {
// 根据参数类型和参数id删除参数
if (type == Constants.SimulationParameterDataType.OBJECT.getValue()) {
if (type == SimulationParameterDataTypeEnum.OBJECT.getValue()) {
simulationParameterLibraryCategoryObjectService.removeById(id);
} else if (type == Constants.SimulationParameterDataType.CATEGORY.getValue()) {
} else if (type == SimulationParameterDataTypeEnum.CATEGORY.getValue()) {
simulationParameterLibraryCategoryService.removeById(id);
simulationParameterLibraryCategoryObjectService.lambdaUpdate().eq(SimulationParameterLibraryCategoryObject::getParameterLibraryCategoryId, id).remove();
}else if (type == Constants.SimulationParameterDataType.LIBRARY.getValue()) {
}else if (type == SimulationParameterDataTypeEnum.LIBRARY.getValue()) {
this.removeById(id);
simulationParameterLibraryCategoryService.lambdaUpdate().eq(SimulationParameterLibraryCategory::getParameterLibraryId,id).remove();
simulationParameterLibraryCategoryObjectService.lambdaUpdate().eq(SimulationParameterLibraryCategoryObject::getParameterLibraryId, id).remove();