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

BUGFIX:design接口 python入参添加两个字段;

Browse Source
This commit is contained in:
shahaibo
2023-10-07 17:55:58 +08:00
parent 75c1d4dee1
commit 8893ef0039
1 changed files with 9 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -254,8 +254,8 @@ public class DesignServiceImpl extends ServiceImpl<DesignMapper, Design> impleme
//组装design入参 //组装design入参
DesignPythonObjects pythonObjects = pythonService.covertDesignParam(designDTO.getSystemScale(), DesignPythonObjects pythonObjects = pythonService.covertDesignParam(designDTO.getSystemScale(),
designDTO.getSingleOverall(), designDTO.getSwitchCategory(), elementVO, designDTO.getProcessId()); designDTO.getSingleOverall(), designDTO.getSwitchCategory(), elementVO, designDTO.getProcessId());
//缓存保存的文件 方便后面处理进度问题 //缓存保存的文件 方便后面处理进度问题 采用新的进度条获取方式 根据processId获取
setDesignProcess(userInfo.getId(), pythonObjects); // setDesignProcess(userInfo.getId(), pythonObjects);
//design //design
pythonService.design(pythonObjects); pythonService.design(pythonObjects);
//生成library //生成library
@@ -299,9 +299,8 @@ public class DesignServiceImpl extends ServiceImpl<DesignMapper, Design> impleme
//组装design入参 //组装design入参
DesignPythonObjects pythonObjects = pythonService.covertDesignParam(designDTO.getSystemScale(), DesignPythonObjects pythonObjects = pythonService.covertDesignParam(designDTO.getSystemScale(),
designDTO.getSingleOverall(), designDTO.getSwitchCategory(), elementVO, designDTO.getProcessId()); designDTO.getSingleOverall(), designDTO.getSwitchCategory(), elementVO, designDTO.getProcessId());
// pythonObjects.setProcess_id(designDTO.getProcessId()); //缓存保存的文件 方便后面处理进度问题 采用新的进度条获取方式 根据processId获取
//缓存保存的文件 方便后面处理进度问题 // setDesignProcess(userInfo.getId(), pythonObjects);
setDesignProcess(userInfo.getId(), pythonObjects);
// pythonObjects增加image_id关联 // pythonObjects增加image_id关联
relationImageId(pythonObjects); relationImageId(pythonObjects);
//design //design
@@ -325,6 +324,11 @@ public class DesignServiceImpl extends ServiceImpl<DesignMapper, Design> impleme
pythonObjects.getObjects().forEach( pythonObjects.getObjects().forEach(
o -> { o -> {
for (DesignPythonItem item : o.getItems()) { for (DesignPythonItem item : o.getItems()) {
List<Long> list = new ArrayList<>();
list.add(1L);
list.add(1L);
item.setOffset(list);
item.setResize_scale(1f);
String path = item.getPath(); String path = item.getPath();
if (StringUtils.isEmpty(path)) { if (StringUtils.isEmpty(path)) {
String bodyPath = item.getBody_path(); String bodyPath = item.getBody_path();