huangxingxing 1 éve
szülő
commit
bdbef36d9a

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

@@ -83,8 +83,8 @@ public class D00008Service extends D00008BaseModel implements ExecProcessFlow {
 		//TODO:  需要从第三方获取
 		//TODO:  需要从第三方获取
 		initDNodeVal(aid);
 		initDNodeVal(aid);
 
 
-		TemplateGenerator.createGeometry(aid,jid);//生成几何文件
-//		TemplateGenerator2.createGeometry(aid,jid);
+//		TemplateGenerator.createGeometry(aid,jid);//生成几何文件
+		TemplateGenerator2.createGeometry(aid,jid);
 		TemplateGenerator.createMonitor(aid,jid);//生成监测点文件
 		TemplateGenerator.createMonitor(aid,jid);//生成监测点文件
 		if(accident.getStype().equals("Fire")){
 		if(accident.getStype().equals("Fire")){
 			TemplateGenerator2.createFireControl(aid,jid,totaltime,dt,dx,reportstep,interactionstep,cocodes);
 			TemplateGenerator2.createFireControl(aid,jid,totaltime,dt,dx,reportstep,interactionstep,cocodes);

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

@@ -1,4 +1,4 @@
 cd /home/disaster/zhty/Program
 cd /home/disaster/zhty/Program
 export LD_LIBRARY_PATH=./bin:$LD_LIBRARY_PATH
 export LD_LIBRARY_PATH=./bin:$LD_LIBRARY_PATH
 ./Fire ${firecontrolPath}
 ./Fire ${firecontrolPath}
-./calDanger ${fireEscapeControlPath}
+./calDanger ${fireEscapeControlPath}