|
@@ -339,7 +339,7 @@ public class D00008Service extends D00008BaseModel implements ExecProcessFlow {
|
|
|
}
|
|
|
//异步执行
|
|
|
@SneakyThrows
|
|
|
- public void exeWater(Integer aid,Integer jid) throws Exception{
|
|
|
+ public void exeWater2(Integer aid,Integer jid) throws Exception{
|
|
|
CompletableFuture<Void> cf = CompletableFuture.supplyAsync(()->{
|
|
|
try {
|
|
|
// 构建Docker命令字符串
|
|
@@ -350,7 +350,7 @@ public class D00008Service extends D00008BaseModel implements ExecProcessFlow {
|
|
|
"-v " +
|
|
|
TemplateGenerator.BPATH+"/"+aid+"/"+jid+"/water/runWater.sh" +
|
|
|
":/home/disaster/zhty/Water/runWater.sh " +
|
|
|
- " water:1.0";
|
|
|
+ "water:1.0";
|
|
|
ProcessBuilder processBuilder = new ProcessBuilder(dockerCommand.split(" "));
|
|
|
LogService.addLog(aid,jid,"Water","求解——————————————————开始");
|
|
|
// Runtime runtime = Runtime.getRuntime();
|
|
@@ -400,7 +400,7 @@ public class D00008Service extends D00008BaseModel implements ExecProcessFlow {
|
|
|
}
|
|
|
//异步执行
|
|
|
@SneakyThrows
|
|
|
- public void exeWater2(Integer aid,Integer jid) throws Exception{
|
|
|
+ public void exeWater(Integer aid,Integer jid) throws Exception{
|
|
|
CompletableFuture<Void> cf = CompletableFuture.supplyAsync(()->{
|
|
|
try {
|
|
|
LogService.addLog(aid,jid,"Water","求解——————————————————开始");
|