diff --git a/src/main/java/com/ai/da/model/vo/CloudTaskResultVO.java b/src/main/java/com/ai/da/model/vo/CloudTaskResultVO.java index 4478ec5a..8b140a91 100644 --- a/src/main/java/com/ai/da/model/vo/CloudTaskResultVO.java +++ b/src/main/java/com/ai/da/model/vo/CloudTaskResultVO.java @@ -1,13 +1,14 @@ package com.ai.da.model.vo; import com.ai.da.common.response.PageBaseResponse; +import com.ai.da.mapper.primary.entity.TDesignPythonOutfit; import lombok.Data; import java.util.List; @Data public class CloudTaskResultVO { - private PageBaseResponse design; + private List design; private List toProductImage; private List relight; } diff --git a/src/main/java/com/ai/da/service/impl/DesignServiceImpl.java b/src/main/java/com/ai/da/service/impl/DesignServiceImpl.java index 8ac45771..187c35c0 100644 --- a/src/main/java/com/ai/da/service/impl/DesignServiceImpl.java +++ b/src/main/java/com/ai/da/service/impl/DesignServiceImpl.java @@ -2501,25 +2501,34 @@ public class DesignServiceImpl extends ServiceImpl impleme if (null != collectionId) { QueryWrapper qw = new QueryWrapper<>(); qw.lambda().eq(TDesignPythonOutfit::getCollectionId, collectionId); - Page page = designPythonOutfitMapper.selectPage(new Page<>(query.getPage(), query.getSize()), qw); - IPage convert = page.convert((Function) outfit -> { - if (outfit != null) { - DesignCollectionItemVO vo = new DesignCollectionItemVO(); - vo.setDesignOutfitId(outfit.getId()); - vo.setDesignOutfitUrl(minioUtil.getPreSignedUrl(outfit.getDesignUrl(), 24 * 60)); - vo.setDesignItemId(outfit.getDesignItemId()); - return vo; - } - return null; - }); - result.setDesign(PageBaseResponse.success(convert)); + List list = designPythonOutfitMapper.selectList(qw); + List voList = new ArrayList<>(); + for (TDesignPythonOutfit tDesignPythonOutfit : list) { + DesignCollectionItemVO vo = new DesignCollectionItemVO(); + vo.setDesignOutfitId(tDesignPythonOutfit.getId()); + vo.setDesignOutfitUrl(minioUtil.getPreSignedUrl(tDesignPythonOutfit.getDesignUrl(), 24 * 60)); + vo.setDesignItemId(tDesignPythonOutfit.getDesignItemId()); + voList.add(vo); + } + result.setDesign(voList); +// IPage convert = page.convert((Function) outfit -> { +// if (outfit != null) { +// DesignCollectionItemVO vo = new DesignCollectionItemVO(); +// vo.setDesignOutfitId(outfit.getId()); +// vo.setDesignOutfitUrl(minioUtil.getPreSignedUrl(outfit.getDesignUrl(), 24 * 60)); +// vo.setDesignItemId(outfit.getDesignItemId()); +// return vo; +// } +// return null; +// }); +// result.setDesign(PageBaseResponse.success(convert)); return result; }else { - result.setDesign(PageBaseResponse.success(new Page<>())); + result.setDesign(new ArrayList<>()); return result; } } - result.setDesign(PageBaseResponse.success(new Page<>())); + result.setDesign(new ArrayList<>()); return result; } else if (query.getBuildType().equals(BuildType.TO_PRODUCT_IMAGE.getValue())) { List results = new ArrayList<>();