diff --git a/src/main/java/com/ai/da/service/impl/LibraryServiceImpl.java b/src/main/java/com/ai/da/service/impl/LibraryServiceImpl.java index 91664e34..80355f76 100644 --- a/src/main/java/com/ai/da/service/impl/LibraryServiceImpl.java +++ b/src/main/java/com/ai/da/service/impl/LibraryServiceImpl.java @@ -175,7 +175,10 @@ public class LibraryServiceImpl extends ServiceImpl impl return libraryUpdateVo; }else if (libraryUploadDTO.getModelType().equals(ModelType.SYSTEM.getValue())) { Library library = resolveData(libraryUploadDTO, userInfo, filePath); - return null; + LibraryUpdateVo libraryUpdateVo = CopyUtil.copyObject(library, LibraryUpdateVo.class); + libraryUpdateVo.setMinIOPath(libraryUpdateVo.getUrl()); + libraryUpdateVo.setUrl(minioUtil.getPresignedUrl(filePath, 480)); + return libraryUpdateVo; } return null; } @@ -206,7 +209,7 @@ public class LibraryServiceImpl extends ServiceImpl impl sysFile.setCreateDate(new Date()); sysFileMapper.insert(sysFile); Library library = new Library(); - library.setName("成功"); + library.setUrl(sysFile.getUrl()); return library; }else { throw new BusinessException("unknown model type"); 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 a4798107..67ec1578 100644 --- a/src/main/java/com/ai/da/service/impl/WorkspaceServiceImpl.java +++ b/src/main/java/com/ai/da/service/impl/WorkspaceServiceImpl.java @@ -119,9 +119,19 @@ public class WorkspaceServiceImpl extends ServiceImpl systemQw = new QueryWrapper<>(); + systemQw.lambda().eq(SysFile::getLevel1Type, "Models"); + systemQw.lambda().eq(SysFile::getLevel2Type, "Female"); + List sysFiles = sysFileMapper.selectList(systemQw); + if (!CollectionUtils.isEmpty(sysFiles)) { + workspace.setMannequinId(sysFiles.get(0).getId()); + workspace.setMannequinUrl(sysFiles.get(0).getUrl()); + workspace.setMannequinType(MannequinType.SYSTEM.getValue()); + }else { + workspace.setMannequinId(null); + workspace.setMannequinUrl("aida-mannequins/model_1693218345.2714432.png"); + workspace.setMannequinType(MannequinType.SYSTEM.getValue()); + } workspace.setIsLastIndex(1); int insert = workspaceMapper.insert(workspace); if (insert <= 0) {