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-04 15:06:34 +08:00
parent 00fcdf9cbf 6dc61dd452
commit 2ad61ff618
2 changed files with 29 additions and 6 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

@@ -47,4 +47,8 @@ public class DesignPythonOutfitVO {
*/
@ApiModelProperty(value = "缩放比例")
private Float scale = 1.0f;
/**
* 图层优先级 从1开始，优先级数字越大越靠近上层
*/
private Integer priority;
}

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

@@ -11,6 +11,7 @@ import com.ai.da.common.utils.MinioUtil;
import com.ai.da.mapper.DesignItemMapper;
import com.ai.da.mapper.entity.*;
import com.ai.da.model.dto.*;
import com.ai.da.model.enums.ModelType;
import com.ai.da.model.vo.*;
import com.ai.da.python.PythonService;
import com.ai.da.python.vo.*;
@@ -23,7 +24,6 @@ import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
import com.google.common.collect.Lists;
import io.netty.util.internal.StringUtil;
import lombok.extern.slf4j.Slf4j;
import org.checkerframework.checker.units.qual.A;
import org.springframework.stereotype.Service;
import org.springframework.util.Assert;
@@ -384,11 +384,30 @@ public class DesignItemServiceImpl extends ServiceImpl<DesignItemMapper, DesignI
DesignLibraryModelPointVO designLibraryModelPointVO = null;
// 设置模特
if (Objects.nonNull(design.getTemplateId())){
// LibraryModelPoint modelPoint = libraryModelPointService.getById(design.getTemplateId());
// Assert.notNull(modelPoint,"template does not exists!");
// Library library = libraryService.getById(modelPoint.getRelationId());
// Assert.notNull(library,"template does not exists!");
String modelUrl;
Integer high;
Integer width;
if (design.getModelType().equals(ModelType.SYSTEM.getValue())){
SysFileVO sysFile = sysFileService.getById(design.getTemplateId());
Assert.notNull(sysFile,"model does not exists!");
modelUrl = sysFile.getUrl();
high = 1654;
width = 1170;
}else{
Library libFile = libraryService.getById(design.getTemplateId());
Assert.notNull(libFile,"model does not exists!");
modelUrl = libFile.getUrl();
high = libFile.getHigh();
width = libFile.getWidth();
}
LibraryModelPoint modelPoint = libraryModelPointService.getById(design.getTemplateId());
Assert.notNull(modelPoint,"template does not exists!");
Library library = libraryService.getById(modelPoint.getRelationId());
Assert.notNull(library,"template does not exists!");
designLibraryModelPointVO = collectionElementService.calculateTemplatePoint(modelPoint,library.getHigh(),library.getWidth(),library.getUrl());
Assert.notNull(modelPoint,"The model has not been tagged");
designLibraryModelPointVO = collectionElementService.calculateTemplatePoint(modelPoint,high,width,modelUrl);
}
// 组装入参
@@ -569,7 +588,7 @@ public class DesignItemServiceImpl extends ServiceImpl<DesignItemMapper, DesignI
private List<OutfitDetailPythonItem> convertToOutfitDetailPythonItemList(List<DesignPythonOutfitVO> layers){
ArrayList<OutfitDetailPythonItem> composeLayerPythonItem = new ArrayList<>();
layers.forEach(layer -> {
composeLayerPythonItem.add(new OutfitDetailPythonItem(layer.getImageCategory(),
composeLayerPythonItem.add(layers.size() - layer.getPriority(),new OutfitDetailPythonItem(layer.getImageCategory(),
layer.getPosition(),
layer.getImageSize(),
layer.getScale(),