diff --git a/src/main/java/com/ai/da/python/PythonService.java b/src/main/java/com/ai/da/python/PythonService.java index 6e1e75a7..75fb7b62 100644 --- a/src/main/java/com/ai/da/python/PythonService.java +++ b/src/main/java/com/ai/da/python/PythonService.java @@ -2714,7 +2714,8 @@ public class PythonService { gradientString = JSONObject.toJSONString(designSingleItem.getGradient()); } - PrintToPython printToPython = resolveDesignSinglePrint(designSingleItem.getPrintObject().getPrints()); + PrintToPython printToPython = resolveDesignSinglePrint(designSingleItem.getPrintObject().getPrints(), + designSingleItem.getPartialDesignDTO().getPartialDesignMinioPath()); resolveDesignElement(designSingleItem.getTrims(), printToPython); response.add(new DesignPythonItem( designSingleItem.getType(), @@ -2731,8 +2732,7 @@ public class PythonService { minioPath, gradientString, /*designSingleItem.getMaskUrl()*/ - null, - designSingleItem.getPartialDesignDTO().getPartialDesignMinioPath() + null )); }); @@ -2750,12 +2750,13 @@ public class PythonService { } - private PrintToPython resolveDesignSinglePrint(List printObject) { + private PrintToPython resolveDesignSinglePrint(List printObject, String partialDesign) { PrintToPython printToPython = new PrintToPython(); DesignPythonItemPrint printSingle = new DesignPythonItemPrint(); DesignPythonItemPrint printOverall = new DesignPythonItemPrint(); printToPython.setSingle(printSingle); printToPython.setOverall(printOverall); + printToPython.setPartial(StringUtil.isNullOrEmpty(partialDesign) ? null : partialDesign); if (Objects.isNull(printObject) || printObject.isEmpty()){ return printToPython; } diff --git a/src/main/java/com/ai/da/python/vo/DesignPythonItem.java b/src/main/java/com/ai/da/python/vo/DesignPythonItem.java index bc63d052..92e3892b 100644 --- a/src/main/java/com/ai/da/python/vo/DesignPythonItem.java +++ b/src/main/java/com/ai/da/python/vo/DesignPythonItem.java @@ -87,11 +87,6 @@ public class DesignPythonItem { */ private String seg_mask_url; - /** - * 局部design - */ - private String partial_design; - public static List OUTWEAR_DRESS_BLOUSE = Arrays.asList(CollectionLevel2TypeEnum.OUTWEAR.getRealName(), CollectionLevel2TypeEnum.DRESS.getRealName(), CollectionLevel2TypeEnum.BLOUSE.getRealName()); @@ -145,7 +140,7 @@ public class DesignPythonItem { public DesignPythonItem(String type, String path, String color, PrintToPython print, Long businessId, Long image_id, List offset, Float[] resize_scale, Integer priority, String gradient, - String gradientString, String seg_mask_url, String partial_design) { + String gradientString, String seg_mask_url) { this.type = type; this.path = path; this.color = color; @@ -159,7 +154,6 @@ public class DesignPythonItem { this.gradient = gradient; this.gradientString = gradientString; this.seg_mask_url = seg_mask_url; - this.partial_design = partial_design; } public DesignPythonItem(String type, String path, String color, PrintToPython print, String icon, Long businessId, Long image_id) { diff --git a/src/main/java/com/ai/da/python/vo/PrintToPython.java b/src/main/java/com/ai/da/python/vo/PrintToPython.java index 1d2f79ca..2c1abd71 100644 --- a/src/main/java/com/ai/da/python/vo/PrintToPython.java +++ b/src/main/java/com/ai/da/python/vo/PrintToPython.java @@ -11,6 +11,7 @@ public class PrintToPython { private DesignPythonItemPrint single; private DesignPythonItemPrint overall; private DesignPythonItemElement element; + private String partial; public PrintToPython(DesignPythonItemPrint overall) { this.overall = new DesignPythonItemPrint(overall.getPrint_path_list(),Boolean.TRUE); 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 5cfbd8c1..086f33a0 100644 --- a/src/main/java/com/ai/da/service/impl/DesignItemServiceImpl.java +++ b/src/main/java/com/ai/da/service/impl/DesignItemServiceImpl.java @@ -358,7 +358,7 @@ public class DesignItemServiceImpl extends ServiceImpl impleme // 有印花 d.setTrims(convertToDesignSinglePrintDTO(trims, o.getPath())); } + String preSigned = StringUtil.isNullOrEmpty(o.getPartialDesign()) ? null : minioUtil.getPreSignedUrl(o.getPartialDesign(), CommonConstant.MINIO_IMAGE_EXPIRE_TIME); + d.setPartialDesign(new PartialDesignDTO(o.getPartialDesign(), preSigned)); })); //single 和 Models(模特)时候 系统元素为空 List filterDetail2 = designItemDetails.stream()