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

BUGFIX:Single design;

Browse Source
This commit is contained in:
shahaibo
2024-02-21 13:53:46 +08:00
parent 258ddbab31
commit 43ec55dfb6
3 changed files with 150 additions and 90 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -304,7 +304,7 @@ public class DesignServiceImpl extends ServiceImpl<DesignMapper, Design> impleme
//保存design
Long designId = saveOne(designDTO, collectionId, userInfo.getId());
//计算library
calculateLibraryAndSysFile(designDTO, elementVO, userInfo);
// calculateLibraryAndSysFile(designDTO, elementVO, userInfo);
//组装design入参
DesignPythonObjects pythonObjects = pythonService.covertDesignParam(designDTO.getSystemScale(),
designDTO.getSingleOverall(), designDTO.getSwitchCategory(), elementVO, designDTO.getProcessId());
@@ -702,10 +702,10 @@ public class DesignServiceImpl extends ServiceImpl<DesignMapper, Design> impleme
throw new BusinessException("collection.not.found");
}
AuthPrincipalVo userInfo = UserContext.getUserHolder();
//查询用户 sketch library
List<LibraryVo> libraryVos = libraryService.selectByAccountIdAnd1TypeList(userInfo.getId(),
Arrays.asList(CollectionLevel1TypeEnum.PRINT_BOARD.getRealName(),
CollectionLevel1TypeEnum.SKETCH_BOARD.getRealName()));
// //查询用户 sketch library
// List<LibraryVo> libraryVos = libraryService.selectByAccountIdAnd1TypeList(userInfo.getId(),
// Arrays.asList(CollectionLevel1TypeEnum.PRINT_BOARD.getRealName(),
// CollectionLevel1TypeEnum.SKETCH_BOARD.getRealName()));
//校验collection element
DesignCollectionDTO designCollectionDTO = CopyUtil.copyObject(reDesignDTO, DesignCollectionDTO.class);
ValidateElementVO elementVO = collectionElementService.validateElement(designCollectionDTO);