火灾求解

src/main/java/com/miniframe/bisiness/system/D00008Service.java

@@ -83,10 +83,11 @@ public class D00008Service extends D00008BaseModel implements ExecProcessFlow {
 		//TODO:  需要从第三方获取
 		initDNodeVal(aid);
 
-//		TemplateGenerator.createGeometry(aid,jid);//生成几何文件
-		TemplateGenerator2.createGeometry(aid,jid);
+//
+
 		TemplateGenerator.createMonitor(aid,jid);//生成监测点文件
 		if(accident.getStype().equals("Fire")){
+			TemplateGenerator2.createGeometry(aid,jid);
 			TemplateGenerator2.createFireControl(aid,jid,totaltime,dt,dx,reportstep,interactionstep,cocodes);
 			LogService.addLog(accident,"fireControl.ftl配置生成——————————————————成功");
 			TemplateGenerator2.createFireRunsh(aid,jid);
@@ -100,6 +101,7 @@ public class D00008Service extends D00008BaseModel implements ExecProcessFlow {
 
 		}
 		if(accident.getStype().equals("Water")){
+			TemplateGenerator.createGeometry(aid,jid);//生成几何文件
 			TemplateGenerator2.createWaterControl(aid,jid,totaltime,dt,dx,reportstep,interactionstep);
 			LogService.addLog(accident,"water.control配置生成——————————————————成功");
 			TemplateGenerator2.createWaterRunsh(aid,jid);