فهرست منبع

一维瓦斯爆炸

huangxingxing 9 ماه پیش
والد
کامیت
1bb34cb196

+ 4 - 0
src/main/java/com/miniframe/bisiness/system/D000015Service.java

@@ -27,6 +27,10 @@ public class D000015Service extends D000015BaseModel implements ExecProcessFlow
 		Integer aid= getA_d000015().getAid();
 		DAccidentMapper accidentDao  = UtilTools.getBean(DAccidentMapper.class);
 		DAccident accident= accidentDao.selectByPrimaryKey(aid);
+
+		if(accident.getStype().endsWith("Gass1")){
+			accident.setStype("Gass");
+		}
 		String outPath= TemplateGenerator.BPATH+"/"+aid+"/"+accident.getJid()+"/"+accident.getStype().toLowerCase();
 		String fileName ="log.txt";
 

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

@@ -552,24 +552,24 @@ public class D00008Service extends D00008BaseModel implements ExecProcessFlow {
 			try {
 				Runtime runtime = Runtime.getRuntime();
 				Process p =null;
-				LogService.addLog(aid,jid,"gas","求解——————————————————开始");
+				LogService.addLog(aid,jid,"gass","求解——————————————————开始");
 				p= runtime.exec("sh "+TemplateGenerator.BPATH + "/" + aid + "/" + jid + "/" + "/gas" + "/run.sh");
 				InputStream fis = p.getInputStream();
 				InputStreamReader isr = new InputStreamReader(fis);
 				BufferedReader br = new BufferedReader(isr);
 				String line = null;
 				while ((line = br.readLine()) != null) {
-					LogService.addLog(aid,jid,"gas",line);
+					LogService.addLog(aid,jid,"gass",line);
 					System.out.println(line);
 				}
 				//监测点数据保存
 				saveMonitorValue(aid,jid);
 				//路径保存
 				saveWayValue(aid,jid);
-				LogService.addLog(aid,jid,"gas","求解——————————————————成功");
+				LogService.addLog(aid,jid,"gass","求解——————————————————成功");
 				JobSucces(jid);
 			} catch (IOException | BusinessException e) {
-				LogService.addLog(aid,jid,"gas","求解——————————————————失败");
+				LogService.addLog(aid,jid,"gass","求解——————————————————失败");
 				e.printStackTrace();
 				JobError(jid);
 			}