往流媒体推送流修改

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

@@ -84,6 +84,7 @@ public class CameraUtil {
     private static String bakUrlRtsp;
     private static String wsUrl;
     private static String httpUrl;
+    private static String httpUrls;
     private static CmdCameraUtil cUtil;
     private static RedisCache rc;
     private static ServerConfig sc;
@@ -596,6 +597,7 @@ ffmpeg -i "concat:1.ts|2.ts" -c copy output.mp4
         sc = serverConfig;
         wsUrl = caneraConfig.getWsUrl();
         httpUrl = caneraConfig.getHttpUrl();
+        httpUrls = caneraConfig.getHttpUrls();
         recordUrl = caneraConfig.getRecordUrl();
         hkUrl = caneraConfig.getHkUrl();
         host = caneraConfig.getHost();
@@ -1064,8 +1066,12 @@ ffmpeg -i "concat:1.ts|2.ts" -c copy output.mp4
             log.info("urls----->" + urls);
             try {
                 TimeUnit.SECONDS.sleep(3);
+                log.info("msg---------->" + httpUrl + "/rtsp/api/pull?target=" + urls + "&streamPath=" + camerasVo.getCameraIndexCode() + "/" + channel + "&save=0");
                 String msg = HttpUtils.sendGet(httpUrl + "/rtsp/api/pull?target=" + urls + "&streamPath=" + camerasVo.getCameraIndexCode() + "/" + channel + "&save=0");
                 log.info("msg---------->" + msg);
+                log.info("code---------->" + httpUrls + "/rtsp/api/pull?target=" + urls + "&streamPath=" + camerasVo.getCameraIndexCode() + "/" + channel + "&save=0");
+                String code = HttpUtils.sendGet(httpUrls + "/rtsp/api/pull?target=" + urls + "&streamPath=" + camerasVo.getCameraIndexCode() + "/" + channel + "&save=0");
+                log.info("code---------->" + code);
             } catch (InterruptedException e) {
                 e.printStackTrace();
             }

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

@@ -64,5 +64,8 @@ public class CaneraConfig {
 
     @Value("${base.httpUrl:http://10.48.36.47:9080}")
     public String httpUrl;
+
+    @Value("${base.httpUrls:http://10.48.36.48:9080}")
+    public String httpUrls;
     
 }

vehicle-sdk/src/main/java/com/ozs/controller/upload/GeoHazardMonitorTokenController.java

@@ -1062,17 +1062,7 @@ public class GeoHazardMonitorTokenController {
                 jsonObject.put("data", "没有该相机编码的相机或已离线");
                 return SM4Utils.encryptData_ECB(JSONObject.toJSONString(jsonObject), key);
             }
-            //获取视频点播地址
-            CamerasVo camerasVo = new CamerasVo();
-            camerasVo.setStreamType(0);
-            camerasVo.setCameraIndexCode(one.getCameraCode());
-            String playFlv = cameraUtil.apiPreviewURLs(camerasVo);
-            if ("1".equals(playFlv)) {
-                jsonObject.put("resultCode", 0);
-                jsonObject.put("message", "失败");
-                jsonObject.put("data", "天网实时流接口调用失败");
-                return SM4Utils.encryptData_ECB(JSONObject.toJSONString(jsonObject), key);
-            }
+            String playFlv = cameraUtil.heartbeatgetUrl(one.getCameraCode(), one.getChannel());
             map.put("url", playFlv);
             jsonObject.put("resultCode", 1);
             jsonObject.put("message", "ok");

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

@@ -26,6 +26,7 @@ base:
   wsUrl: ws://10.48.36.47:9080
   historyUrl: http:///10.48.36.47:9080
   httpUrl: http://10.48.36.47:9080
+  httpUrls: http://10.48.36.47:9080
   recordUrl: http://10.48.36.47:18810${server.servlet.context-path}
   env: 1
   hkUrl: http://10:122:1:22:1443