소스 검색

心跳接口修改

gao.qiang 1 년 전
부모
커밋
532bcc6817
2개의 변경된 파일3개의 추가작업 그리고 1개의 파일을 삭제
  1. 2 1
      business-service/src/main/java/com/ozs/utils/CameraUtil.java
  2. 1 0
      vehicle-admin/src/main/resources/application.yml

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

@@ -363,6 +363,7 @@ ffmpeg -i "concat:1.ts|2.ts" -c copy output.mp4
                     CamerasVo camerasVo = new CamerasVo();
                     camerasVo.setCameraIndexCode(cameraCode);
                     String urLs = previewURLs(camerasVo, channel);
+                    log.info("web实时流---"+urLs);
                     if (!urLs.contains("无视频")) {
                         return getPlayFlv(cameraCode, channel, true, urLs);
                     }else {
@@ -373,6 +374,7 @@ ffmpeg -i "concat:1.ts|2.ts" -c copy output.mp4
                 CamerasVo camerasVo = new CamerasVo();
                 camerasVo.setCameraIndexCode(cameraCode);
                 String urLs = previewURLs(camerasVo, channel);
+                log.info("web实时流---"+urLs);
                 if (!urLs.contains("无视频")) {
                     return getPlayFlv(cameraCode, channel, true, urLs);
                 }else {
@@ -382,7 +384,6 @@ ffmpeg -i "concat:1.ts|2.ts" -c copy output.mp4
         } else {
             CamerasVo camerasVo = new CamerasVo();
             camerasVo.setCameraIndexCode(cameraCode);
-            previewURLs(camerasVo, channel);
             String urLs = previewURLs(camerasVo, channel);
             if (!urLs.contains("无视频")) {
                 return getPlayFlv(cameraCode, channel, true, urLs);

+ 1 - 0
vehicle-admin/src/main/resources/application.yml

@@ -24,6 +24,7 @@ base:
   webUrl: http://10.48.31.84:9080
   bakUrl: http://10.48.31.84:9080
   wsUrl: ws://10.48.31.84:9080
+  wsUrls: ws://10.48.31.85:9080
   historyUrl: http://10.48.31.84:9080
   httpUrl: http://10.48.31.84:9080
   httpUrls: http://10.48.31.85:9080