diff --git a/src/main/java/com/ai/da/model/vo/DesignItemClothesDetailVO.java b/src/main/java/com/ai/da/model/vo/DesignItemClothesDetailVO.java index 62b8d2e0..dbf978a6 100644 --- a/src/main/java/com/ai/da/model/vo/DesignItemClothesDetailVO.java +++ b/src/main/java/com/ai/da/model/vo/DesignItemClothesDetailVO.java @@ -32,4 +32,11 @@ public class DesignItemClothesDetailVO { @ApiModelProperty("对应图层信息") private List layersObject; + + public DesignItemClothesDetailVO() { + } + + public DesignItemClothesDetailVO(String type) { + this.type = type; + } } diff --git a/src/main/java/com/ai/da/service/impl/DesignItemServiceImpl.java b/src/main/java/com/ai/da/service/impl/DesignItemServiceImpl.java index 7305f4d8..e15bb119 100644 --- a/src/main/java/com/ai/da/service/impl/DesignItemServiceImpl.java +++ b/src/main/java/com/ai/da/service/impl/DesignItemServiceImpl.java @@ -413,7 +413,7 @@ public class DesignItemServiceImpl extends ServiceImpl clothes = new ArrayList<>(); + DesignItemClothesDetailVO body = new DesignItemClothesDetailVO("body"); designSingleVO.setDesignItemId(designItemId); designSingleVO.setDesignItemUrl(designItemUrl); designSingleVO.setClothes(clothes); @@ -433,9 +434,13 @@ public class DesignItemServiceImpl extends ServiceImpl singleItem.getType().toLowerCase().equals(layers.getImageCategory().split("_")[0])).collect(Collectors.toList())); + layers -> singleItem.getType().toLowerCase().equals(layers.getImageCategory().split("_")[0]) + ).collect(Collectors.toList())); + body.setLayersObject(layersObject.stream().filter(layers -> layers.getImageCategory().equals("body")).collect(Collectors.toList())); + clothes.add(designItemClothesDetailVO); }); + clothes.add(body); return designSingleVO; } 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 1b935b4a..c5145587 100644 --- a/src/main/java/com/ai/da/service/impl/DesignServiceImpl.java +++ b/src/main/java/com/ai/da/service/impl/DesignServiceImpl.java @@ -758,7 +758,9 @@ public class DesignServiceImpl extends ServiceImpl impleme d.setId(o.getBusinessId()); d.setPrintObject(new DesignPythonItemPrint()); })); - return editDesignItemLayer(flag,designPythonOutfit,designItem.getDesignUrl(),editResponseColor(designItemDetails,response)); + return editDesignItemLayer(flag,designPythonOutfit, + minIoUtil.getPresignedUrl(bucketName,designItem.getDesignUrl(),480), + editResponseColor(designItemDetails,response)); } private String converTypeToLevel1(String type){ if(StringUtils.isEmpty(type)){ @@ -854,7 +856,7 @@ public class DesignServiceImpl extends ServiceImpl impleme }); // 2、将查询出的图层信息填充到designItemDetailVO中 - designItemDetailVO.setDesignItemUrl(designPythonOutfit.getDesignUrl()); + designItemDetailVO.setDesignItemUrl(minIoUtil.getPresignedUrl(bucketName,designPythonOutfit.getDesignUrl(),480)); // 2.1 填充clothes designItemDetailVO.getClothes().forEach(c -> { String type = c.getType().toLowerCase(); @@ -868,14 +870,14 @@ public class DesignServiceImpl extends ServiceImpl impleme String type = o.getType().toLowerCase(); List outfitVOS = detailsVO.stream().filter(detail -> detail.getImageCategory().equals(type + "_back") || detail.getImageCategory().equals(type + "_front") || - detail.getImageCategory().equals("body")).collect(Collectors.toList()); - + detail.getImageCategory().equals(type + "_left") || + detail.getImageCategory().equals(type + "_right") || + detail.getImageCategory().equals(type)).collect(Collectors.toList()); o.setLayersObject(outfitVOS); }); }else{ designItemDetailVO.setDesignItemUrl(designItemUrl); } - return designItemDetailVO; } } diff --git a/src/main/java/com/ai/da/service/impl/TDesignPythonOutfitDetailServiceImpl.java b/src/main/java/com/ai/da/service/impl/TDesignPythonOutfitDetailServiceImpl.java index b8286064..26e1de0f 100644 --- a/src/main/java/com/ai/da/service/impl/TDesignPythonOutfitDetailServiceImpl.java +++ b/src/main/java/com/ai/da/service/impl/TDesignPythonOutfitDetailServiceImpl.java @@ -30,6 +30,8 @@ public class TDesignPythonOutfitDetailServiceImpl extends ServiceImpl) JSON.parse(detail.getPosition())); - designPythonOutfitVO.setImageSize((List) JSON.parse(detail.getImageSize())); - designPythonOutfitVO.setImageUrl(StringUtil.isNullOrEmpty(detail.getImageUrl()) ? null : minIoUtil.getPresignedUrl(bucketName2,detail.getImageUrl(),5)); - designPythonOutfitVO.setMaskUrl(StringUtil.isNullOrEmpty(detail.getMaskUrl()) ? null : minIoUtil.getPresignedUrl(bucketName2,detail.getMaskUrl(),5)); + designPythonOutfitVO.setPosition(StringUtil.isNullOrEmpty(detail.getPosition()) ? null : (List) JSON.parse(detail.getPosition())); + designPythonOutfitVO.setImageSize(StringUtil.isNullOrEmpty(detail.getImageSize()) ? null : (List) JSON.parse(detail.getImageSize())); + if (detail.getImageCategory().equals("body")){ + designPythonOutfitVO.setImageUrl(StringUtil.isNullOrEmpty(detail.getImageUrl()) ? null : minIoUtil.getPresignedUrl(bucketName3,detail.getImageUrl(),480)); + }else { + designPythonOutfitVO.setImageUrl(StringUtil.isNullOrEmpty(detail.getImageUrl()) ? null : minIoUtil.getPresignedUrl(bucketName2,detail.getImageUrl(),480)); + } + designPythonOutfitVO.setMaskUrl(StringUtil.isNullOrEmpty(detail.getMaskUrl()) ? null : minIoUtil.getPresignedUrl(bucketName2,detail.getMaskUrl(),480)); return designPythonOutfitVO; } diff --git a/src/main/resources/application-test.properties b/src/main/resources/application-test.properties index e19661d7..e076c02c 100644 --- a/src/main/resources/application-test.properties +++ b/src/main/resources/application-test.properties @@ -48,6 +48,7 @@ minio.accessKey=minioadmin minio.secretKey=minioadmin minio.bucketName=aida-results minio.bucketName2=aida-clothing +minio.bucketName3=aida-mannequins