From 61e9888ab9dcaf580bf0ba91663cfdf8291af3e9 Mon Sep 17 00:00:00 2001 From: shahaibo <1023316923@qq.com> Date: Thu, 5 Oct 2023 15:14:50 +0800 Subject: [PATCH] =?UTF-8?q?BUGFIX:=E6=A8=A1=E7=89=B9;?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/main/java/com/ai/da/model/dto/DesignCollectionDTO.java | 3 +-- src/main/java/com/ai/da/python/PythonService.java | 1 - src/main/java/com/ai/da/service/impl/DesignServiceImpl.java | 1 + 3 files changed, 2 insertions(+), 3 deletions(-) diff --git a/src/main/java/com/ai/da/model/dto/DesignCollectionDTO.java b/src/main/java/com/ai/da/model/dto/DesignCollectionDTO.java index 0c1df4ea..700a9438 100644 --- a/src/main/java/com/ai/da/model/dto/DesignCollectionDTO.java +++ b/src/main/java/com/ai/da/model/dto/DesignCollectionDTO.java @@ -52,8 +52,7 @@ public class DesignCollectionDTO { @NotBlank(message = "timeZone cannot be empty!") @ApiModelProperty("本地时区,比如 'Asia/Tokyo' 东京时间 , 'Asia/Shanghai' 北京时间 由js本地获取") private String timeZone; - - + private String processId; } diff --git a/src/main/java/com/ai/da/python/PythonService.java b/src/main/java/com/ai/da/python/PythonService.java index 009ea9ee..1526ed2d 100644 --- a/src/main/java/com/ai/da/python/PythonService.java +++ b/src/main/java/com/ai/da/python/PythonService.java @@ -191,7 +191,6 @@ public class PythonService { DesignPythonObjects designPythonObjects = new DesignPythonObjects(); List objects = Lists.newArrayList(); designPythonObjects.setObjects(objects); - designPythonObjects.setProcess_id(UUID.randomUUID().toString()); long pinPrintNum = calculateDesignPinPrintNum(elementVO.getPrintBoardElements()); long noPinPrintNum = calculateDesignNoPinPrintNum(elementVO.getPrintBoardElements()); //没有print的 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 a48122ec..24e8685a 100644 --- a/src/main/java/com/ai/da/service/impl/DesignServiceImpl.java +++ b/src/main/java/com/ai/da/service/impl/DesignServiceImpl.java @@ -300,6 +300,7 @@ public class DesignServiceImpl extends ServiceImpl impleme //组装design入参 DesignPythonObjects pythonObjects = pythonService.covertDesignParam(designDTO.getSystemScale(), designDTO.getSingleOverall(), designDTO.getSwitchCategory(), elementVO); + pythonObjects.setProcess_id(designDTO.getProcessId()); //缓存保存的文件 方便后面处理进度问题 setDesignProcess(userInfo.getId(), pythonObjects); // pythonObjects增加image_id关联