fix:仿真参数库对象,支持不传文件
This commit is contained in:
@@ -2510,7 +2510,11 @@ public class MinioFileIDataFileServiceImpl implements IDataFileService {
|
||||
} else {
|
||||
fileMetadataInfoLambdaQueryChainWrapper.eq(FileMetadataInfo::getParentId, parentDirId);
|
||||
}
|
||||
List<FileMetadataInfo> list = fileMetadataInfoLambdaQueryChainWrapper.eq(FileMetadataInfo::getTenantId, ThreadLocalContext.getTenantId()).eq(FileMetadataInfo::getDataType, DataTypeEnum.DIRECTORY.getValue()).orderByDesc(FileMetadataInfo::getCreateTime).list();
|
||||
List<FileMetadataInfo> list = fileMetadataInfoLambdaQueryChainWrapper
|
||||
.eq(FileMetadataInfo::getTenantId, ThreadLocalContext.getTenantId())
|
||||
.eq(FileMetadataInfo::getDataType, DataTypeEnum.DIRECTORY.getValue())
|
||||
.isNull(FileMetadataInfo::getDeletedAt)
|
||||
.orderByDesc(FileMetadataInfo::getCreateTime).list();
|
||||
setCreatorNames(list);
|
||||
|
||||
List<FileMetadataInfoResp> dtoList = list.stream().map(entity -> {
|
||||
|
||||
@@ -76,9 +76,23 @@ public class SimulationParameterLibraryServiceImpl extends ServiceImpl<Simulatio
|
||||
@Autowired
|
||||
private UserNameCacheService userNameCacheService;
|
||||
|
||||
/**
|
||||
* 新增仿真参数库
|
||||
*
|
||||
* @param parameterLibraryName 仿真参数库名称
|
||||
* @return SdmResponse 响应
|
||||
*/
|
||||
@Override
|
||||
@Transactional(rollbackFor = Exception.class)
|
||||
public SdmResponse addLibrary(String parameterLibraryName) {
|
||||
// 检查是否存在同名的仿真参数库
|
||||
long count = this.lambdaQuery()
|
||||
.eq(SimulationParameterLibrary::getParameterLibraryName, parameterLibraryName)
|
||||
.eq(SimulationParameterLibrary::getTenantId, ThreadLocalContext.getTenantId())
|
||||
.count();
|
||||
if (count > 0) {
|
||||
return SdmResponse.failed("仿真参数库名称已存在");
|
||||
}
|
||||
SimulationParameterLibrary simulationParameterLibrary = new SimulationParameterLibrary();
|
||||
simulationParameterLibrary.setParameterLibraryName(parameterLibraryName);
|
||||
simulationParameterLibrary.setTenantId(ThreadLocalContext.getTenantId());
|
||||
@@ -87,9 +101,24 @@ public class SimulationParameterLibraryServiceImpl extends ServiceImpl<Simulatio
|
||||
return SdmResponse.success("仿真参数库添加成功");
|
||||
}
|
||||
|
||||
/**
|
||||
* 新增仿真参数库分类
|
||||
*
|
||||
* @param parameterLibraryId 参数库ID
|
||||
* @param parameterLibraryCategoryName 参数库分类名称
|
||||
* @return SdmResponse 响应
|
||||
*/
|
||||
@Override
|
||||
@Transactional(rollbackFor = Exception.class)
|
||||
public SdmResponse addLibraryCategory(Long parameterLibraryId, String parameterLibraryCategoryName) {
|
||||
// 检查是否存在同名的仿真参数库分类
|
||||
long count = simulationParameterLibraryCategoryService.lambdaQuery()
|
||||
.eq(SimulationParameterLibraryCategory::getParameterLibraryId, parameterLibraryId)
|
||||
.eq(SimulationParameterLibraryCategory::getParameterLibraryCategoryName, parameterLibraryCategoryName)
|
||||
.count();
|
||||
if (count > 0) {
|
||||
return SdmResponse.failed("仿真参数库分类名称已存在");
|
||||
}
|
||||
SimulationParameterLibraryCategory simulationParameterLibraryCategory = new SimulationParameterLibraryCategory();
|
||||
simulationParameterLibraryCategory.setParameterLibraryId(parameterLibraryId);
|
||||
simulationParameterLibraryCategory.setParameterLibraryCategoryName(parameterLibraryCategoryName);
|
||||
|
||||
Reference in New Issue
Block a user