流媒体接口修改

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

@@ -632,17 +632,8 @@ public class GeoHazardMonitorTokenController {
                         List<BaseCameraManagement> baseCameraManagementList = baseCameraManagementService.list(camera);
                         List<AlarmListVo> listVos = new ArrayList<>();
                         if (baseCameraManagementList.size() > 0) {
-                            //获取视频点播地址
-                            CamerasVo camerasVo = new CamerasVo();
-                            camerasVo.setStreamType(type);
-                            camerasVo.setCameraIndexCode(baseCameraManagementList.get(0).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.heartbeatgetPlayFlv(baseCameraManagementList.get(0).getCameraCode(), baseCameraManagementList.get(0).getChannel());
                             respHeartbeatVo.setCurrentStream(playFlv);
                             respHeartbeatVo.setIsAlarm(1);
                             respHeartbeatVo.setCameraCode(baseCameraManagementList.get(0).getCameraCode());
@@ -696,17 +687,8 @@ public class GeoHazardMonitorTokenController {
                             List<BaseCameraManagement> baseList = baseCameraManagementService.list(ment);
                             if (baseList.size() > 0) {
                                 for (int o = 0; o < baseList.size(); o++) {
-                                    //获取视频点播地址
-                                    CamerasVo camerasVo = new CamerasVo();
-                                    camerasVo.setStreamType(type);
-                                    camerasVo.setCameraIndexCode(baseList.get(o).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.heartbeatgetPlayFlv(baseList.get(o).getCameraCode(), baseList.get(o).getChannel());
                                     AlarmListVo alarmListVo = new AlarmListVo();
                                     //alarmList对象
                                     alarmListVo.setCameraStream(playFlv);