瓦斯爆炸

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

@@ -83,12 +83,12 @@ public class D00008Service extends D00008BaseModel implements ExecProcessFlow {
 		//TODO:  需要从第三方获取
 		initDNodeVal(aid);
 
-		TemplateGenerator2.createGeometry(aid,jid);
-		TemplateGenerator2.createEscape(aid,jid);
 
 		TemplateGenerator.createMonitor(aid,jid);//生成监测点文件
-		if(accident.getStype().equals("Fire")){
 
+		if(accident.getStype().equals("Fire")){
+			TemplateGenerator2.createGeometry(aid,jid);
+			TemplateGenerator2.createEscape(aid,jid);
 			TemplateGenerator2.createFireControl(aid,jid,totaltime,dt,dx,reportstep,interactionstep,cocodes);
 			LogService.addLog(accident,"fireControl.ftl配置生成——————————————————成功");
 			TemplateGenerator2.createFireRunsh(aid,jid);
@@ -101,7 +101,9 @@ public class D00008Service extends D00008BaseModel implements ExecProcessFlow {
 
 		}
 		if(accident.getStype().equals("Water")){
-//			TemplateGenerator.createGeometry(aid,jid);//生成几何文件
+//			TemplateGenerator.createGeometry(aid,jid);//生成几何文件\
+			TemplateGenerator2.createGeometry(aid,jid);
+			TemplateGenerator2.createEscape(aid,jid);
 			TemplateGenerator2.createWaterControl(aid,jid,totaltime,dt,dx,reportstep,interactionstep);
 			LogService.addLog(accident,"water.control配置生成——————————————————成功");
 			TemplateGenerator2.createWaterRunsh(aid,jid);
@@ -114,6 +116,8 @@ public class D00008Service extends D00008BaseModel implements ExecProcessFlow {
 		}
 
 		if(accident.getStype().equals("Gass")){//瓦斯爆炸
+			TemplateGenerator.createGeometry(aid,jid);
+			TemplateGenerator2.createEscape(aid,jid);
 			DGasMapper gasMapper =UtilTools.getBean(DGasMapper.class);
 			DGasSQLBuilder gasSb = new DGasSQLBuilder();
 			DGasSQLBuilder.Criteria gasSc = gasSb.createCriteria();