gao.qiang před 1 rokem
rodič
revize
4004dbd35a

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

@@ -632,7 +632,8 @@ public class GeoHazardMonitorTokenController {
                         respHeartbeatVo.setCurrentStream(playFlv);
                         respHeartbeatVo.setIsAlarm(1);
                         respHeartbeatVo.setCameraCode(baseCameraManagementList.get(0).getCameraCode());
-                        twoMap.put(respHeartbeatVo.getCameraCode(), respHeartbeatVo.getCurrentStream());
+                        twoMap.put("currentStream", playFlv);
+                        twoMap.put("cameraCode", baseCameraManagementList.get(0).getCameraCode());
                         //alarmInfo对象
                         AlarmInfoVo alarmInfoVo = new AlarmInfoVo();
                         alarmInfoVo.setAlarmId(list.get(0).getAlarmId());
@@ -679,7 +680,6 @@ public class GeoHazardMonitorTokenController {
                                 //alarmList对象
                                 alarmListVo.setCameraStream(flv);
                                 alarmListVo.setCameraCode(baseList.get(o).getCameraCode());
-                                twoMap.put(alarmListVo.getCameraCode(), alarmListVo.getCameraStream());
                                 //alarmInfo对象
                                 AlarmInfoVo alarmInfoVo1 = new AlarmInfoVo();
                                 alarmInfoVo1.setAlarmId(list.get(i).getAlarmId());
@@ -723,9 +723,10 @@ public class GeoHazardMonitorTokenController {
                     List<BaseCameraManagement> list1 = baseCameraManagementService.list(base);
                     CameraUtil.invite(list1.get(0).getCameraCode(), list1.get(0).getChannel());
                     String flv = CameraUtil.getPlayFlvRtsp(list1.get(0).getCameraCode(), list1.get(0).getChannel(), false);
+                    twoMap.put("currentStream", flv);
+                    twoMap.put("cameraCode", list1.get(0).getCameraCode());
                     for (BaseCameraManagement baseCameraManagement : list1) {
                         String flv1 = CameraUtil.getPlayFlvRtsp(baseCameraManagement.getCameraCode(), baseCameraManagement.getChannel(), false);
-                        twoMap.put(baseCameraManagement.getCameraCode(), flv1);
                         CameraUtil.invite(baseCameraManagement.getCameraCode(), baseCameraManagement.getChannel());
                     }
                     respHeartbeatVo.setCurrentStream(flv);