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

hazard-admin/src/main/java/com/ozs/web/core/config/CaneraConfig.java

@@ -28,7 +28,7 @@ public class CaneraConfig {
     /**
      * 录制视频存放路径
      */
-    @Value("${base.transcribeFilePath:/opt/streams/record/flv/}")
+    @Value("${base.transcribeFilePath:/opt/streams/record/flv}")
     private String transcribeFilePath;
 
 

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

@@ -417,11 +417,11 @@ public class CameraUtil {
                 List<String> commands = new ArrayList<>();
                 for (Map<String, Object> map : maps) {
                     Object path = map.get("Path");
-                    ////查出符合条件的视频文件，删掉
-                    //if (!ObjectUtils.isEmpty(path)) {
-                    //    String commit = " rm -rf  " + transcribeFilePath + formatD + "*";
-                    //    commands.add(commit);
-                    //}
+                    //查出符合条件的视频文件，删掉
+                    if (!ObjectUtils.isEmpty(path)) {
+                        String commit = " rm -rf  " + transcribeFilePath + "/" + path.toString() + "/" + formatD + "*";
+                        commands.add(commit);
+                    }
                 }
                 // 删除
                 for (String line : commands) {