yml流媒体端口修改

business-service/src/main/java/com/ozs/utils/CameraUtil.java

@@ -275,7 +275,7 @@ ffmpeg -i "concat:1.ts|2.ts" -c copy output.mp4
             if (!contains) {
                 return null;
             } else {
-                return getPlayFlv(cameraCode, channel, true);
+                return getPlayFlvRtsp(cameraCode, channel, true);
             }
         }
         return null;
@@ -285,7 +285,7 @@ ffmpeg -i "concat:1.ts|2.ts" -c copy output.mp4
         CamerasVo camerasVo = new CamerasVo();
         camerasVo.setCameraIndexCode(cameraCode);
         previewURLs(camerasVo, channel);
-        return getPlayFlv(cameraCode, channel, true);
+        return getPlayFlvRtsp(cameraCode, channel, true);
     }
 
     /**
@@ -1074,63 +1074,58 @@ ffmpeg -i "concat:1.ts|2.ts" -c copy output.mp4
      */
     public void playbackURLs(List<String> list, String alarmPlayTimeValue) {
         log.info("--------------->playbackURLs");
-        CompletableFuture future = CompletableFuture.supplyAsync(() -> {
-            log.info("异步任务开始-----》");
-            for (String code : list) {
-                PlaybackVo playbackVo = new PlaybackVo();
-                playbackVo.setCameraIndexCode(code);
-                // 获取当前时间
-                OffsetDateTime currentTime = OffsetDateTime.now();
-                // 获取当前时间的前10分钟时间
-                OffsetDateTime beforeTenMinutes = currentTime.minusMinutes(Long.parseLong(alarmPlayTimeValue));
-                // 获取当前时间的后10分钟时间
-                OffsetDateTime afterTenMinutes = currentTime.plusMinutes(Long.parseLong(alarmPlayTimeValue));
-                // 格式化时间
-                DateTimeFormatter formatter = DateTimeFormatter.ofPattern("yyyy-MM-dd'T'HH:mm:ss.SSSXXX");
-                playbackVo.setBeginTime(beforeTenMinutes.format(formatter));
-                //现在当前时间:后续需要修改成报警时间的后几分钟
-                playbackVo.setEndTime(afterTenMinutes.format(formatter));
-                // jsonBody.put("protocol","rtsp");
-                //        jsonBody.put("expand","streamform=rtp");
-                playbackVo.setProtocol("rtsp");
-                playbackVo.setExpand("streamform=rtp");
-                //对象转换json字符串
-                String body = JSONObject.toJSONString(playbackVo);
-                //调用天网接口
-                log.info("body----->" + body);
-                String playbackURLs = getPreviewURLs("/api/video/v1/cameras/playbackURLs", body);
-                log.info("playbackURLs----->" + playbackURLs);
-                JSONObject outJson = (JSONObject) JSONObject.parse(playbackURLs);
-                if ("0".equals(outJson.getString("code"))) {
-                    log.info("outJson----->" + outJson);
-                    JSONObject data = outJson.getJSONObject("data");
-                    String urls = data.getString("url");
-                    log.info("--------------->urls::" + urls);
-
-                    String FilePath = "/opt/streams/map/" + code + ".mp4";
+        for (String code : list) {
+            PlaybackVo playbackVo = new PlaybackVo();
+            playbackVo.setCameraIndexCode(code);
+            // 获取当前时间
+            OffsetDateTime currentTime = OffsetDateTime.now();
+            // 获取当前时间的前10分钟时间
+            OffsetDateTime beforeTenMinutes = currentTime.minusMinutes(Long.parseLong(alarmPlayTimeValue));
+            // 获取当前时间的后10分钟时间
+            OffsetDateTime afterTenMinutes = currentTime.plusMinutes(Long.parseLong(alarmPlayTimeValue));
+            // 格式化时间
+            DateTimeFormatter formatter = DateTimeFormatter.ofPattern("yyyy-MM-dd'T'HH:mm:ss.SSSXXX");
+            playbackVo.setBeginTime(beforeTenMinutes.format(formatter));
+            //现在当前时间:后续需要修改成报警时间的后几分钟
+            playbackVo.setEndTime(currentTime.format(formatter));
+            // jsonBody.put("protocol","rtsp");
+            //        jsonBody.put("expand","streamform=rtp");
+            playbackVo.setProtocol("rtsp");
+            playbackVo.setExpand("streamform=rtp");
+            //对象转换json字符串
+            String body = JSONObject.toJSONString(playbackVo);
+            //调用天网接口
+            log.info("body----->" + body);
+            String playbackURLs = getPreviewURLs("/api/video/v1/cameras/playbackURLs", body);
+            log.info("playbackURLs----->" + playbackURLs);
+            JSONObject outJson = (JSONObject) JSONObject.parse(playbackURLs);
+            if ("0".equals(outJson.getString("code"))) {
+                log.info("outJson----->" + outJson);
+                JSONObject data = outJson.getJSONObject("data");
+                String urls = data.getString("url");
+                log.info("--------------->urls::" + urls);
+
+                String FilePath = "/opt/streams/map/" + code + ".mp4";
 //                String FilePath = "/opt/streams/map/01ea43e6676f4e47bd6c5cd9e02aa006.mp4";
 //            try {
 //                TimeUnit.SECONDS.sleep(62*Integer.parseInt(alarmPlayTimeValue));
 //            } catch (InterruptedException e) {
 //                e.printStackTrace();
 //            }
-                    Process process = rtspToMP4.StartRecord(ffmpegPath, urls, FilePath);
-                    log.info("------playbackURLs----->>>>:" + process);
-                    if (null != process) {
-                        map.put(code, process);
-                    }
-                    try {
-                        TimeUnit.SECONDS.sleep(100 * Integer.parseInt(alarmPlayTimeValue));
-                    } catch (InterruptedException e) {
-                        e.printStackTrace();
-                    }
-                    log.info("------videoCompression----->>>>:");
-                    videoCompression(code);
+                Process process = rtspToMP4.StartRecord(ffmpegPath, urls, FilePath);
+                log.info("------playbackURLs----->>>>:" + process);
+                if (null != process) {
+                    map.put(code, process);
+                }
+                try {
+                    TimeUnit.SECONDS.sleep(70 * Integer.parseInt(alarmPlayTimeValue));
+                } catch (InterruptedException e) {
+                    e.printStackTrace();
                 }
+                log.info("------videoCompression----->>>>:");
+                videoCompression(code);
             }
-            return 1;
-        });
-        future.join();
+        }
     }
 
     public AjaxResult stop(String id) {

vehicle-admin/src/main/resources/application.yml

@@ -18,7 +18,7 @@ base:
   sqlType: dm  # 数据库类型
   dbname: vehicle #数据库名
   #图片路径前缀
-  imgUrl: http://10.48.36.43:18801/picbucket
+  imgUrl: http://123.139.243.142:18082/picbucket
   ffmpegPath: /usr/bin/ffmpeg
   filePath: /opt/streams/record/flv/
   webUrl: http://10.48.36.47:9080
@@ -30,7 +30,7 @@ base:
   env: 1
   hkUrl: http://10:122:1:22:1443
   rtmpUrl: rtmp://10.48.36.47:1935
-  bakUrlRtsp: rtsp://10.48.36.47:8554
+  bakUrlRtsp: rtsp://123.139.243.142:18084
 
 server:
   # 服务器的HTTP端口，默认为8080