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 25e9ff6f..e8c0ac73 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 String scale; /** * 印花旋转角度 */ 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 b36d6052..e861d2d3 100644 --- a/src/main/java/com/ai/da/model/vo/DesignSinglePrint.java +++ b/src/main/java/com/ai/da/model/vo/DesignSinglePrint.java @@ -29,11 +29,11 @@ public class DesignSinglePrint implements Serializable { private String minIOPath; @ApiModelProperty("印花位置") - private List location; + private List location; @ApiModelProperty("印花大小") @Range(max = 1, message = "印花缩放值需用大于等于0小于等于1的数表示") - private Double[] scale; + private List 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, List 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, List 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 4662477a..31c9c43a 100644 --- a/src/main/java/com/ai/da/python/PythonService.java +++ b/src/main/java/com/ai/da/python/PythonService.java @@ -2767,13 +2767,13 @@ public class PythonService { int size = printObject.size(); // 占位符填充数组 - List> locationS = new ArrayList<>(Collections.nCopies(size, null)); - List scaleS = new ArrayList<>(Collections.nCopies(size, null)); + List> locationS = 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> locationO = 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)); @@ -2830,8 +2830,8 @@ 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> location = 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)); @@ -2841,6 +2841,8 @@ public class PythonService { prints.forEach(p -> { p.getLocation().set(0, p.getLocation().get(0)); p.getLocation().set(1, p.getLocation().get(1)); + p.getScale().set(0, p.getScale().get(0)); + p.getScale().set(1, p.getScale().get(1)); Integer priority = p.getPriority(); location.set(priority - 1, p.getLocation()); scale.set(priority - 1, p.getScale()); 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 d9833618..70e6521e 100644 --- a/src/main/java/com/ai/da/python/vo/DesignPythonItemElement.java +++ b/src/main/java/com/ai/da/python/vo/DesignPythonItemElement.java @@ -10,12 +10,12 @@ import java.util.List; public class DesignPythonItemElement { @ApiModelProperty("print的位置 传 [[0.2, 0.2]]") - private List> location = new ArrayList<>(); + private List> location = new ArrayList<>(); 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 1c02923c..a4f980bb 100644 --- a/src/main/java/com/ai/da/python/vo/DesignPythonItemPrint.java +++ b/src/main/java/com/ai/da/python/vo/DesignPythonItemPrint.java @@ -36,10 +36,10 @@ public class DesignPythonItemPrint { @ApiModelProperty("print的位置 传 [[0.2, 0.2]]") - private List> location = new ArrayList<>(); + 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<>(); @@ -52,8 +52,8 @@ public class DesignPythonItemPrint { public DesignPythonItemPrint(List print_path_list, Boolean ifDesign) { 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(new Double[]{0.0d, 0.0d}, new Double[]{0.0d, 0.0d}); + this.location = Collections.singletonList(Arrays.asList(0.0f, 0.0f)); + this.print_scale_list = Collections.singletonList(Arrays.asList(0.0f, 0.0f)); this.print_angle_list = Arrays.asList(0.0, 0.0); } 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 e0b34131..0c4159d3 100644 --- a/src/main/java/com/ai/da/service/impl/DesignItemServiceImpl.java +++ b/src/main/java/com/ai/da/service/impl/DesignItemServiceImpl.java @@ -816,7 +816,7 @@ public class DesignItemServiceImpl extends ServiceImpl impleme print.setPosition("[0.0,0.0]"); // print.setScale(1d); // todo mark 将print默认scale置为0.3 - print.setScale(new Double[]{0.3d, 0.3d}); + print.setScale(Arrays.toString(new Float[]{0.3f, 0.3f})); 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(new Double[]{0.3d, 0.3d}); + print.setScale(Arrays.toString(new Float[]{0.3f, 0.3f})); print.setAngle(0.0); print.setPriority(1); QueryWrapper getPrintboardLevel2TypeQw = new QueryWrapper<>(); @@ -1596,12 +1596,12 @@ public class DesignServiceImpl extends ServiceImpl impleme DesignSinglePrint designSinglePrint = new DesignSinglePrint(); // designSinglePrintDTO.setIfSingle(detailPrint.getSingleOrOverall().equals("single") ? Boolean.TRUE : Boolean.FALSE); designSinglePrint.setLevel2Type(detailPrint.getLevel2Type()); - designSinglePrint.setLocation(JSONArray.parseArray(detailPrint.getPosition(), Double.class)); + designSinglePrint.setLocation(JSONArray.parseArray(detailPrint.getPosition(), Float.class)); designSinglePrint.setAngle(detailPrint.getAngle()); designSinglePrint.setPriority(detailPrint.getPriority()); designSinglePrint.setPath(minioUtil.getPreSignedUrl(detailPrint.getPath(), 24 * 60)); designSinglePrint.setMinIOPath(detailPrint.getPath()); - designSinglePrint.setScale(detailPrint.getScale()); + designSinglePrint.setScale(JSONArray.parseArray(detailPrint.getScale(), Float.class)); designSinglePrint.setIfSingle(detailPrint.getSingleOrOverall().equals("single") ? Boolean.TRUE : Boolean.FALSE); prints.add(designSinglePrint); } else { @@ -1613,8 +1613,8 @@ public class DesignServiceImpl extends ServiceImpl impleme print.getLevel2Type(), minioUtil.getPreSignedUrl(print.getPath(), 24 * 60), print.getPath(), - JSONArray.parseArray(print.getPosition(), Double.class), - print.getScale(), + JSONArray.parseArray(print.getPosition(), Float.class), + JSONArray.parseArray(print.getScale(), Float.class), print.getAngle(), print.getPriority(), print.getSingleOrOverall().equals("single") ? Boolean.TRUE : Boolean.FALSE)); @@ -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(new Double[]{0.3d, 0.3d}); + print.setScale(Arrays.toString(new Float[]{0.3f, 0.3f})); print.setAngle(0.0); print.setPriority(1); QueryWrapper getPrintboardLevel2TypeQw = new QueryWrapper<>();