diff --git a/src/main/java/com/ai/da/service/impl/CollectionElementServiceImpl.java b/src/main/java/com/ai/da/service/impl/CollectionElementServiceImpl.java index fe51c272..6cf6edf9 100644 --- a/src/main/java/com/ai/da/service/impl/CollectionElementServiceImpl.java +++ b/src/main/java/com/ai/da/service/impl/CollectionElementServiceImpl.java @@ -62,6 +62,8 @@ public class CollectionElementServiceImpl extends ServiceImpl qw = new QueryWrapper<>(); -// qw.lambda().eq(LibraryModelPoint::getModelType, ModelType.LIBRARY.getValue()); -// qw.lambda().eq(LibraryModelPoint::getRelationId, byId.getId()); -// LibraryModelPoint modelPoint = libraryModelPointService.getOne(qw); -// if (Objects.isNull(modelPoint)) { -// throw new BusinessException("error modelPoint get"); -// } -// elementVO.setDesignLibraryModelPoint(calculateTemplatePointTemplate(modelPoint,1654,1170,byId.getUrl())); -// } - elementVO.setDesignLibraryModelPoint(calculateTemplatePointTemplate(null,null,null,null)); + if (designDTO.getModelType().equals(ModelType.LIBRARY.getValue())) { + Library byId = libraryService.getById(designDTO.getTemplateId()); + QueryWrapper qw = new QueryWrapper<>(); + qw.lambda().eq(LibraryModelPoint::getModelType, ModelType.LIBRARY.getValue()); + qw.lambda().eq(LibraryModelPoint::getRelationId, byId.getId()); + LibraryModelPoint modelPoint = libraryModelPointService.getOne(qw); + if (Objects.isNull(modelPoint)) { + throw new BusinessException("error modelPoint get"); + } + elementVO.setDesignLibraryModelPoint(calculateTemplatePointTemplate(modelPoint,1654,1170,byId.getUrl())); + }else if (designDTO.getModelType().equals(ModelType.SYSTEM.getValue())) { + SysFileVO byId = sysFileService.getById(designDTO.getTemplateId()); + QueryWrapper qw = new QueryWrapper<>(); + qw.lambda().eq(LibraryModelPoint::getModelType, ModelType.SYSTEM.getValue()); + qw.lambda().eq(LibraryModelPoint::getRelationId, byId.getId()); + LibraryModelPoint modelPoint = libraryModelPointService.getOne(qw); + if (Objects.isNull(modelPoint)) { + throw new BusinessException("error modelPoint get"); + } + elementVO.setDesignLibraryModelPoint(calculateTemplatePointTemplate(modelPoint,1654,1170,byId.getUrl())); + } + }else { + throw new BusinessException("templateId or modelType can't be null"); } - elementVO.setDesignLibraryModelPoint(calculateTemplatePointTemplate(null,null,null,null)); +// elementVO.setDesignLibraryModelPoint(calculateTemplatePointTemplate(null,null,null,null)); return elementVO; } @Override @@ -479,21 +492,21 @@ public class CollectionElementServiceImpl extends ServiceImpl calculateTemplatePointOne(String template,Integer high,Integer width){