|
@@ -65,7 +65,6 @@ public class C00005Service extends C00005BaseModel implements ExecProcessFlow {
|
|
|
AdiSolverJob job =AdiSolverJobService.createJob(config);//创建执行任务
|
|
|
|
|
|
if(solver.getCompany().equals("Adi.SimWork")&& solver.getSolverModel().equals("HCFDLab")){
|
|
|
-
|
|
|
HcfdParam param = XiJsonUtil.jsonToPojo(config.getParameterObj(),HcfdParam.class);
|
|
|
HcfdExe.CreateMpbcFile(null,config);
|
|
|
HcfdExe.CreateNmlFile(null,config);
|
|
@@ -75,11 +74,13 @@ public class C00005Service extends C00005BaseModel implements ExecProcessFlow {
|
|
|
vfred=param.getNmlParam().getVolume_animation_freq().toString();
|
|
|
afred=param.getNmlParam().getAnimation_freq().toString();
|
|
|
String url="http://localhost:8082/solverres";//TODO 通过资源数据获取IP
|
|
|
- httpExeJob(job,url,vfred,afred,null);
|
|
|
+ httpExeJob(job,"hcfd",url,vfred,afred,null);
|
|
|
}
|
|
|
if(solver.getCompany().equals("ADI.SimWork")&& solver.getSolverModel().equals("FEMLab(结构力学)")){
|
|
|
FEMParam param =XiJsonUtil.jsonToPojo(config.getParameterObj(),FEMParam.class);
|
|
|
FEMOrder.CreateAnalysisFile(null,config);
|
|
|
+ String url="http://192.168.0.109:8082/solverres";//TODO 通过资源数据获取IP
|
|
|
+ httpExeJob(job,"fem",url,null,null,null);
|
|
|
}
|
|
|
|
|
|
//文件封装,
|
|
@@ -94,14 +95,14 @@ public class C00005Service extends C00005BaseModel implements ExecProcessFlow {
|
|
|
* @param afred
|
|
|
* @throws Exception
|
|
|
*/
|
|
|
- private void httpExeJob(AdiSolverJob job,String url,String vfred,String afred ,String resources) throws Exception {
|
|
|
+ private void httpExeJob(AdiSolverJob job,String projectType,String url,String vfred,String afred ,String resources) throws Exception {
|
|
|
String path ="";
|
|
|
String method="";
|
|
|
Map<String, String> headers = new HashMap<>();
|
|
|
Map<String, String> querys= new HashMap<>();
|
|
|
Map<String, String> bodys= new HashMap<>();
|
|
|
bodys.put("jobId", job.getId());
|
|
|
- bodys.put("projectType", "hcfd");
|
|
|
+// bodys.put("projectType", "hcfd");
|
|
|
bodys.put("jobOrder", "");
|
|
|
bodys.put("projectId", job.getPid());
|
|
|
bodys.put("orderType", "");
|