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 1/3] =?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 { */ 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 不存数据库 submit -> 存数据库 List 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 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 queryWrapper = new QueryWrapper<>(); + queryWrapper.eq("relation_id", relationId) + .eq("model_type",modelType); + + return baseMapper.selectOne(queryWrapper); + } + } From a9f24e8fe5c229a4f0ac3839cf9a8dd0faef4956 Mon Sep 17 00:00:00 2001 From: xupei <1779019091@qq.com> Date: Thu, 5 Oct 2023 09:43:03 +0800 Subject: [PATCH 2/3] =?UTF-8?q?BUGFIX:=E6=B7=BB=E5=8A=A0progress=5Fid?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/main/java/com/ai/da/python/PythonService.java | 1 + 1 file changed, 1 insertion(+) diff --git a/src/main/java/com/ai/da/python/PythonService.java b/src/main/java/com/ai/da/python/PythonService.java index 597c8dea..fcfc32c1 100644 --- a/src/main/java/com/ai/da/python/PythonService.java +++ b/src/main/java/com/ai/da/python/PythonService.java @@ -1298,6 +1298,7 @@ public class PythonService { designPythonObjects.setObjects(objects); DesignPythonObject pythonObject = new DesignPythonObject(); + designPythonObjects.setProcess_id("1234"); pythonObject.setItems(coverToDesignSinglePythonItem(designSingleDTO, designLibraryModelPoint)); pythonObject.setBasic(coverToSingleBasic(singleOverall, switchCategory, designLibraryModelPoint)); objects.add(pythonObject); From 7a1652ac60eab24a883717ff49fa362a72c0890b Mon Sep 17 00:00:00 2001 From: xupei <1779019091@qq.com> Date: Thu, 5 Oct 2023 11:30:06 +0800 Subject: [PATCH 3/3] =?UTF-8?q?BUGFIX:=E7=BC=96=E8=BE=91=E5=9B=BE=E5=B1=82?= =?UTF-8?q?=E4=BD=8D=E7=BD=AE=E5=A4=A7=E5=B0=8F?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../java/com/ai/da/service/impl/DesignItemServiceImpl.java | 4 ++-- 1 file changed, 2 insertions(+), 2 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 0c4fb29d..fd072fec 100644 --- a/src/main/java/com/ai/da/service/impl/DesignItemServiceImpl.java +++ b/src/main/java/com/ai/da/service/impl/DesignItemServiceImpl.java @@ -587,9 +587,9 @@ public class DesignItemServiceImpl extends ServiceImpl convertToOutfitDetailPythonItemList(List layers){ - ArrayList composeLayerPythonItem = new ArrayList<>(); + List composeLayerPythonItem = Arrays.asList(new OutfitDetailPythonItem[layers.size()]); layers.forEach(layer -> { - composeLayerPythonItem.add(layers.size() - layer.getPriority(),new OutfitDetailPythonItem(layer.getImageCategory(), + composeLayerPythonItem.set(layer.getPriority() - 1,new OutfitDetailPythonItem(layer.getImageCategory(), layer.getPosition(), layer.getImageSize(), layer.getScale(),