参数结构修改
This commit is contained in:
@@ -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<DesignSinglePrint> printObject) {
|
||||
private PrintToPython resolveDesignSinglePrint(List<DesignSinglePrint> 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;
|
||||
}
|
||||
|
||||
@@ -87,11 +87,6 @@ public class DesignPythonItem {
|
||||
*/
|
||||
private String seg_mask_url;
|
||||
|
||||
/**
|
||||
* 局部design
|
||||
*/
|
||||
private String partial_design;
|
||||
|
||||
public static List<String> 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<Long> 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) {
|
||||
|
||||
@@ -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);
|
||||
|
||||
Reference in New Issue
Block a user