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

TASK: attribute_retrieval;

Browse Source
This commit is contained in:
shahaibo
2023-10-13 10:52:12 +08:00
parent 770e9d1d23
commit 0dd765123f
2 changed files with 37 additions and 33 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,26 +110,24 @@ public class DesignServiceImpl extends ServiceImpl<DesignMapper, Design> impleme
private void calculateLibraryAndSysFile(DesignCollectionDTO designDTO, ValidateElementVO elementVO, AuthPrincipalVo userInfo) {
//查询用户 sketch library
List<LibraryVo> libraryVos;
// if (CollectionUtil.isNotEmpty(designDTO.getSketchBoards())) {
// List<String> sketchUrlList = elementVO.getSketchBoardElements()
// .stream()
// .map(CollectionElement::getUrl)
// .collect(Collectors.toList());
// DesignAttributeRetrievalDTO designAttributeRetrievalDTO =
// pythonService.generateAttributeRetrieval(sketchUrlList, userInfo.getId());
// if (CollectionUtils.isEmpty(designAttributeRetrievalDTO.getLibraryUrls())) {
// libraryVos = null;
// } else {
// libraryVos = libraryService.getByUrlList(designAttributeRetrievalDTO.getLibraryUrls(), userInfo.getId());
// }
// List<SysFileVO> sysFileVOS = sysFileService.getByUrlList(designAttributeRetrievalDTO.getSysFileUrlS());
// elementVO.setSysFileVo(sysFileVOS);
// } else {
// libraryVos = libraryService.selectByAccountIdAnd1TypeList(userInfo.getId(),
// Collections.singletonList(CollectionLevel1TypeEnum.SKETCH_BOARD.getRealName()));
// }
libraryVos = libraryService.selectByAccountIdAnd1TypeList(userInfo.getId(),
Collections.singletonList(CollectionLevel1TypeEnum.SKETCH_BOARD.getRealName()));
if (CollectionUtil.isNotEmpty(designDTO.getSketchBoards())) {
List<String> sketchUrlList = elementVO.getSketchBoardElements()
.stream()
.map(CollectionElement::getUrl)
.collect(Collectors.toList());
DesignAttributeRetrievalDTO designAttributeRetrievalDTO =
pythonService.generateAttributeRetrieval(sketchUrlList, userInfo.getId(), elementVO.getModelSex());
if (CollectionUtils.isEmpty(designAttributeRetrievalDTO.getLibraryUrls())) {
libraryVos = null;
} else {
libraryVos = libraryService.getByUrlList(designAttributeRetrievalDTO.getLibraryUrls(), userInfo.getId());
}
List<SysFileVO> sysFileVOS = sysFileService.getByUrlList(designAttributeRetrievalDTO.getSysFileUrlS());
elementVO.setSysFileVo(sysFileVOS);
} else {
libraryVos = libraryService.selectByAccountIdAnd1TypeList(userInfo.getId(),
Collections.singletonList(CollectionLevel1TypeEnum.SKETCH_BOARD.getRealName()));
}
elementVO.setLibraryVos(libraryVos);
//校验比列
validateRatio(designDTO, libraryVos);