Merge branch 'master' of http://124.70.58.209:3000/ytrd-project-management/GeoHazardMonitor

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

@@ -186,12 +186,12 @@ public class CameraUtil {
             command.add("h264_mp4toannexb");
             command.add("-f");
             command.add("mpegts");
-            command.add(fromVideoFile.substring(0,
-                    fromVideoFile.lastIndexOf(".")) + ".ts");
+            fromVideoFile = fromVideoFile.substring(fromVideoFile.lastIndexOf("/") + 1, fromVideoFile.length());
+            String n = flvPath + fromVideoFile.substring(0,
+                    fromVideoFile.lastIndexOf("."));
+            command.add(n + ".ts");
             builder = new ProcessBuilder(command);
-            voidTS.add(fromVideoFile.substring(0,
-                    fromVideoFile.lastIndexOf("."))
-                    + ".ts");
+            voidTS.add(n + ".ts");
             try {
                 process = builder.start();
                 InputStream errorStream = process