aidlab/aida_back
7
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

BUGFIX:library upload;

Browse Source
This commit is contained in:
shahaibo
2023-10-07 18:47:53 +08:00
parent 935dedcf09
commit b18e8eb09f
2 changed files with 21 additions and 19 deletions
Download Patch File Download Diff File Expand all files Collapse all files

38
src/main/java/com/ai/da/service/impl/DesignServiceImpl.java
View File

@@ -110,24 +110,26 @@ public class DesignServiceImpl extends ServiceImpl<DesignMapper, Design> impleme
private void calculateLibraryAndSysFile(DesignCollectionDTO designDTO, ValidateElementVO elementVO, AuthPrincipalVo userInfo) { private void calculateLibraryAndSysFile(DesignCollectionDTO designDTO, ValidateElementVO elementVO, AuthPrincipalVo userInfo) {
//查询用户 sketch library //查询用户 sketch library
List<LibraryVo> libraryVos; List<LibraryVo> libraryVos;
if (CollectionUtil.isNotEmpty(designDTO.getSketchBoards())) { // if (CollectionUtil.isNotEmpty(designDTO.getSketchBoards())) {
List<String> sketchUrlList = elementVO.getSketchBoardElements() // List<String> sketchUrlList = elementVO.getSketchBoardElements()
.stream() // .stream()
.map(CollectionElement::getUrl) // .map(CollectionElement::getUrl)
.collect(Collectors.toList()); // .collect(Collectors.toList());
DesignAttributeRetrievalDTO designAttributeRetrievalDTO = // DesignAttributeRetrievalDTO designAttributeRetrievalDTO =
pythonService.generateAttributeRetrieval(sketchUrlList, userInfo.getId()); // pythonService.generateAttributeRetrieval(sketchUrlList, userInfo.getId());
if (CollectionUtils.isEmpty(designAttributeRetrievalDTO.getLibraryUrls())) { // if (CollectionUtils.isEmpty(designAttributeRetrievalDTO.getLibraryUrls())) {
libraryVos = null; // libraryVos = null;
} else { // } else {
libraryVos = libraryService.getByUrlList(designAttributeRetrievalDTO.getLibraryUrls(), userInfo.getId()); // libraryVos = libraryService.getByUrlList(designAttributeRetrievalDTO.getLibraryUrls(), userInfo.getId());
} // }
List<SysFileVO> sysFileVOS = sysFileService.getByUrlList(designAttributeRetrievalDTO.getSysFileUrlS()); // List<SysFileVO> sysFileVOS = sysFileService.getByUrlList(designAttributeRetrievalDTO.getSysFileUrlS());
elementVO.setSysFileVo(sysFileVOS); // elementVO.setSysFileVo(sysFileVOS);
} else { // } else {
libraryVos = libraryService.selectByAccountIdAnd1TypeList(userInfo.getId(), // libraryVos = libraryService.selectByAccountIdAnd1TypeList(userInfo.getId(),
Collections.singletonList(CollectionLevel1TypeEnum.SKETCH_BOARD.getRealName())); // Collections.singletonList(CollectionLevel1TypeEnum.SKETCH_BOARD.getRealName()));
} // }
libraryVos = libraryService.selectByAccountIdAnd1TypeList(userInfo.getId(),
Collections.singletonList(CollectionLevel1TypeEnum.SKETCH_BOARD.getRealName()));
elementVO.setLibraryVos(libraryVos); elementVO.setLibraryVos(libraryVos);
//校验比列 //校验比列
validateRatio(designDTO, libraryVos); validateRatio(designDTO, libraryVos);

2
src/main/java/com/ai/da/service/impl/WorkspaceServiceImpl.java
View File

@@ -76,7 +76,7 @@ public class WorkspaceServiceImpl extends ServiceImpl<WorkspaceMapper, Workspace
public IPage<WorkspaceVO> selectWorkspacePage(IPage<WorkspaceVO> page, WorkspaceVO workspace) { public IPage<WorkspaceVO> selectWorkspacePage(IPage<WorkspaceVO> page, WorkspaceVO workspace) {
return page.setRecords(baseMapper.selectWorkspacePage(page, workspace)); return page.setRecords(baseMapper.selectWorkspacePage(page, workspace));
} }
private final static String WORKSPACE_NAME = "默认workspace名称"; private final static String WORKSPACE_NAME = "Default workspace name";
private final static Integer SYSTEM_DESIGNER_PERCENTAGE = 30; private final static Integer SYSTEM_DESIGNER_PERCENTAGE = 30;
@Override @Override