|
@@ -140,6 +140,21 @@ public class MDO0039Service extends MDO0039BaseModel implements ExecProcessFlow
|
|
|
//创建run.py
|
|
|
TemplateGenerator.createRunpy2(pid);
|
|
|
runqt(pid);
|
|
|
+ }else if(cspvo.getMathfunc()!=null){
|
|
|
+ //创建workflow
|
|
|
+ String workflowPath =TemplateGenerator.createcWorkflowXmlT(pid,wvo);
|
|
|
+ List<Solver> solvers =new ArrayList<>();
|
|
|
+ Solver solver =new Solver();
|
|
|
+ solver.setWorkflowPath(workflowPath);
|
|
|
+ solver.setCpacsPath(cpacsPath);
|
|
|
+ solvers.add(solver);
|
|
|
+ provo.setSolvers(solvers);
|
|
|
+ //创建problem.xml
|
|
|
+ TemplateGenerator.createProblemXml(pid,provo);
|
|
|
+ //创建run.py
|
|
|
+ TemplateGenerator.createRunpy2(pid);
|
|
|
+ runDl(pid);
|
|
|
+
|
|
|
}else{
|
|
|
if(StringUtil.isEmpty(pro.getStype())){
|
|
|
throw new BusinessException("MDO000011");
|
|
@@ -162,7 +177,7 @@ public class MDO0039Service extends MDO0039BaseModel implements ExecProcessFlow
|
|
|
//创建run.py
|
|
|
TemplateGenerator.createRunpy(pid);
|
|
|
// run(pid,pro.getStype());
|
|
|
- runDl(pid,pro.getStype());
|
|
|
+ runDl(pid);
|
|
|
}
|
|
|
|
|
|
|
|
@@ -390,7 +405,7 @@ public class MDO0039Service extends MDO0039BaseModel implements ExecProcessFlow
|
|
|
}
|
|
|
//异步执行
|
|
|
@SneakyThrows
|
|
|
- public void runDl(String pid ,String stype)throws Exception{
|
|
|
+ public void runDl(String pid)throws Exception{
|
|
|
MdoProComvalMapper comvalDao =UtilTools.getBean(MdoProComvalMapper.class);
|
|
|
MdoProComvalSQLBuilder sb =new MdoProComvalSQLBuilder();
|
|
|
MdoProComvalSQLBuilder.Criteria sc = sb.createCriteria();
|