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); 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..fd072fec 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; @@ -586,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(), 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); + } + }