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

BUGFIX:模特;

Browse Source
This commit is contained in:
shahaibo
2023-10-05 16:17:01 +08:00
parent fa44552437
commit e8760df88f
2 changed files with 6 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -184,13 +184,15 @@ public class PythonService {
* @param singleOverall * @param singleOverall
* @param switchCategory * @param switchCategory
* @param elementVO * @param elementVO
* @param processId
* @return * @return
*/ */
public DesignPythonObjects covertDesignParam(BigDecimal systemScale, String singleOverall, public DesignPythonObjects covertDesignParam(BigDecimal systemScale, String singleOverall,
String switchCategory, ValidateElementVO elementVO) { String switchCategory, ValidateElementVO elementVO, String processId) {
DesignPythonObjects designPythonObjects = new DesignPythonObjects(); DesignPythonObjects designPythonObjects = new DesignPythonObjects();
List<DesignPythonObject> objects = Lists.newArrayList(); List<DesignPythonObject> objects = Lists.newArrayList();
designPythonObjects.setObjects(objects); designPythonObjects.setObjects(objects);
designPythonObjects.setProcess_id(processId);
long pinPrintNum = calculateDesignPinPrintNum(elementVO.getPrintBoardElements()); long pinPrintNum = calculateDesignPinPrintNum(elementVO.getPrintBoardElements());
long noPinPrintNum = calculateDesignNoPinPrintNum(elementVO.getPrintBoardElements()); long noPinPrintNum = calculateDesignNoPinPrintNum(elementVO.getPrintBoardElements());
//没有print的 //没有print的

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

@@ -35,7 +35,6 @@ import org.springframework.util.CollectionUtils;
import org.springframework.util.StringUtils; import org.springframework.util.StringUtils;
import javax.annotation.Resource; import javax.annotation.Resource;
import javax.validation.constraints.NotNull;
import java.io.File; import java.io.File;
import java.io.IOException; import java.io.IOException;
import java.math.BigDecimal; import java.math.BigDecimal;
@@ -254,7 +253,7 @@ public class DesignServiceImpl extends ServiceImpl<DesignMapper, Design> impleme
calculateLibraryAndSysFile(designDTO, elementVO, userInfo); calculateLibraryAndSysFile(designDTO, elementVO, userInfo);
//组装design入参 //组装design入参
DesignPythonObjects pythonObjects = pythonService.covertDesignParam(designDTO.getSystemScale(), DesignPythonObjects pythonObjects = pythonService.covertDesignParam(designDTO.getSystemScale(),
designDTO.getSingleOverall(), designDTO.getSwitchCategory(), elementVO); designDTO.getSingleOverall(), designDTO.getSwitchCategory(), elementVO, designDTO.getProcessId());
//缓存保存的文件 方便后面处理进度问题 //缓存保存的文件 方便后面处理进度问题
setDesignProcess(userInfo.getId(), pythonObjects); setDesignProcess(userInfo.getId(), pythonObjects);
//design //design
@@ -299,8 +298,8 @@ public class DesignServiceImpl extends ServiceImpl<DesignMapper, Design> impleme
calculateLibraryAndSysFile(designDTO, elementVO, userInfo); calculateLibraryAndSysFile(designDTO, elementVO, userInfo);
//组装design入参 //组装design入参
DesignPythonObjects pythonObjects = pythonService.covertDesignParam(designDTO.getSystemScale(), DesignPythonObjects pythonObjects = pythonService.covertDesignParam(designDTO.getSystemScale(),
designDTO.getSingleOverall(), designDTO.getSwitchCategory(), elementVO); designDTO.getSingleOverall(), designDTO.getSwitchCategory(), elementVO, designDTO.getProcessId());
pythonObjects.setProcess_id(designDTO.getProcessId()); // pythonObjects.setProcess_id(designDTO.getProcessId());
//缓存保存的文件 方便后面处理进度问题 //缓存保存的文件 方便后面处理进度问题
setDesignProcess(userInfo.getId(), pythonObjects); setDesignProcess(userInfo.getId(), pythonObjects);
// pythonObjects增加image_id关联 // pythonObjects增加image_id关联