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

BUGFIX:修复single模式下衣服图层不返回

Browse Source
This commit is contained in:
xupei
2023-12-20 11:18:38 +08:00
parent 8dd658f1e9
commit 480eb72be0
2 changed files with 9 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -427,7 +427,7 @@ public class DesignItemServiceImpl extends ServiceImpl<DesignItemMapper, DesignI
if (design.getModelType().equals(ModelType.SYSTEM.getValue())) { if (design.getModelType().equals(ModelType.SYSTEM.getValue())) {
SysFileVO sysFile = sysFileService.getById(design.getTemplateId()); SysFileVO sysFile = sysFileService.getById(design.getTemplateId());
if (Objects.isNull(sysFile)) { if (Objects.isNull(sysFile)) {
throw new BusinessException("sysFile.not.found"); throw new BusinessException("model.not.found");
} }
modelUrl = sysFile.getUrl(); modelUrl = sysFile.getUrl();
high = 700; high = 700;
@@ -435,7 +435,7 @@ public class DesignItemServiceImpl extends ServiceImpl<DesignItemMapper, DesignI
} else if (design.getModelType().equals(ModelType.LIBRARY.getValue())){ } else if (design.getModelType().equals(ModelType.LIBRARY.getValue())){
Library libFile = libraryService.getById(design.getTemplateId()); Library libFile = libraryService.getById(design.getTemplateId());
if (Objects.isNull(libFile)) { if (Objects.isNull(libFile)) {
throw new BusinessException("sysFile.not.found"); throw new BusinessException("model.not.found");
} }
modelUrl = libFile.getUrl(); modelUrl = libFile.getUrl();
high = libFile.getHigh(); high = libFile.getHigh();
@@ -500,7 +500,8 @@ public class DesignItemServiceImpl extends ServiceImpl<DesignItemMapper, DesignI
minioUtil.getPresignedUrl(designPythonOutfit.getDesignUrl(), 24 * 60), minioUtil.getPresignedUrl(designPythonOutfit.getDesignUrl(), 24 * 60),
outfit.getString("synthesis_url"), outfit.getString("synthesis_url"),
designSingleIncludeLayersDTO.getDesignSingleItemDTOList(), designSingleIncludeLayersDTO.getDesignSingleItemDTOList(),
detailsVO); detailsVO,
design.getSingleOverall());
} }
@Override @Override
@@ -582,7 +583,8 @@ public class DesignItemServiceImpl extends ServiceImpl<DesignItemMapper, DesignI
private DesignSingleVO assembleDesignSingleResponse(Long designItemId, String designItemUrl, private DesignSingleVO assembleDesignSingleResponse(Long designItemId, String designItemUrl,
String currentFullBodyView, String currentFullBodyView,
List<DesignSingleItemDTO> designSingleItemDTOList, List<DesignSingleItemDTO> designSingleItemDTOList,
List<DesignPythonOutfitVO> layersObject) { List<DesignPythonOutfitVO> layersObject,
String singleOrOverall) {
DesignSingleVO designSingleVO = new DesignSingleVO(); DesignSingleVO designSingleVO = new DesignSingleVO();
ArrayList<DesignItemClothesDetailVO> clothes = new ArrayList<>(); ArrayList<DesignItemClothesDetailVO> clothes = new ArrayList<>();
@@ -594,6 +596,7 @@ public class DesignItemServiceImpl extends ServiceImpl<DesignItemMapper, DesignI
designSingleVO.setCurrentFullBodyView(minioUtil.getPresignedUrl(currentFullBodyView, 24 * 60)); designSingleVO.setCurrentFullBodyView(minioUtil.getPresignedUrl(currentFullBodyView, 24 * 60));
designSingleVO.setClothes(clothes); designSingleVO.setClothes(clothes);
boolean flag = singleOrOverall.equals("single");
designSingleItemDTOList.forEach(singleItem -> { designSingleItemDTOList.forEach(singleItem -> {
DesignItemClothesDetailVO designItemClothesDetailVO = new DesignItemClothesDetailVO(); DesignItemClothesDetailVO designItemClothesDetailVO = new DesignItemClothesDetailVO();
designItemClothesDetailVO.setId(singleItem.getId()); designItemClothesDetailVO.setId(singleItem.getId());
@@ -605,7 +608,7 @@ public class DesignItemServiceImpl extends ServiceImpl<DesignItemMapper, DesignI
designItemClothesDetailVO.setPrintObject(singleItem.getPrintObject()); designItemClothesDetailVO.setPrintObject(singleItem.getPrintObject());
designItemClothesDetailVO.setLayersObject(layersObject.stream().filter( designItemClothesDetailVO.setLayersObject(layersObject.stream().filter(
layers -> (singleItem.getType().toLowerCase().equals(layers.getImageCategory().split("_")[0]) layers -> (singleItem.getType().toLowerCase().equals(layers.getImageCategory().split("_")[0])
&& singleItem.getPriority().equals(layers.getPriority())) && (flag ? Boolean.TRUE : singleItem.getPriority().equals(layers.getPriority())))
).collect(Collectors.toList())); ).collect(Collectors.toList()));
body.setLayersObject(layersObject.stream().filter(layers -> layers.getImageCategory().equals("body")).collect(Collectors.toList())); body.setLayersObject(layersObject.stream().filter(layers -> layers.getImageCategory().equals("body")).collect(Collectors.toList()));

1
src/main/resources/messages_en.properties
View File

@@ -130,6 +130,7 @@ the.workspace.lastIndex.not.found=The workspace lastIndex not found.
gender.cannot.be.empty=gender cannot be empty. gender.cannot.be.empty=gender cannot be empty.
image.synthesis.failed=image synthesis failed. image.synthesis.failed=image synthesis failed.
priority.cannot.be.repeated=priority cannot be repeated. priority.cannot.be.repeated=priority cannot be repeated.
model.not.found=model not found
# 可能会报异常 # 可能会报异常
# Informative: # Informative: