第三方接口修改

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

@@ -592,7 +592,7 @@ public class GeoHazardMonitorTokenController {
                     List<AlarmListVo> listVos = new ArrayList<>();
                     if (baseCameraManagementList.size() > 0) {
                         //获取视频点播地址
-                        String playFlv = CameraUtil.getPlayFlv(baseCameraManagementList.get(0).getCameraCode(), baseCameraManagementList.get(0).getChannel(), false);
+                        String playFlv = CameraUtil.getPlayFlvRtsp(baseCameraManagementList.get(0).getCameraCode(), baseCameraManagementList.get(0).getChannel(), false);
                         respHeartbeatVo.setCurrentStream(playFlv);
                         respHeartbeatVo.setIsAlarm(1);
                         respHeartbeatVo.setCameraCode(baseCameraManagementList.get(0).getCameraCode());
@@ -642,7 +642,7 @@ public class GeoHazardMonitorTokenController {
                         List<BaseCameraManagement> baseList = baseCameraManagementService.list(camera);
                         if (baseList.size() > 0) {
                             for (int o = 0; o < baseList.size(); o++) {
-                                String flv = CameraUtil.getPlayFlv(baseList.get(o).getCameraCode(), baseList.get(o).getChannel(), false);
+                                String flv = CameraUtil.getPlayFlvRtsp(baseList.get(o).getCameraCode(), baseList.get(o).getChannel(), false);
                                 AlarmListVo alarmListVo = new AlarmListVo();
                                 //alarmList对象
                                 alarmListVo.setCameraStream(flv);
@@ -687,9 +687,9 @@ public class GeoHazardMonitorTokenController {
                     base.orderByAsc(BaseCameraManagement::getInstallMile);
                     base.last("limit 4");
                     List<BaseCameraManagement> list1 = baseCameraManagementService.list(base);
-                    String flv = CameraUtil.getPlayFlv(list1.get(0).getCameraCode(), list1.get(0).getChannel(), false);
+                    String flv = CameraUtil.getPlayFlvRtsp(list1.get(0).getCameraCode(), list1.get(0).getChannel(), false);
                     for (BaseCameraManagement baseCameraManagement : list1) {
-                        String flv1 = CameraUtil.getPlayFlv(baseCameraManagement.getCameraCode(), baseCameraManagement.getChannel(), false);
+                        String flv1 = CameraUtil.getPlayFlvRtsp(baseCameraManagement.getCameraCode(), baseCameraManagement.getChannel(), false);
                         twoMap.put(baseCameraManagement.getCameraCode(), flv1);
                         String invite = CameraUtil.invite(baseCameraManagement.getCameraCode(), baseCameraManagement.getChannel());
                         if (!"304".equals(invite) && !"200".equals(invite)) {
@@ -917,7 +917,7 @@ public class GeoHazardMonitorTokenController {
                 jsonObject.put("data", "没有该相机编码的相机");
                 return SM4Utils.encryptData_ECB(JSONObject.toJSONString(jsonObject), "4370780c9a8c43e5");
             }
-            String flv = CameraUtil.getPlayFlv(one.getCameraCode(), one.getChannel());
+            String flv = CameraUtil.getPlayFlvRtsp(one.getCameraCode(), one.getChannel(),false);
             map.put("url", flv);
             jsonObject.put("resultCode", 1);
             jsonObject.put("message", "ok");

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

@@ -38,5 +38,6 @@ public class CaneraConfig {
     @Value("${base.bakUrl:http://124.70.58.209:18891}")
     private String bakUrl;
 
-
+    @Value("${base.bakUrl:rtsp://124.70.58.209:8554}")
+    private String bakUrlRtsp;
 }

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

@@ -47,6 +47,7 @@ public class CameraUtil {
     private static String transcribeFilePath;
     private static String webUrl;
     private static String bakUrl;
+    private static String bakUrlRtsp;
     private static CmdCameraUtil cUtil;
 
     @Autowired
@@ -164,7 +165,7 @@ ffmpeg -i "concat:1.ts|2.ts" -c copy output.mp4
         }
 
     }
-    
+
     /**
      * 实时播放的拼接流
      *
@@ -179,6 +180,27 @@ ffmpeg -i "concat:1.ts|2.ts" -c copy output.mp4
         return webUrl + "/hdl/" + channel + "/" + cameraCode + ".flv";
 
 
+//        if (!flay) {
+//            return bakUrl + "/ws/" + channel + "/" + cameraCode + ".flv";
+//        }
+//        return webUrl + "/ws/" + channel + "/" + cameraCode + ".flv";
+    }
+
+
+    /**
+     * Rtsp实时播放的拼接流
+     *
+     * @param cameraCode 相机编码
+     * @param channel    相机通道
+     * @return
+     */
+    public static String getPlayFlvRtsp(String cameraCode, String channel, boolean flay) {
+        if (!flay) {
+            return bakUrlRtsp + "/" + channel + "/" + cameraCode;
+        }
+        return bakUrlRtsp + "/" + channel + "/" + cameraCode;
+
+
 //        if (!flay) {
 //            return bakUrl + "/ws/" + channel + "/" + cameraCode + ".flv";
 //        }
@@ -201,8 +223,7 @@ ffmpeg -i "concat:1.ts|2.ts" -c copy output.mp4
         }
         return result;
     }
-    
-    
+
 
     /**
      * 开启录制功能
@@ -441,6 +462,7 @@ ffmpeg -i "concat:1.ts|2.ts" -c copy output.mp4
         transcribeFilePath = caneraConfig.getTranscribeFilePath();
         webUrl = caneraConfig.getWebUrl();
         bakUrl = caneraConfig.getBakUrl();
+        bakUrlRtsp=caneraConfig.getBakUrlRtsp();
         rc = redisCache;
         cUtil = cmdCameraUtil;
     }