|
@@ -337,10 +337,50 @@ public class D00008Service extends D00008BaseModel implements ExecProcessFlow {
|
|
|
return dc.getChname();
|
|
|
}
|
|
|
}
|
|
|
-
|
|
|
//异步执行
|
|
|
@SneakyThrows
|
|
|
public void exeWater(Integer aid,Integer jid) throws Exception{
|
|
|
+ CompletableFuture<Void> cf = CompletableFuture.supplyAsync(()->{
|
|
|
+ try {
|
|
|
+ LogService.addLog(aid,jid,"Water","求解——————————————————开始");
|
|
|
+ Runtime runtime = Runtime.getRuntime();
|
|
|
+ Process p =null;
|
|
|
+ String exs="docker run --name " +
|
|
|
+ aid +jid+
|
|
|
+ " -it -v /home/disaster/zhty/:/home/disaster/zhty/ " +
|
|
|
+ "-v /cephfs/disaster/:/cephfs/disaster/ " +
|
|
|
+ "-v " +
|
|
|
+ TemplateGenerator.BPATH+"/"+aid+"/"+jid+"/water/runWater.sh" +
|
|
|
+ ":/home/disaster/zhty/Water/runWater.sh" +
|
|
|
+ " water:1.0";
|
|
|
+ p= runtime.exec(exs);
|
|
|
+ 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,"Water",line);
|
|
|
+ System.out.println(line);
|
|
|
+ }
|
|
|
+
|
|
|
+
|
|
|
+ saveMonitorValue(aid,jid);
|
|
|
+ //路径保存
|
|
|
+ saveWayValue(aid,jid);
|
|
|
+ JobSucces(jid);
|
|
|
+ LogService.addLog(aid,jid,"Water","求解——————————————————成功");
|
|
|
+ } catch (IOException | BusinessException e) {
|
|
|
+ LogService.addLog(aid,jid,"Water","求解——————————————————失败");
|
|
|
+ JobError(jid);
|
|
|
+ e.printStackTrace();
|
|
|
+ }
|
|
|
+ return null;
|
|
|
+ });
|
|
|
+
|
|
|
+ }
|
|
|
+ //异步执行
|
|
|
+ @SneakyThrows
|
|
|
+ public void exeWater2(Integer aid,Integer jid) throws Exception{
|
|
|
CompletableFuture<Void> cf = CompletableFuture.supplyAsync(()->{
|
|
|
try {
|
|
|
LogService.addLog(aid,jid,"Water","求解——————————————————开始");
|