管道灾源

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

@@ -42,7 +42,7 @@ public class D00008Service extends D00008BaseModel implements ExecProcessFlow {
 			try {
 			Runtime runtime = Runtime.getRuntime();
 			Process p =null;
-			p= runtime.exec("sh "+TemplateGenerator.BPATH+"/"+aid+"/"+"runFile.sh");
+			p= runtime.exec("sh "+TemplateGenerator.BPATH+"/"+aid+"/fire"+"/"+"runFile.sh");
 			InputStream fis = p.getInputStream();
 			InputStreamReader isr = new InputStreamReader(fis);
 			BufferedReader br = new BufferedReader(isr);
@@ -59,6 +59,10 @@ public class D00008Service extends D00008BaseModel implements ExecProcessFlow {
 	}
 	
 	/**
+	 *
+	 *
+	 *
+	 *
 	 * 基础系统,“灾情演练”业务前处理
  	 */
 	public void preTransFlow() throws Exception {

src/main/java/com/miniframe/template/TemplateGenerator.java

@@ -33,13 +33,13 @@ public class TemplateGenerator {
         //几何文件路径
         dataModel.put("geoFilePath", "/home/disaster/fire/Geometry");
         //fireinit 文件路径
-        dataModel.put("initFilePath", BPATH+"/"+aid+"/"+"Fire.init");
+        dataModel.put("initFilePath", BPATH+"/"+aid+"/fire"+"/"+"Fire.init");
         //fireInteractionPath 阀门文件路径
         dataModel.put("fireInteractionPath", "/home/disaster/fire/Fire.interaction");
         //midPath
-        dataModel.put("midPath", BPATH+"/"+aid+"/mid");
+        dataModel.put("midPath", BPATH+"/"+aid+"/fire"+"/mid");
         //outPath
-        dataModel.put("outPath", BPATH+"/"+aid+"/out");
+        dataModel.put("outPath", BPATH+"/"+aid+"/fire"+"/out");
 
         DSourceMapper dsm =UtilTools.getBean(DSourceMapper.class);
         DSourceSQLBuilder dss= new DSourceSQLBuilder();
@@ -54,10 +54,11 @@ public class TemplateGenerator {
         template.process(dataModel, writer);
         XIFileUtils.mkdir(BPATH);
         XIFileUtils.mkdir(BPATH+"/"+aid);
+        XIFileUtils.mkdir(BPATH+"/"+aid+"/fire");
         XIFileUtils.mkdir(BPATH+"/"+aid+"/mid");
         XIFileUtils.mkdir(BPATH+"/"+aid+"/out");
 
-        FileWriter fileWriter =new FileWriter(BPATH+"/"+aid+"/"+"Fire.control");
+        FileWriter fileWriter =new FileWriter(BPATH+"/"+aid+"/"+"/fire"+"Fire.control");
         fileWriter.write(writer.toString());
         fileWriter.close();
     }
@@ -74,7 +75,7 @@ public class TemplateGenerator {
         // 将数据模型传入模板进行处理
         StringWriter writer = new StringWriter();
         template.process(dataModel, writer);
-        FileWriter fileWriter =new FileWriter(BPATH+"/"+aid+"/"+"runFile.sh");
+        FileWriter fileWriter =new FileWriter(BPATH+"/"+aid+"/fire"+"/"+"runFile.sh");
         fileWriter.write(writer.toString());
         fileWriter.close();
     }
@@ -130,7 +131,7 @@ public class TemplateGenerator {
         // 输出结果到控制台或保存为文件
         System.out.println(writer.toString());
 
-        FileWriter fileWriter =new FileWriter(BPATH+"/"+aid+"/"+"Fire.init");
+        FileWriter fileWriter =new FileWriter(BPATH+"/"+aid+"/fire"+"/"+"Fire.init");
         fileWriter.write(writer.toString());
         fileWriter.close();
     }

src/main/java/com/miniframe/websocket/WebsocketEndPoint.java

@@ -70,6 +70,13 @@ public class WebsocketEndPoint extends TextWebSocketHandler {
 	}
 
 	/**
+	 *
+	 *
+	 *
+	 *
+	 *
+	 *
+	 *
 	 * 客户端调用websocket.send时候，会调用该方法,进行数据通信
 	 * 
 	 * org.springframework.web.socket.WebSocketHandler#handleMessage(org.springframework.web.socket.WebSocketSession,