diff --git a/src/main/java/com/ai/da/service/WorkspaceService.java b/src/main/java/com/ai/da/service/WorkspaceService.java index 12ca9d01..dd56859e 100644 --- a/src/main/java/com/ai/da/service/WorkspaceService.java +++ b/src/main/java/com/ai/da/service/WorkspaceService.java @@ -42,6 +42,8 @@ public interface WorkspaceService extends IService { WorkspaceVO getByIdNew(Long id); + WorkspaceVO getByIdForProject(Long id); + List getMannequins(String sex, String style); void systemFileCopy(); 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 a52039f4..b3a25eb6 100644 --- a/src/main/java/com/ai/da/service/impl/WorkspaceServiceImpl.java +++ b/src/main/java/com/ai/da/service/impl/WorkspaceServiceImpl.java @@ -19,7 +19,6 @@ import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import com.baomidou.mybatisplus.core.metadata.IPage; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; -import com.sun.org.apache.bcel.internal.generic.NEW; import org.apache.commons.fileupload.FileItem; import org.apache.commons.fileupload.FileItemFactory; import org.apache.commons.fileupload.disk.DiskFileItemFactory; @@ -338,6 +337,58 @@ public class WorkspaceServiceImpl extends ServiceImpl qwOld = new QueryWrapper<>(); +// qwOld.lambda().eq(Workspace::getAccountId, accountId); +// qwOld.lambda().eq(Workspace::getIsLastIndex, 1); +// Workspace oldIsLastIndex = workspaceMapper.selectOne(qwOld); +// oldIsLastIndex.setIsLastIndex(0); +// workspaceMapper.updateById(oldIsLastIndex); + Workspace newIsLastIndex = workspaceMapper.selectById(id); +// newIsLastIndex.setIsLastIndex(1); +// workspaceMapper.updateById(newIsLastIndex); + WorkspaceVO vo = CopyUtil.copyObject(newIsLastIndex, WorkspaceVO.class); + if (vo.getMannequinFemaleId() != null) { + if (vo.getMannequinFemaleType().equals(ModelType.SYSTEM.getValue())) { + vo.setFemalePresignedUrl(minioUtil.getPreSignedUrl(sysFileMapper.selectById(vo.getMannequinFemaleId()).getUrl(), 24 * 60)); + } else if (vo.getMannequinFemaleType().equals(ModelType.LIBRARY.getValue())) { + vo.setFemalePresignedUrl(minioUtil.getPreSignedUrl(libraryMapper.selectById(vo.getMannequinFemaleId()).getUrl(), 24 * 60)); + } + } + if (vo.getMannequinMaleId() != null) { + if (vo.getMannequinMaleType().equals(ModelType.SYSTEM.getValue())) { + vo.setMalePresignedUrl(minioUtil.getPreSignedUrl(sysFileMapper.selectById(vo.getMannequinMaleId()).getUrl(), 24 * 60)); + } else if (vo.getMannequinMaleType().equals(ModelType.LIBRARY.getValue())) { + vo.setMalePresignedUrl(minioUtil.getPreSignedUrl(libraryMapper.selectById(vo.getMannequinMaleId()).getUrl(), 24 * 60)); + } + } + Sex sex = Sex.getSex(vo.getSex()); + Position position = Position.getPosition(vo.getPosition()); + vo.setSexEnum(new BizJson(sex.getValue(), sex.name(), BusinessException.getMessageFromResource(sex.name()))); + vo.setPositionEnum(new BizJson(position.getValue(), position.name(), BusinessException.getMessageFromResource(position.name()))); + QueryWrapper qw = new QueryWrapper<>(); + qw.lambda().eq(WorkspaceRelStyle::getWorkspaceId, vo.getId()); + List workspaceRelStyles = workspaceRelStyleMapper.selectList(qw); + if (!CollectionUtils.isEmpty(workspaceRelStyles)) { + Long styleId = workspaceRelStyles.get(0).getStyleId(); + vo.setStyleId(styleId); + Style style = styleMapper.selectById(styleId); + StyleEnum styleEnum = StyleEnum.fromName(style.getName()); + vo.setStyle(styleEnum.name()); + Map> allKeywordsByStyle = StyleKeywordMapper.getAllKeywordsByStyle(styleEnum); + vo.setAllKeywordsByStyle(allKeywordsByStyle); + if (authPrincipalVo.getLanguage().equals(Language.ENGLISH.name())) { + vo.setStyleName(styleEnum.getEnglish()); + }else { + vo.setStyleName(styleEnum.getChinese()); + } + } + return vo; + } + @Override public List getMannequins(String sex, String style) { AuthPrincipalVo userInfo = UserContext.getUserHolder();