Browse Source

1维瓦斯爆炸

huangxingxing 8 months ago
parent
commit
38caf18a1e

+ 2 - 2
src/main/java/com/miniframe/disaster/service/LogService.java

@@ -61,12 +61,12 @@ public class LogService {
                 gassAlllog(aid, jid, stype, log);
                 gassAlllog(aid, jid, stype, log);
                 if(log.indexOf("求解")>=0||log.indexOf("writting")>0){
                 if(log.indexOf("求解")>=0||log.indexOf("writting")>0){
                     savelog(aid, jid, stype, log);
                     savelog(aid, jid, stype, log);
-                }else if(log.indexOf("EHCO LOG")>=0){
+                }else if(log.indexOf("ECHO LOG")>=0){
                     try{
                     try{
                         log.replace(" ","");
                         log.replace(" ","");
                         String[] logt =log.split(":");
                         String[] logt =log.split(":");
                         Double t = Double.parseDouble(logt[1]);
                         Double t = Double.parseDouble(logt[1]);
-                        savelog(aid, jid, stype, "Calculating................................"+t*100+"%");
+                        savelog(aid, jid, stype, "Calculating................................"+t+"%");
                     }catch (Exception e){
                     }catch (Exception e){
 
 
                     }
                     }

+ 4 - 4
src/main/java/com/miniframe/solverjob/DockerExe.java

@@ -20,10 +20,10 @@ import java.util.ArrayList;
 import java.util.List;
 import java.util.List;
 
 
 public class DockerExe {
 public class DockerExe {
-    public static  String DOCKERHOST="tcp://127.0.0.1:2375/";
-    public static  String APIVERSION="26.1.0";
-//    public static final String DOCKERHOST="tcp://192.168.0.132:2375/";
-//    public static final String APIVERSION="1.13.1";
+//    public static  String DOCKERHOST="tcp://127.0.0.1:2375/";
+//    public static  String APIVERSION="26.1.0";
+    public static final String DOCKERHOST="tcp://192.168.0.132:2375/";
+    public static final String APIVERSION="1.13.1";
     // 获取容器信息
     // 获取容器信息
     public static String getDocker(Integer aid,String stype){
     public static String getDocker(Integer aid,String stype){
         DockerClientConfig config = DefaultDockerClientConfig.createDefaultConfigBuilder()
         DockerClientConfig config = DefaultDockerClientConfig.createDefaultConfigBuilder()

+ 1 - 1
src/main/resources/templates/mashGas1Control.ftl

@@ -17,7 +17,7 @@ interactionstep : ${interactionstep}
 ExplosionModel:0
 ExplosionModel:0
 1Dtotaltime: 10
 1Dtotaltime: 10
 1Doutputtime: 0.001
 1Doutputtime: 0.001
-stopPression: 1.5
+stopPression: 2.5
 Number Con:${conNum}
 Number Con:${conNum}
 <#list cons as b>
 <#list cons as b>
 ${b.code},${b.diffcoe}
 ${b.code},${b.diffcoe}