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