huangxingxing преди 1 година
родител
ревизия
2af89f7b35

+ 2 - 2
src/main/java/com/miniframe/bisiness/system/D000017Service.java

@@ -32,11 +32,11 @@ public class D000017Service extends D000017BaseModel implements ExecProcessFlow
 		String outPath="";
 		String fileName ="";
 		if(accident.getStype().endsWith("Fire")){
-			outPath=TemplateGenerator.BPATH+"/"+aid+"/"+accident.getJid()+"/fire/out";
+			outPath=TemplateGenerator.BPATH+"/"+aid+"/"+accident.getJid()+"/fire/out/vtk/";
 			fileName ="velocity"+step;
 		}
 		if(accident.getStype().endsWith("Water")){
-			outPath=TemplateGenerator.BPATH+"/"+aid+"/"+accident.getJid()+"/water/out";
+			outPath=TemplateGenerator.BPATH+"/"+aid+"/"+accident.getJid()+"/water/out/vtk/";
 			fileName ="velocity"+step;
 		}
 		Path path = Paths.get(outPath+"/"+fileName);

+ 2 - 2
src/main/java/com/miniframe/bisiness/system/D10016Service.java

@@ -40,11 +40,11 @@ public class D10016Service extends D10016BaseModel implements ExecProcessFlow {
 		String outPath="";
 		String fileName ="";
 		if(accident.getStype().endsWith("Fire")){
-			outPath= TemplateGenerator.BPATH+"/"+aid+"/"+accident.getJid()+"/fire/out";
+			outPath= TemplateGenerator.BPATH+"/"+aid+"/"+accident.getJid()+"/fire/out/monitor";
 			fileName ="monitorValue"+step;
 		}
 		if(accident.getStype().endsWith("Water")){
-			outPath=TemplateGenerator.BPATH+"/"+aid+"/"+accident.getJid()+"/water/out";
+			outPath=TemplateGenerator.BPATH+"/"+aid+"/"+accident.getJid()+"/water/out/monitor";
 			fileName ="monitorValue"+step;
 		}
 

+ 1 - 1
src/main/resources/templates/fire2EscapeControl.ftl

@@ -3,5 +3,5 @@ midPath : ${midPath}
 outPath : ${outPath}
 escapeFile : /home/disaster/zhty/Program/escape
 personnumber : 1
-pipes22,0.1,500
+person1,pipes22,0.1,500,1
 #end

+ 1 - 1
src/main/resources/templates/water2EscapeControl.ftl

@@ -5,5 +5,5 @@ midPath : ${midPath}
 outPath : ${outPath}
 escapeFile : /home/disaster/zhty/Program/escape
 personnumber : 1
-pipes22,0.1,500
+person1,pipes22,0.1,500,1
 #end