From abecb54b1d42f21033dda4b173da309cb9f9350a Mon Sep 17 00:00:00 2001
From: xupei <1779019091@qq.com>
Date: Wed, 4 Oct 2023 19:14:42 +0800
Subject: [PATCH] =?UTF-8?q?BUGFIX:=E8=8E=B7=E5=8F=96=E6=A8=A1=E7=89=B9?=
 =?UTF-8?q?=E4=BF=A1=E6=81=AF?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../java/com/ai/da/service/LibraryModelPointService.java | 2 ++
 .../com/ai/da/service/impl/DesignItemServiceImpl.java    | 3 ++-
 .../java/com/ai/da/service/impl/DesignServiceImpl.java   | 1 -
 .../ai/da/service/impl/LibraryModelPointServiceImpl.java | 9 +++++++++
 4 files changed, 13 insertions(+), 2 deletions(-)

diff --git a/src/main/java/com/ai/da/service/LibraryModelPointService.java b/src/main/java/com/ai/da/service/LibraryModelPointService.java
index f310b5d0..95f83719 100644
--- a/src/main/java/com/ai/da/service/LibraryModelPointService.java
+++ b/src/main/java/com/ai/da/service/LibraryModelPointService.java
@@ -30,4 +30,6 @@ public interface LibraryModelPointService extends IService<LibraryModelPoint> {
      */
     String modelsDot( ModelsDotDTO modelsDotDTO );
 
+    LibraryModelPoint getByRelationId(Long relationId,String modelType);
+
 }
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 a514d107..0c4fb29d 100644
--- a/src/main/java/com/ai/da/service/impl/DesignItemServiceImpl.java
+++ b/src/main/java/com/ai/da/service/impl/DesignItemServiceImpl.java
@@ -404,7 +404,7 @@ public class DesignItemServiceImpl extends ServiceImpl<DesignItemMapper, DesignI
                 high = libFile.getHigh();
                 width = libFile.getWidth();
             }
-            LibraryModelPoint modelPoint = libraryModelPointService.getById(design.getTemplateId());
+            LibraryModelPoint modelPoint = libraryModelPointService.getByRelationId(design.getTemplateId(),design.getModelType());
             Assert.notNull(modelPoint,"The model has not been tagged");
 
             designLibraryModelPointVO = collectionElementService.calculateTemplatePoint(modelPoint,high,width,modelUrl);
@@ -413,6 +413,7 @@ public class DesignItemServiceImpl extends ServiceImpl<DesignItemMapper, DesignI
         // 组装入参
         DesignPythonObjects objects =pythonService.covertDesignSingleParam(
                 designSingleIncludeLayersDTO,design.getSingleOverall(),design.getSwitchCategory(),designLibraryModelPointVO);
+        // design
         JSONObject jsonObject = pythonService.designNew(objects);
         // preview -> 不存数据库    submit -> 存数据库
         List<TDesignPythonOutfitDetail> tDesignPythonOutfitDetails;
diff --git a/src/main/java/com/ai/da/service/impl/DesignServiceImpl.java b/src/main/java/com/ai/da/service/impl/DesignServiceImpl.java
index c7ba280a..6b0f6ffc 100644
--- a/src/main/java/com/ai/da/service/impl/DesignServiceImpl.java
+++ b/src/main/java/com/ai/da/service/impl/DesignServiceImpl.java
@@ -978,7 +978,6 @@ public class DesignServiceImpl extends ServiceImpl<DesignMapper, Design> impleme
             }else {
                 designSinglePrintDTO.setIfSingle(Boolean.TRUE);
                 designSinglePrint.setLocation(JSONArray.parseArray(detailPrint.getPosition(),Double.class));
-                designSinglePrint.setScale(detailPrint.getScale());
                 designSinglePrint.setAngle(detailPrint.getAngle());
                 designSinglePrint.setPriority(detailPrint.getPriority());
             }
diff --git a/src/main/java/com/ai/da/service/impl/LibraryModelPointServiceImpl.java b/src/main/java/com/ai/da/service/impl/LibraryModelPointServiceImpl.java
index a2a8e0b8..d0f354a2 100644
--- a/src/main/java/com/ai/da/service/impl/LibraryModelPointServiceImpl.java
+++ b/src/main/java/com/ai/da/service/impl/LibraryModelPointServiceImpl.java
@@ -114,4 +114,13 @@ public class LibraryModelPointServiceImpl extends ServiceImpl<LibraryModelPointM
         return objects.getObjects().get(0).getBasic().getSave_name();
     }
 
+    @Override
+    public LibraryModelPoint getByRelationId(Long relationId,String modelType){
+        QueryWrapper<LibraryModelPoint> queryWrapper = new QueryWrapper<>();
+        queryWrapper.eq("relation_id", relationId)
+                .eq("model_type",modelType);
+
+        return baseMapper.selectOne(queryWrapper);
+    }
+
 }