From 6dc61dd45281f10a883a54a3e9dd4902e940034d Mon Sep 17 00:00:00 2001
From: xupei <1779019091@qq.com>
Date: Wed, 4 Oct 2023 14:51:00 +0800
Subject: [PATCH] =?UTF-8?q?=E6=A8=A1=E7=89=B9=E7=9B=B8=E5=85=B3=E4=BF=AE?=
 =?UTF-8?q?=E6=94=B9=20=E5=8F=8A=E5=9B=BE=E5=B1=82=E4=BF=AE=E6=94=B9=20?=
 =?UTF-8?q?=E6=B7=BB=E5=8A=A0=E4=BC=98=E5=85=88=E7=BA=A7?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../ai/da/model/vo/DesignPythonOutfitVO.java  |  4 +++
 .../service/impl/DesignItemServiceImpl.java   | 31 +++++++++++++++----
 2 files changed, 29 insertions(+), 6 deletions(-)

diff --git a/src/main/java/com/ai/da/model/vo/DesignPythonOutfitVO.java b/src/main/java/com/ai/da/model/vo/DesignPythonOutfitVO.java
index ad3a37c1..42e4dae0 100644
--- a/src/main/java/com/ai/da/model/vo/DesignPythonOutfitVO.java
+++ b/src/main/java/com/ai/da/model/vo/DesignPythonOutfitVO.java
@@ -47,4 +47,8 @@ public class DesignPythonOutfitVO {
      */
     @ApiModelProperty(value = "缩放比例")
     private Float scale = 1.0f;
+    /**
+     * 图层优先级 从1开始，优先级数字越大越靠近上层
+     */
+    private Integer priority;
 }
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 4ac99d4e..a514d107 100644
--- a/src/main/java/com/ai/da/service/impl/DesignItemServiceImpl.java
+++ b/src/main/java/com/ai/da/service/impl/DesignItemServiceImpl.java
@@ -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(),