浏览代码

瓦斯求解

huangxingxing 1 年之前
父节点
当前提交
39aed36df2
共有 1 个文件被更改,包括 12 次插入5 次删除
  1. 12 5
      src/main/java/com/miniframe/bisiness/system/D00008Service.java

+ 12 - 5
src/main/java/com/miniframe/bisiness/system/D00008Service.java

@@ -265,6 +265,10 @@ public class D00008Service extends D00008BaseModel implements ExecProcessFlow {
 				outPath=TemplateGenerator.BPATH+"/"+aid+"/"+accident.getJid()+"/water/out/monitor/";
 				fileName ="monitorValue"+step;
 			}
+			if(accident.getStype().endsWith("Gass")){
+				outPath=TemplateGenerator.BPATH+"/"+aid+"/"+accident.getJid()+"/gas/out/monitor/";
+				fileName ="monitorValue"+step;
+			}
 			try{
 				FileReader fileReader = new FileReader(outPath+"/"+fileName);
 				BufferedReader reader = new BufferedReader(fileReader);
@@ -408,13 +412,13 @@ public class D00008Service extends D00008BaseModel implements ExecProcessFlow {
 					LogService.addLog(aid,jid,"Gass",line);
 					System.out.println(line);
 				}
-//				//监测点数据保存
-//				saveMonitorValue(aid,jid);
-//				//路径保存
-//				saveWayValue(aid,jid);
+				//监测点数据保存
+				saveMonitorValue(aid,jid);
+				//路径保存
+				saveWayValue(aid,jid);
 				LogService.addLog(aid,jid,"Gass","求解——————————————————成功");
 				JobSucces(jid);
-			} catch (IOException  e) {
+			} catch (IOException | BusinessException e) {
 				LogService.addLog(aid,jid,"Fire","求解——————————————————失败");
 				e.printStackTrace();
 				JobError(jid);
@@ -435,6 +439,9 @@ public class D00008Service extends D00008BaseModel implements ExecProcessFlow {
 		if(accident.getStype().endsWith("Water")){
 			SafetyFile=TemplateGenerator.BPATH+"/"+aid+"/"+accident.getJid()+"/water/out/Safety";
 		}
+		if(accident.getStype().endsWith("Gass")){
+			SafetyFile=TemplateGenerator.BPATH+"/"+aid+"/"+accident.getJid()+"/gas/out/Safety";
+		}
 		List<DWayResult> wayResults =new ArrayList<>();
 		List<DWaynodeResult> wayNodeResults =new ArrayList<>();
 		FileReader fileReader = new FileReader(SafetyFile);