1维瓦斯爆炸

src/main/java/com/miniframe/disaster/service/LogService.java

@@ -53,25 +53,30 @@ public class LogService {
      * @param
      */
     public static void addLog(Integer aid,Integer jid,String stype,String log){
-        if(stype.equals("gass")){//排除其他日志
-            gassAlllog(aid, jid, stype, log);
-            if(log.indexOf("求解")>=0||log.indexOf("writting")>0){
-                savelog(aid, jid, stype, log);
-            }else if(log.indexOf("EHCO LOG")>=0){
-                try{
-                    log.replace(" ","");
-                    String[] logt =log.split(":");
-                    Double t = Double.parseDouble(logt[1]);
-                    savelog(aid, jid, stype, "Calculating................................"+t*100+"%");
-                }catch (Exception e){
+        if(log.indexOf("成功")>=0) {
+            savelog(aid, jid, stype, "Calculating................................100%");
+        }else{
+            if(stype.equals("gass")){//排除其他日志
+                gassAlllog(aid, jid, stype, log);
+                if(log.indexOf("求解")>=0||log.indexOf("writting")>0){
+                    savelog(aid, jid, stype, log);
+                }else if(log.indexOf("EHCO LOG")>=0){
+                    try{
+                        log.replace(" ","");
+                        String[] logt =log.split(":");
+                        Double t = Double.parseDouble(logt[1]);
+                        savelog(aid, jid, stype, "Calculating................................"+t*100+"%");
+                    }catch (Exception e){
 
-                }
+                    }
 
 
+                }
+            }else{
+                savelog(aid, jid, stype, log);
             }
-        }else{
-           savelog(aid, jid, stype, log);
         }
+
     }
 
     private static void gassAlllog(Integer aid, Integer jid, String stype, String log) {