hexiao 2 năm trước cách đây
mục cha
commit
de9a11b1ed

+ 4 - 11
hazard-admin/src/main/java/com/ozs/web/core/util/CameraUtil.java

@@ -305,16 +305,6 @@ public class CameraUtil {
                 log.info("命令:{}", line);
                 out.println(line);
             }
-            log.info("命令:{}", commit1);
-            execute(commit1);
-            try {
-                Thread.currentThread().sleep(10000);
-            } catch (InterruptedException e) {
-                log.error(e.getMessage());
-                e.printStackTrace();
-            }
-            out.println("rm -rf " + pathStr + "/" + substring);
-            log.info("命令:{}", "rm -rf " + pathStr + "/" + substring);
             out.println("exit");// 这个命令必须执行,否则in流不结束。
             log.info("命令:{}", "exit");
             String rspLine = "";
@@ -322,8 +312,11 @@ public class CameraUtil {
                 log.info("*****:{}", rspLine);
             }
             proc.waitFor(5L, TimeUnit.MINUTES);
+
+            log.info("命令:{}", commit1);
+            execute(commit1);
             //删除生成的ts文件
-            File file1 = new File(substring);
+            File file1 = new File(pathStr + "/" + substring);
             if (file1.exists()) {
                 file1.delete();
             }