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

getDetail designSingle bug修改

Browse Source
This commit is contained in:
xupei
2023-09-18 17:22:15 +08:00
parent 206f365ff3
commit 88b526f1c4
5 changed files with 32 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
src/main/java/com/ai/da/model/vo/DesignItemClothesDetailVO.java
View File

@@ -32,4 +32,11 @@ public class DesignItemClothesDetailVO {
@ApiModelProperty("对应图层信息") @ApiModelProperty("对应图层信息")
private List<DesignPythonOutfitVO> layersObject; private List<DesignPythonOutfitVO> layersObject;
public DesignItemClothesDetailVO() {
}
public DesignItemClothesDetailVO(String type) {
this.type = type;
}
} }

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

@@ -413,7 +413,7 @@ public class DesignItemServiceImpl extends ServiceImpl<DesignItemMapper, DesignI
TDesignPythonOutfit designPythonOutfit = designPythonOutfitService.getByDesignItemId(designSingleIncludeLayersDTO.getDesignItemId()); TDesignPythonOutfit designPythonOutfit = designPythonOutfitService.getByDesignItemId(designSingleIncludeLayersDTO.getDesignItemId());
// todo designPythonOutFit 空指针 // todo designPythonOutFit 空指针
return assembleDesignSingleResponse(designItem.getId(),minioUtil.getPresignedUrl(bucketName,designPythonOutfit.getDesignUrl(),5), return assembleDesignSingleResponse(designItem.getId(),minioUtil.getPresignedUrl(bucketName,designPythonOutfit.getDesignUrl(),480),
designSingleIncludeLayersDTO.getDesignSingleItemDTOList(),detailsVO); designSingleIncludeLayersDTO.getDesignSingleItemDTOList(),detailsVO);
} }
@@ -423,6 +423,7 @@ public class DesignItemServiceImpl extends ServiceImpl<DesignItemMapper, DesignI
DesignSingleVO designSingleVO = new DesignSingleVO(); DesignSingleVO designSingleVO = new DesignSingleVO();
ArrayList<DesignItemClothesDetailVO> clothes = new ArrayList<>(); ArrayList<DesignItemClothesDetailVO> clothes = new ArrayList<>();
DesignItemClothesDetailVO body = new DesignItemClothesDetailVO("body");
designSingleVO.setDesignItemId(designItemId); designSingleVO.setDesignItemId(designItemId);
designSingleVO.setDesignItemUrl(designItemUrl); designSingleVO.setDesignItemUrl(designItemUrl);
designSingleVO.setClothes(clothes); designSingleVO.setClothes(clothes);
@@ -433,9 +434,13 @@ public class DesignItemServiceImpl extends ServiceImpl<DesignItemMapper, DesignI
designItemClothesDetailVO.setColor(panToneService.getPantoneByRgb(singleItem.getColor())); designItemClothesDetailVO.setColor(panToneService.getPantoneByRgb(singleItem.getColor()));
designItemClothesDetailVO.setPrintObject(new DesignPythonItemPrint(singleItem.getPrintObject().getPath())); designItemClothesDetailVO.setPrintObject(new DesignPythonItemPrint(singleItem.getPrintObject().getPath()));
designItemClothesDetailVO.setLayersObject(layersObject.stream().filter( designItemClothesDetailVO.setLayersObject(layersObject.stream().filter(
layers -> 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(designItemClothesDetailVO);
}); });
clothes.add(body);
return designSingleVO; return designSingleVO;
} }

12
src/main/java/com/ai/da/service/impl/DesignServiceImpl.java
View File

