diff --git a/src/main/java/com/ai/da/python/PythonService.java b/src/main/java/com/ai/da/python/PythonService.java index 934e126e..c0812b55 100644 --- a/src/main/java/com/ai/da/python/PythonService.java +++ b/src/main/java/com/ai/da/python/PythonService.java @@ -2788,7 +2788,7 @@ public class PythonService { DesignPythonObject pythonObject = new DesignPythonObject(); designPythonObjects.setProcess_id(designSingleDTO.getProcessId()); - pythonObject.setItems(coverToDesignSinglePythonItem(designSingleDTO, designLibraryModelPoint)); + pythonObject.setItems(coverToDesignSinglePythonItem(designSingleDTO, designLibraryModelPoint, singleOverall)); pythonObject.setBasic(coverToSingleBasic(singleOverall, switchCategory, designLibraryModelPoint, previewOrSubmit)); objects.add(pythonObject); return designPythonObjects; @@ -2823,7 +2823,9 @@ public class PythonService { * @param designLibraryModelPoint * @return */ - private List coverToDesignSinglePythonItem(DesignSingleIncludeLayersDTO designSingleIncludeLayersDTO, DesignLibraryModelPointVO designLibraryModelPoint) { + private List coverToDesignSinglePythonItem(DesignSingleIncludeLayersDTO designSingleIncludeLayersDTO, + DesignLibraryModelPointVO designLibraryModelPoint, + String singleOverall) { List designSingleItemList = designSingleIncludeLayersDTO.getDesignSingleItemDTOList(); List response = new ArrayList<>(); @@ -2872,15 +2874,16 @@ public class PythonService { }); - - String bodyPath; - if (Objects.nonNull(designLibraryModelPoint)) { - bodyPath = designLibraryModelPoint.getTemplateUrl(); - } else { + if (singleOverall.equals("overall")){ + String bodyPath; + if (Objects.nonNull(designLibraryModelPoint)) { + bodyPath = designLibraryModelPoint.getTemplateUrl(); + } else { // bodyPath = "/workspace/python_code/Multi-layer-Virtual-Try-on/dataset_for_test/Img_model.png"; - bodyPath = "aida-mannequins/model_1693218345.2714432.png"; + bodyPath = "aida-mannequins/model_1693218345.2714432.png"; + } + response.add(new DesignPythonItem(SysFileLevel2TypeEnum.BODY.getRealName(), bodyPath, pythonTAllInfoService.getImageIdByPath(bodyPath))); } - response.add(new DesignPythonItem(SysFileLevel2TypeEnum.BODY.getRealName(), bodyPath, pythonTAllInfoService.getImageIdByPath(bodyPath))); return response; } 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 dd57d216..d06e8276 100644 --- a/src/main/java/com/ai/da/service/impl/DesignItemServiceImpl.java +++ b/src/main/java/com/ai/da/service/impl/DesignItemServiceImpl.java @@ -325,7 +325,7 @@ public class DesignItemServiceImpl extends ServiceImpl saveDesignSingleItemDetailAndLayers(DesignPythonObjects pythonObjects + public List saveDesignSingleItemDetailAndLayers(DesignPythonObjects pythonObjects , Long designId, Long designItemId, Long userId , JSONObject outfit, String timeZone, List designSingleItemDTOList , Map categoryAndUndividedLayer @@ -342,7 +342,8 @@ public class DesignItemServiceImpl extends ServiceImpl designItemDetails = Lists.newArrayList(); @@ -401,6 +402,12 @@ public class DesignItemServiceImpl extends ServiceImpl setTDesignPythonOutfitDetailList(JSONArray layers, Long designId, Long designPythonOutfitId, Long userId, Map> priorityOffset) { @@ -621,6 +628,11 @@ public class DesignItemServiceImpl extends ServiceImpl { // 如果sketch截图不为空,则将该截图上传,并替换path