diff --git a/src/main/java/com/ai/da/service/impl/DesignServiceImpl.java b/src/main/java/com/ai/da/service/impl/DesignServiceImpl.java index 273df5ef..156a6fae 100644 --- a/src/main/java/com/ai/da/service/impl/DesignServiceImpl.java +++ b/src/main/java/com/ai/da/service/impl/DesignServiceImpl.java @@ -110,24 +110,26 @@ public class DesignServiceImpl extends ServiceImpl impleme private void calculateLibraryAndSysFile(DesignCollectionDTO designDTO, ValidateElementVO elementVO, AuthPrincipalVo userInfo) { //查询用户 sketch library List libraryVos; - if (CollectionUtil.isNotEmpty(designDTO.getSketchBoards())) { - List 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 sysFileVOS = sysFileService.getByUrlList(designAttributeRetrievalDTO.getSysFileUrlS()); - elementVO.setSysFileVo(sysFileVOS); - } else { - libraryVos = libraryService.selectByAccountIdAnd1TypeList(userInfo.getId(), - Collections.singletonList(CollectionLevel1TypeEnum.SKETCH_BOARD.getRealName())); - } +// if (CollectionUtil.isNotEmpty(designDTO.getSketchBoards())) { +// List 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 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())); elementVO.setLibraryVos(libraryVos); //校验比列 validateRatio(designDTO, libraryVos); diff --git a/src/main/java/com/ai/da/service/impl/WorkspaceServiceImpl.java b/src/main/java/com/ai/da/service/impl/WorkspaceServiceImpl.java index 9c2d22bb..9a168cfb 100644 --- a/src/main/java/com/ai/da/service/impl/WorkspaceServiceImpl.java +++ b/src/main/java/com/ai/da/service/impl/WorkspaceServiceImpl.java @@ -76,7 +76,7 @@ public class WorkspaceServiceImpl extends ServiceImpl selectWorkspacePage(IPage page, WorkspaceVO 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; @Override