aidlab/aida_back
7
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

修改印花scale数据类型为数组

Browse Source
This commit is contained in:
xupei
2025-02-07 14:57:28 +08:00
parent e90979bbdc
commit e2e9201fdd
7 changed files with 14 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/main/java/com/ai/da/mapper/primary/entity/DesignItemDetailPrint.java
View File

@@ -41,7 +41,7 @@ public class DesignItemDetailPrint {
/**
* 印花缩放比例
*/
private Double scale;
private Double[] scale;
/**
* 印花旋转角度
*/

2
src/main/java/com/ai/da/mapper/primary/entity/SubscriptionInfo.java
View File

@@ -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;

6
src/main/java/com/ai/da/model/vo/DesignSinglePrint.java
View File

@@ -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<Double> location, Double scale, Double angle, Integer priority, Boolean ifSingle) {
public DesignSinglePrint(String level2Type, String path, String minIOPath, List<Double> location, Double[] scale, Double angle, Integer priority, Boolean ifSingle) {
this.level2Type = level2Type;
this.path = path;
this.minIOPath = minIOPath;

6
src/main/java/com/ai/da/python/PythonService.java
View File

@@ -2768,12 +2768,12 @@ public class PythonService {
int size = printObject.size();
// 占位符填充数组
List<List<Double>> locationS = new ArrayList<>(Collections.nCopies(size, null));
List<Double> scaleS = new ArrayList<>(Collections.nCopies(size, null));
List<Double[]> scaleS = new ArrayList<>(Collections.nCopies(size, null));
List<Double> angleS = new ArrayList<>(Collections.nCopies(size, null));
ArrayList<String> pathsS = new ArrayList<>(Collections.nCopies(size, null));
List<List<Double>> locationO = new ArrayList<>(Collections.nCopies(size, null));
List<Double> scaleO = new ArrayList<>(Collections.nCopies(size, null));
List<Double[]> scaleO = new ArrayList<>(Collections.nCopies(size, null));
List<Double> angleO = new ArrayList<>(Collections.nCopies(size, null));
ArrayList<String> pathsO = new ArrayList<>(Collections.nCopies(size, null));
@@ -2831,7 +2831,7 @@ public class PythonService {
int size = trims.getPrints().size();
// 占位符填充数组
List<List<Double>> location = new ArrayList<>(Collections.nCopies(size, null));
List<Double> scale = new ArrayList<>(Collections.nCopies(size, null));
List<Double[]> scale = new ArrayList<>(Collections.nCopies(size, null));
List<Double> angle = new ArrayList<>(Collections.nCopies(size, null));
ArrayList<String> paths = new ArrayList<>(Collections.nCopies(size, null));

2
src/main/java/com/ai/da/python/vo/DesignPythonItemElement.java
View File

@@ -15,7 +15,7 @@ public class DesignPythonItemElement {
private List<String> element_path_list = new ArrayList<>();
@ApiModelProperty("print的缩放比例 传 [0.2, 0.2]")
private List<Double> element_scale_list = new ArrayList<>();
private List<Double[]> element_scale_list = new ArrayList<>();
@ApiModelProperty("print的旋转角度 传 [0.2, 0.2]")
private List<Double> element_angle_list = new ArrayList<>();

4
src/main/java/com/ai/da/python/vo/DesignPythonItemPrint.java
View File

@@ -39,7 +39,7 @@ public class DesignPythonItemPrint {
private List<List<Double>> location = new ArrayList<>();
@ApiModelProperty("print的缩放比例 传 [0.2, 0.2]")
private List<Double> print_scale_list = new ArrayList<>();
private List<Double[]> print_scale_list = new ArrayList<>();
@ApiModelProperty("print的旋转角度 传 [0.2, 0.2]")
private List<Double> 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);
}

6
src/main/java/com/ai/da/service/impl/DesignServiceImpl.java
View File

@@ -820,7 +820,7 @@ public class DesignServiceImpl extends ServiceImpl<DesignMapper, Design> 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<CollectionElement> getPrintboardLevel2TypeQw = new QueryWrapper<>();
@@ -951,7 +951,7 @@ public class DesignServiceImpl extends ServiceImpl<DesignMapper, Design> 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<CollectionElement> getPrintboardLevel2TypeQw = new QueryWrapper<>();
@@ -1977,7 +1977,7 @@ public class DesignServiceImpl extends ServiceImpl<DesignMapper, Design> 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<CollectionElement> getPrintboardLevel2TypeQw = new QueryWrapper<>();