diff --git a/src/main/java/com/ai/da/mapper/primary/entity/DesignItemDetailPrint.java b/src/main/java/com/ai/da/mapper/primary/entity/DesignItemDetailPrint.java index 09e142b5..25e9ff6f 100644 --- a/src/main/java/com/ai/da/mapper/primary/entity/DesignItemDetailPrint.java +++ b/src/main/java/com/ai/da/mapper/primary/entity/DesignItemDetailPrint.java @@ -41,7 +41,7 @@ public class DesignItemDetailPrint { /** * 印花缩放比例 */ - private Double scale; + private Double[] scale; /** * 印花旋转角度 */ diff --git a/src/main/java/com/ai/da/mapper/primary/entity/SubscriptionInfo.java b/src/main/java/com/ai/da/mapper/primary/entity/SubscriptionInfo.java index 7ee32ab0..9d3ce981 100644 --- a/src/main/java/com/ai/da/mapper/primary/entity/SubscriptionInfo.java +++ b/src/main/java/com/ai/da/mapper/primary/entity/SubscriptionInfo.java @@ -19,7 +19,7 @@ public class SubscriptionInfo extends BaseEntity{ // month || year private String type; - // active || expired + // active || canceled private String status = "active"; private byte cancelNotified = (byte)0; diff --git a/src/main/java/com/ai/da/model/vo/DesignSinglePrint.java b/src/main/java/com/ai/da/model/vo/DesignSinglePrint.java index 88bb9475..b36d6052 100644 --- a/src/main/java/com/ai/da/model/vo/DesignSinglePrint.java +++ b/src/main/java/com/ai/da/model/vo/DesignSinglePrint.java @@ -33,7 +33,7 @@ public class DesignSinglePrint implements Serializable { @ApiModelProperty("印花大小") @Range(max = 1, message = "印花缩放值需用大于等于0小于等于1的数表示") - private Double scale; + private Double[] scale; @Range(min = -360, max = 360, message = "印花旋转角度范围为-360° ~ 360°") @ApiModelProperty("印花角度") @@ -46,12 +46,12 @@ public class DesignSinglePrint implements Serializable { public DesignSinglePrint() { } - public DesignSinglePrint(String path, Double scale) { + public DesignSinglePrint(String path, Double[] scale) { this.path = path; this.scale = scale; } - public DesignSinglePrint(String level2Type, String path, String minIOPath, List location, Double scale, Double angle, Integer priority, Boolean ifSingle) { + public DesignSinglePrint(String level2Type, String path, String minIOPath, List location, Double[] scale, Double angle, Integer priority, Boolean ifSingle) { this.level2Type = level2Type; this.path = path; this.minIOPath = minIOPath; diff --git a/src/main/java/com/ai/da/python/PythonService.java b/src/main/java/com/ai/da/python/PythonService.java index e3bebcd7..4662477a 100644 --- a/src/main/java/com/ai/da/python/PythonService.java +++ b/src/main/java/com/ai/da/python/PythonService.java @@ -2768,12 +2768,12 @@ public class PythonService { int size = printObject.size(); // 占位符填充数组 List> locationS = new ArrayList<>(Collections.nCopies(size, null)); - List scaleS = new ArrayList<>(Collections.nCopies(size, null)); + List scaleS = new ArrayList<>(Collections.nCopies(size, null)); List angleS = new ArrayList<>(Collections.nCopies(size, null)); ArrayList pathsS = new ArrayList<>(Collections.nCopies(size, null)); List> locationO = new ArrayList<>(Collections.nCopies(size, null)); - List scaleO = new ArrayList<>(Collections.nCopies(size, null)); + List scaleO = new ArrayList<>(Collections.nCopies(size, null)); List angleO = new ArrayList<>(Collections.nCopies(size, null)); ArrayList pathsO = new ArrayList<>(Collections.nCopies(size, null)); @@ -2831,7 +2831,7 @@ public class PythonService { int size = trims.getPrints().size(); // 占位符填充数组 List> location = new ArrayList<>(Collections.nCopies(size, null)); - List scale = new ArrayList<>(Collections.nCopies(size, null)); + List scale = new ArrayList<>(Collections.nCopies(size, null)); List angle = new ArrayList<>(Collections.nCopies(size, null)); ArrayList paths = new ArrayList<>(Collections.nCopies(size, null)); diff --git a/src/main/java/com/ai/da/python/vo/DesignPythonItemElement.java b/src/main/java/com/ai/da/python/vo/DesignPythonItemElement.java index 71560f2d..d9833618 100644 --- a/src/main/java/com/ai/da/python/vo/DesignPythonItemElement.java +++ b/src/main/java/com/ai/da/python/vo/DesignPythonItemElement.java @@ -15,7 +15,7 @@ public class DesignPythonItemElement { private List element_path_list = new ArrayList<>(); @ApiModelProperty("print的缩放比例 传 [0.2, 0.2]") - private List element_scale_list = new ArrayList<>(); + private List element_scale_list = new ArrayList<>(); @ApiModelProperty("print的旋转角度 传 [0.2, 0.2]") private List element_angle_list = new ArrayList<>(); diff --git a/src/main/java/com/ai/da/python/vo/DesignPythonItemPrint.java b/src/main/java/com/ai/da/python/vo/DesignPythonItemPrint.java index 617c8e65..1c02923c 100644 --- a/src/main/java/com/ai/da/python/vo/DesignPythonItemPrint.java +++ b/src/main/java/com/ai/da/python/vo/DesignPythonItemPrint.java @@ -39,7 +39,7 @@ public class DesignPythonItemPrint { private List> location = new ArrayList<>(); @ApiModelProperty("print的缩放比例 传 [0.2, 0.2]") - private List print_scale_list = new ArrayList<>(); + private List print_scale_list = new ArrayList<>(); @ApiModelProperty("print的旋转角度 传 [0.2, 0.2]") private List print_angle_list = new ArrayList<>(); @@ -53,7 +53,7 @@ public class DesignPythonItemPrint { if (ifDesign){ this.print_path_list = print_path_list; this.location = Collections.singletonList(Arrays.asList(0.0, 0.0)); - this.print_scale_list = Arrays.asList(0.0, 0.0); + this.print_scale_list = Arrays.asList(new Double[]{0.0d, 0.0d}, new Double[]{0.0d, 0.0d}); this.print_angle_list = Arrays.asList(0.0, 0.0); } 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 c325fbb8..f0f0992c 100644 --- a/src/main/java/com/ai/da/service/impl/DesignServiceImpl.java +++ b/src/main/java/com/ai/da/service/impl/DesignServiceImpl.java @@ -820,7 +820,7 @@ public class DesignServiceImpl extends ServiceImpl impleme print.setPosition("[0.0,0.0]"); // print.setScale(1d); // todo mark 将print默认scale置为0.3 - print.setScale(0.3d); + print.setScale(new Double[]{0.3d, 0.3d}); print.setAngle(0.0); print.setPriority(1); QueryWrapper getPrintboardLevel2TypeQw = new QueryWrapper<>(); @@ -951,7 +951,7 @@ public class DesignServiceImpl extends ServiceImpl impleme print.setPosition("[0.0,0.0]"); // print.setScale(1d); // todo mark 将print默认scale置为0.3 - print.setScale(0.3d); + print.setScale(new Double[]{0.3d, 0.3d}); print.setAngle(0.0); print.setPriority(1); QueryWrapper getPrintboardLevel2TypeQw = new QueryWrapper<>(); @@ -1977,7 +1977,7 @@ public class DesignServiceImpl extends ServiceImpl impleme print.setPosition("[0.0,0.0]"); // print.setScale(1d); // todo mark 将print默认scale置为0.3 - print.setScale(0.3d); + print.setScale(new Double[]{0.3d, 0.3d}); print.setAngle(0.0); print.setPriority(1); QueryWrapper getPrintboardLevel2TypeQw = new QueryWrapper<>();