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

Merge remote-tracking branch 'origin/develop' into develop

Browse Source
This commit is contained in:
shahaibo
2023-11-08 15:25:54 +08:00
parent 94809e149d 6a869cf4b5
commit ebbe39468e
1 changed files with 5 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
src/main/java/com/ai/da/service/impl/DesignItemServiceImpl.java
View File

@@ -422,9 +422,9 @@ public class DesignItemServiceImpl extends ServiceImpl<DesignItemMapper, DesignI
throw new BusinessException("sysFile.not.found"); throw new BusinessException("sysFile.not.found");
} }
modelUrl = sysFile.getUrl(); modelUrl = sysFile.getUrl();
high = 1050; high = 700;
width = 500; width = 320;
} else { } else if (design.getModelType().equals(ModelType.LIBRARY.getValue())){
Library libFile = libraryService.getById(design.getTemplateId()); Library libFile = libraryService.getById(design.getTemplateId());
if (Objects.isNull(libFile)) { if (Objects.isNull(libFile)) {
throw new BusinessException("sysFile.not.found"); throw new BusinessException("sysFile.not.found");
@@ -432,6 +432,8 @@ public class DesignItemServiceImpl extends ServiceImpl<DesignItemMapper, DesignI
modelUrl = libFile.getUrl(); modelUrl = libFile.getUrl();
high = libFile.getHigh(); high = libFile.getHigh();
width = libFile.getWidth(); width = libFile.getWidth();
}else {
throw new BusinessException("unknown.modelType");
} }
LibraryModelPoint modelPoint = libraryModelPointService.getByRelationId(design.getTemplateId(), design.getModelType()); LibraryModelPoint modelPoint = libraryModelPointService.getByRelationId(design.getTemplateId(), design.getModelType());
if (Objects.isNull(modelPoint)) { if (Objects.isNull(modelPoint)) {