huangxingxing 2 vuotta sitten
vanhempi
säilyke
67e5fae98c

+ 22 - 11
src/main/java/com/miniframe/bisiness/system/AFT001Service.java

@@ -126,17 +126,28 @@ public class AFT001Service extends AFT001BaseModel implements ExecProcessFlow {
 		}else if(action.equals("TransformToIsometric")){//等距视图显示
 
 		}else if(action.equals("ResultImport")){
-			if(this.getA_aft001().getIsVolume()=="1"){
-				JSONObject obj  = new JSONObject();
-				obj.put("filePath","/cephfs/Postprocess_Binary");
-				obj.put("fileType","binary");
-				obj.put("fileName","whole_part1.plt,whole_part2.plt,whole_part3.plt");
-				msg.setParamJson(obj.toString());
-			}else{
-				JSONObject obj  = new JSONObject();
-				obj.put("filePath","/cephfs/Postprocess_Binary");
-				obj.put("fileType","binary");
-				obj.put("fileName","whole_part4.plt,whole_part5.plt,whole_part6.plt");
+			if(solver.getSolverModel().equals("HCFDLab")) {
+				if (this.getA_aft001().getIsVolume() == "1") {
+					JSONObject obj = new JSONObject();
+					obj.put("filePath", "/cephfs/Postprocess_Binary");
+					obj.put("fileType", "binary");
+					obj.put("fileName", "whole_part1.plt,whole_part2.plt,whole_part3.plt");
+					msg.setParamJson(obj.toString());
+				} else {
+					JSONObject obj = new JSONObject();
+					obj.put("filePath", "/cephfs/Postprocess_Binary");
+					obj.put("fileType", "binary");
+					obj.put("fileName", "whole_part4.plt,whole_part5.plt,whole_part6.plt");
+					msg.setParamJson(obj.toString());
+				}
+			}else if(solver.getSolverModel().equals("FEMLab(结构力学)")){
+				String jobPath = XIFileUtils.getRootPathStr()+ MFConstant.separator+solver.getPid();
+				String exePath = jobPath+ MFConstant.separator+"fem";
+				String exeOutPath = exePath+ MFConstant.separator+"data_out";
+				JSONObject obj = new JSONObject();
+				obj.put("filePath", exeOutPath);
+				obj.put("fileType", "acsiss");
+				obj.put("fileName", "dynamicResponse-transient.vtk");
 				msg.setParamJson(obj.toString());
 			}
 		}else if(action.equals("ContourDisplay")){

+ 1 - 1
src/main/java/com/miniframe/bisiness/system/C00005Service.java

@@ -87,7 +87,7 @@ public class C00005Service extends C00005BaseModel implements ExecProcessFlow {
 			FEMParam param =XiJsonUtil.jsonToPojo(config.getParameterObj(),FEMParam.class);
 			FEMOrder.CreateAnalysisFile(null,config);
 			FEMPath.femCreatePath(modeling,config,job);
-			String url="http://192.168.0.104:8082/solverres";//TODO 通过资源数据获取IP
+			String url="http://192.168.0.103:8082/solverres";//TODO 通过资源数据获取IP
 			System.out.println(url);
 			httpExeJob(job,"fem",url,null,null,null);
 		}