@@ -758,7 +758,9 @@ public class DesignServiceImpl extends ServiceImpl<DesignMapper, Design> impleme
d.setId(o.getBusinessId()); d.setId(o.getBusinessId());
d.setPrintObject(new DesignPythonItemPrint()); 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){ private String converTypeToLevel1(String type){
if(StringUtils.isEmpty(type)){ if(StringUtils.isEmpty(type)){
@@ -854,7 +856,7 @@ public class DesignServiceImpl extends ServiceImpl<DesignMapper, Design> impleme
}); });
// 2、将查询出的图层信息填充到designItemDetailVO中 // 2、将查询出的图层信息填充到designItemDetailVO中
designItemDetailVO.setDesignItemUrl(designPythonOutfit.getDesignUrl()); designItemDetailVO.setDesignItemUrl(minIoUtil.getPresignedUrl(bucketName,designPythonOutfit.getDesignUrl(),480));
// 2.1 填充clothes // 2.1 填充clothes
designItemDetailVO.getClothes().forEach(c -> { designItemDetailVO.getClothes().forEach(c -> {
String type = c.getType().toLowerCase(); String type = c.getType().toLowerCase();
@@ -868,14 +870,14 @@ public class DesignServiceImpl extends ServiceImpl<DesignMapper, Design> impleme
String type = o.getType().toLowerCase(); String type = o.getType().toLowerCase();
List<DesignPythonOutfitVO> outfitVOS = detailsVO.stream().filter(detail -> detail.getImageCategory().equals(type + "_back") || List<DesignPythonOutfitVO> outfitVOS = detailsVO.stream().filter(detail -> detail.getImageCategory().equals(type + "_back") ||
detail.getImageCategory().equals(type + "_front") || 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); o.setLayersObject(outfitVOS);
}); });
}else{ }else{
designItemDetailVO.setDesignItemUrl(designItemUrl); designItemDetailVO.setDesignItemUrl(designItemUrl);
} }
return designItemDetailVO; return designItemDetailVO;
} }
} }

14
src/main/java/com/ai/da/service/impl/TDesignPythonOutfitDetailServiceImpl.java
View File

@@ -30,6 +30,8 @@ public class TDesignPythonOutfitDetailServiceImpl extends ServiceImpl<TDesignPyt
@Value("${minio.bucketName2}") @Value("${minio.bucketName2}")
private String bucketName2; private String bucketName2;
@Value("${minio.bucketName3}")
private String bucketName3;
@Resource @Resource
private MinioUtil minIoUtil; private MinioUtil minIoUtil;
@Override @Override
@@ -52,10 +54,14 @@ public class TDesignPythonOutfitDetailServiceImpl extends ServiceImpl<TDesignPyt
} }
DesignPythonOutfitVO designPythonOutfitVO = CopyUtil.copyObject(detail,DesignPythonOutfitVO.class); DesignPythonOutfitVO designPythonOutfitVO = CopyUtil.copyObject(detail,DesignPythonOutfitVO.class);
designPythonOutfitVO.setPosition((List<Long>) JSON.parse(detail.getPosition())); designPythonOutfitVO.setPosition(StringUtil.isNullOrEmpty(detail.getPosition()) ? null : (List<Long>) JSON.parse(detail.getPosition()));
designPythonOutfitVO.setImageSize((List<Long>) JSON.parse(detail.getImageSize())); designPythonOutfitVO.setImageSize(StringUtil.isNullOrEmpty(detail.getImageSize()) ? null : (List<Long>) JSON.parse(detail.getImageSize()));
designPythonOutfitVO.setImageUrl(StringUtil.isNullOrEmpty(detail.getImageUrl()) ? null : minIoUtil.getPresignedUrl(bucketName2,detail.getImageUrl(),5)); if (detail.getImageCategory().equals("body")){
designPythonOutfitVO.setMaskUrl(StringUtil.isNullOrEmpty(detail.getMaskUrl()) ? null : minIoUtil.getPresignedUrl(bucketName2,detail.getMaskUrl(),5)); 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; return designPythonOutfitVO;
} }

1
src/main/resources/application-test.properties
View File

@@ -48,6 +48,7 @@ minio.accessKey=minioadmin
minio.secretKey=minioadmin minio.secretKey=minioadmin
minio.bucketName=aida-results minio.bucketName=aida-results
minio.bucketName2=aida-clothing minio.bucketName2=aida-clothing
minio.bucketName3=aida-mannequins