Merge remote-tracking branch 'origin/develop' into develop

src/main/java/com/ai/da/model/dto/DesignSingleIncludeLayersDTO.java

@@ -20,6 +20,10 @@ public class DesignSingleIncludeLayersDTO {
     @ApiModelProperty("preview -> true  submit -> false")
     private Boolean isPreview;
 
+    @NotNull(message = "processId cannot be null")
+    @ApiModelProperty("进度")
+    private String processId;
+
     @NotBlank(message = "timeZone cannot be empty!")
     @ApiModelProperty("本地时区,比如 'Asia/Tokyo' 东京时间 , 'Asia/Shanghai' 北京时间 由js本地获取")
     private String timeZone;

src/main/java/com/ai/da/python/PythonService.java

@@ -1299,7 +1299,7 @@ public class PythonService {
         designPythonObjects.setObjects(objects);
 
         DesignPythonObject pythonObject = new DesignPythonObject();
-        designPythonObjects.setProcess_id("1234");
+        designPythonObjects.setProcess_id(designSingleDTO.getProcessId());
         pythonObject.setItems(coverToDesignSinglePythonItem(designSingleDTO, designLibraryModelPoint));
         pythonObject.setBasic(coverToSingleBasic(singleOverall, switchCategory, designLibraryModelPoint));
         objects.add(pythonObject);

src/main/java/com/ai/da/service/impl/DesignItemServiceImpl.java

@@ -395,8 +395,8 @@ public class DesignItemServiceImpl extends ServiceImpl<DesignItemMapper, DesignI
                 SysFileVO sysFile = sysFileService.getById(design.getTemplateId());
                 Assert.notNull(sysFile,"model does not exists!");
                 modelUrl = sysFile.getUrl();
-                high = 1654;
-                width = 1170;
+                high = 1050;
+                width = 500;
             }else{
                 Library libFile = libraryService.getById(design.getTemplateId());
                 Assert.notNull(libFile,"model does not exists!");