修改路径

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

@@ -179,8 +179,8 @@ public class CameraUtil {
      * @param taskId 录像接口返回的任务ID
      * @return
      */
-    public static String endRecording(String cameraCode,String channel) {
-        return webUrl + "/recordpro/api/stop?id=" + cameraCode+"/"+channel+"/flv";
+    public static String endRecording(String cameraCode, String channel) {
+        return webUrl + "/recordpro/api/stop?id=" + cameraCode + "/" + channel + "/flv";
     }
 
 
@@ -649,7 +649,7 @@ ffmpeg -i "concat:1.ts|2.ts" -c copy output.mp4
                                 lw.eq(BaseCameraManagement::getCameraCode, substring);
                                 BaseCameraManagement baseCameraManagement = baseCameraManagementService.getOne(lw);
                                 log.info("closeRecording-endRecording------------" + baseCameraManagement.getTaskId());
-                                String start = HttpUtils.sendGet(CameraUtil.endRecording(baseCameraManagement.getCameraCode(),baseCameraManagement.getChannel()));
+                                String start = HttpUtils.sendGet(CameraUtil.endRecording(baseCameraManagement.getCameraCode(), baseCameraManagement.getChannel()));
                                 log.info("closeRecording-endRecording------------" + start);
                                 if ("success".equals(start)) {
                                     baseCameraManagement.setStartRecording(2);
@@ -666,7 +666,7 @@ ffmpeg -i "concat:1.ts|2.ts" -c copy output.mp4
                             lw.eq(BaseCameraManagement::getCameraCode, substring);
                             BaseCameraManagement baseCameraManagement = baseCameraManagementService.getOne(lw);
                             log.info("closeRecording-endRecording------------" + baseCameraManagement.getTaskId());
-                            String start = HttpUtils.sendGet(CameraUtil.endRecording(baseCameraManagement.getCameraCode(),baseCameraManagement.getChannel()));
+                            String start = HttpUtils.sendGet(CameraUtil.endRecording(baseCameraManagement.getCameraCode(), baseCameraManagement.getChannel()));
                             log.info("closeRecording-endRecording------------" + start);
                             if ("success".equals(start)) {
                                 baseCameraManagement.setStartRecording(2);
@@ -905,10 +905,9 @@ ffmpeg -i "concat:1.ts|2.ts" -c copy output.mp4
     }
 
     /**
-     * 
      * 删除录制视频的零时文件
      */
-    public void deleteTmpFlv() {
+    public void deleteTmpFlv(Integer num) {
         log.info("find /opt/streams/record/flv/*/*/ -mmin +5 -name *.flv -exec rm -rf {} \\;");
 //        cmdCameraUtil.cmd("find /opt/streams/record/flv/*/*/ -mmin +5 -name *.flv -exec rm -rf {} \\;");
 
@@ -916,8 +915,8 @@ ffmpeg -i "concat:1.ts|2.ts" -c copy output.mp4
             Process proc = Runtime.getRuntime().exec("/bin/bash", null, null);
             BufferedReader in = new BufferedReader(new InputStreamReader(proc.getInputStream()));
             PrintWriter out = new PrintWriter(new BufferedWriter(new OutputStreamWriter(proc.getOutputStream())), true);
-//            String commit = "find /opt/streams/record/flv/*/*/ -mmin +"+num+" -name *.flv -exec rm -rf {} \\;";
-              String commit = "find /opt/streams/record/flv/*/*/ -mmin +1 -name *.flv -exec rm -rf {} \\;";
+            String commit = "find /opt/streams/record/flv/*/*/ -mmin +" + num + " -name *.flv -exec rm -rf {} \\;";
+//              String commit = "find /opt/streams/record/flv/*/*/ -mmin +1 -name *.flv -exec rm -rf {} \\;";
             List<String> commands = new ArrayList<>();
 
             // 删除
@@ -930,7 +929,7 @@ ffmpeg -i "concat:1.ts|2.ts" -c copy output.mp4
             String rspLine = "";
             while ((rspLine = in.readLine()) != null) {
                 System.out.println(rspLine);
-               
+
             }
             int i = proc.waitFor();
             log.info("执行结果：{}", i);