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

Merge remote-tracking branch 'origin/develop' into develop

Browse Source
This commit is contained in:
shahaibo
2023-10-05 15:16:03 +08:00
parent 61e9888ab9 d8d167baa8
commit fa44552437
4 changed files with 13 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
src/main/java/com/ai/da/model/vo/DesignPythonOutfitVO.java
View File

@@ -32,11 +32,15 @@ public class DesignPythonOutfitVO {
*/ */
@ApiModelProperty(value = "对应的图片的绝对路径") @ApiModelProperty(value = "对应的图片的绝对路径")
private String imageUrl; private String imageUrl;
private String imageMinioUrl;
/** /**
* mask_url * mask_url
*/ */
@ApiModelProperty(value = "遮罩") @ApiModelProperty(value = "遮罩")
private String maskUrl; private String maskUrl;
private String maskMinioUrl;
/** /**
* 位置 * 位置
*/ */

6
src/main/java/com/ai/da/python/PythonService.java
View File

@@ -1396,8 +1396,12 @@ public class PythonService {
List<DesignSinglePrint> prints = printObject.getPrints(); List<DesignSinglePrint> prints = printObject.getPrints();
prints.forEach(p -> { prints.forEach(p -> {
if (printObject.getIfSingle().equals(Boolean.FALSE)){ if (printObject.getIfSingle().equals(Boolean.FALSE)){
p.getLocation().set(0,p.getLocation().get(0));
p.getLocation().set(1,p.getLocation().get(1));
scale.add(p.getScale()); scale.add(p.getScale());
paths.add(p.getPath()); paths.add(p.getMinIOPath());
location.add(p.getLocation());
angle.add(p.getAngle());
}else { }else {
p.getLocation().set(0,p.getLocation().get(0)); p.getLocation().set(0,p.getLocation().get(0));
p.getLocation().set(1,p.getLocation().get(1)); p.getLocation().set(1,p.getLocation().get(1));

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

@@ -459,8 +459,8 @@ public class DesignItemServiceImpl extends ServiceImpl<DesignItemMapper, DesignI
TDesignPythonOutfitDetail detail = designPythonOutfitDetailService.getById(layer.getId()); TDesignPythonOutfitDetail detail = designPythonOutfitDetailService.getById(layer.getId());
Assert.notNull(detail,layer.getImageCategory() + " layer does not exists!"); Assert.notNull(detail,layer.getImageCategory() + " layer does not exists!");
layer.setImageUrl(detail.getImageUrl()); /*layer.setImageUrl(detail.getImageUrl());
layer.setMaskUrl(detail.getMaskUrl()); layer.setMaskUrl(detail.getMaskUrl());*/
}); });
// 3、组装python入参 // 3、组装python入参

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

@@ -58,7 +58,9 @@ public class TDesignPythonOutfitDetailServiceImpl extends ServiceImpl<TDesignPyt
designPythonOutfitVO.setPosition(StringUtil.isNullOrEmpty(detail.getPosition()) ? null : (List<Long>) JSON.parse(detail.getPosition())); designPythonOutfitVO.setPosition(StringUtil.isNullOrEmpty(detail.getPosition()) ? null : (List<Long>) JSON.parse(detail.getPosition()));
// designPythonOutfitVO.setImageSize(StringUtil.isNullOrEmpty(detail.getImageSize()) ? null : (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.splitThenGetPreviewUrl(detail.getImageUrl(),480)); designPythonOutfitVO.setImageUrl(StringUtil.isNullOrEmpty(detail.getImageUrl()) ? null : minIoUtil.splitThenGetPreviewUrl(detail.getImageUrl(),480));
designPythonOutfitVO.setImageMinioUrl(StringUtil.isNullOrEmpty(detail.getImageUrl()) ? null : detail.getImageUrl());
designPythonOutfitVO.setMaskUrl(StringUtil.isNullOrEmpty(detail.getMaskUrl()) ? null : minIoUtil.splitThenGetPreviewUrl(detail.getMaskUrl(),480)); designPythonOutfitVO.setMaskUrl(StringUtil.isNullOrEmpty(detail.getMaskUrl()) ? null : minIoUtil.splitThenGetPreviewUrl(detail.getMaskUrl(),480));
designPythonOutfitVO.setMaskMinioUrl(StringUtil.isNullOrEmpty(detail.getMaskUrl()) ? null : detail.getMaskUrl());
designPythonOutfitVO.setScale(Float.parseFloat(detail.getScale())); designPythonOutfitVO.setScale(Float.parseFloat(detail.getScale()));
if (!StringUtil.isNullOrEmpty(detail.getImageSize())){ if (!StringUtil.isNullOrEmpty(detail.getImageSize())){