From 480eb72be03d747aba115e8d33faf7c652a2907d Mon Sep 17 00:00:00 2001
From: xupei <xupei3360@163.com>
Date: Wed, 20 Dec 2023 11:18:38 +0800
Subject: [PATCH] =?UTF-8?q?BUGFIX:=E4=BF=AE=E5=A4=8Dsingle=E6=A8=A1?=
 =?UTF-8?q?=E5=BC=8F=E4=B8=8B=E8=A1=A3=E6=9C=8D=E5=9B=BE=E5=B1=82=E4=B8=8D?=
 =?UTF-8?q?=E8=BF=94=E5=9B=9E?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../ai/da/service/impl/DesignItemServiceImpl.java   | 13 ++++++++-----
 src/main/resources/messages_en.properties           |  1 +
 2 files changed, 9 insertions(+), 5 deletions(-)

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 da8b1df5..5260159d 100644
--- a/src/main/java/com/ai/da/service/impl/DesignItemServiceImpl.java
+++ b/src/main/java/com/ai/da/service/impl/DesignItemServiceImpl.java
@@ -427,7 +427,7 @@ public class DesignItemServiceImpl extends ServiceImpl<DesignItemMapper, DesignI
             if (design.getModelType().equals(ModelType.SYSTEM.getValue())) {
                 SysFileVO sysFile = sysFileService.getById(design.getTemplateId());
                 if (Objects.isNull(sysFile)) {
-                    throw new BusinessException("sysFile.not.found");
+                    throw new BusinessException("model.not.found");
                 }
                 modelUrl = sysFile.getUrl();
                 high = 700;
@@ -435,7 +435,7 @@ public class DesignItemServiceImpl extends ServiceImpl<DesignItemMapper, DesignI
             } else if (design.getModelType().equals(ModelType.LIBRARY.getValue())){
                 Library libFile = libraryService.getById(design.getTemplateId());
                 if (Objects.isNull(libFile)) {
-                    throw new BusinessException("sysFile.not.found");
+                    throw new BusinessException("model.not.found");
                 }
                 modelUrl = libFile.getUrl();
                 high = libFile.getHigh();
@@ -500,7 +500,8 @@ public class DesignItemServiceImpl extends ServiceImpl<DesignItemMapper, DesignI
                 minioUtil.getPresignedUrl(designPythonOutfit.getDesignUrl(), 24 * 60),
                 outfit.getString("synthesis_url"),
                 designSingleIncludeLayersDTO.getDesignSingleItemDTOList(),
-                detailsVO);
+                detailsVO,
+                design.getSingleOverall());
     }
 
     @Override
@@ -582,7 +583,8 @@ public class DesignItemServiceImpl extends ServiceImpl<DesignItemMapper, DesignI
     private DesignSingleVO assembleDesignSingleResponse(Long designItemId, String designItemUrl,
                                                         String currentFullBodyView,
                                                         List<DesignSingleItemDTO> designSingleItemDTOList,
-                                                        List<DesignPythonOutfitVO> layersObject) {
+                                                        List<DesignPythonOutfitVO> layersObject,
+                                                        String singleOrOverall) {
 
         DesignSingleVO designSingleVO = new DesignSingleVO();
         ArrayList<DesignItemClothesDetailVO> clothes = new ArrayList<>();
@@ -594,6 +596,7 @@ public class DesignItemServiceImpl extends ServiceImpl<DesignItemMapper, DesignI
         designSingleVO.setCurrentFullBodyView(minioUtil.getPresignedUrl(currentFullBodyView, 24 * 60));
         designSingleVO.setClothes(clothes);
 
+        boolean flag = singleOrOverall.equals("single");
         designSingleItemDTOList.forEach(singleItem -> {
             DesignItemClothesDetailVO designItemClothesDetailVO = new DesignItemClothesDetailVO();
             designItemClothesDetailVO.setId(singleItem.getId());
@@ -605,7 +608,7 @@ public class DesignItemServiceImpl extends ServiceImpl<DesignItemMapper, DesignI
             designItemClothesDetailVO.setPrintObject(singleItem.getPrintObject());
             designItemClothesDetailVO.setLayersObject(layersObject.stream().filter(
                     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()));
             body.setLayersObject(layersObject.stream().filter(layers -> layers.getImageCategory().equals("body")).collect(Collectors.toList()));
 
diff --git a/src/main/resources/messages_en.properties b/src/main/resources/messages_en.properties
index c677edc7..893ffb07 100644
--- a/src/main/resources/messages_en.properties
+++ b/src/main/resources/messages_en.properties
@@ -130,6 +130,7 @@ the.workspace.lastIndex.not.found=The workspace lastIndex not found.
 gender.cannot.be.empty=gender cannot be empty.
 image.synthesis.failed=image synthesis failed.
 priority.cannot.be.repeated=priority cannot be repeated.
+model.not.found=model not found
 
 # 可能会报异常
 # Informative: