ard-sample/src/main/java/com/ard/sample/component/websocket/handler/LiveStreamHandler.java
@@ -31,16 +31,22 @@
    /**
     * 开启直播
     */
    public void StartLiveStreaming(String sn) {
    public void StartLiveStreaming(String sn ,String userId) {
        //调用开始直播
        ResponseResult rlive = null;
        String resultLive = "";
        try {
            // 获取直播参数
            LiveTypeDTO param = getLiveParam(sn);
            // 判断param是否为空,不为空则返回正确的直播参数,为null则未获取直播参数,不为空则继续操作
            if (param == null) {
                log.info("SN: {}-未获取到直播参数param为null,无法开启直播!", sn);
                return;
            }
            // 如果存在直播则读取直播地址返回
            if (RedisOpsUtils.checkExist(RedisConst.WEBSOCKET_VIDEO_ADDRESS_PREFIX + sn)) {
                resultLive = String.valueOf(RedisOpsUtils.get(RedisConst.WEBSOCKET_VIDEO_ADDRESS_PREFIX + sn));
                log.info("SN: {}-redis中存在相机的播放地址信息,直接返回地址!", sn);
            } else {
                log.info("SN: {}-redis中未找到相机的播放地址信息!停止直播后再开启直播", sn);
                StopLiveStreaming(sn);
@@ -53,17 +59,22 @@
                    rlive.setType(MessageType.LIVESTREAM.getType());
                    resultLive = _objectMapper.writeValueAsString(rlive);
                    RedisOpsUtils.set(RedisConst.WEBSOCKET_VIDEO_ADDRESS_PREFIX + sn, resultLive);
                    LiveDTO live = (LiveDTO) rlive.getData();
                    Boolean isWeb = _deviceService.updateWebrtcUrl(sn,live.getWebrtcUrl());
                    if (isWeb) {
                        log.info("SN: {}-更新webrtc地址成功!", sn);
                    }
                }
                else {
                    log.info("SN: {}-开启直播失败!返回值:{}", sn, rlive);
                }
            }
            _dockWebSocketHandler.sendMessageToSubscribers(sn, MessageType.LIVESTREAM.getType(), resultLive, userId);
            log.info("SN: {}-直播地址:{}", sn, resultLive);
        } catch (Exception e) {
            log.info("SN: {}-开启直播失败!原因:{}", sn, e.getMessage());
            String jsonString = getResult(sn, "开启直播失败!原因:" + e.getMessage());
            _dockWebSocketHandler.sendMessageToSubscribers(sn, MessageType.LIVESTREAM.getType(), jsonString);
            e.printStackTrace();
        }
        _dockWebSocketHandler.sendMessageToSubscribers(sn, MessageType.LIVESTREAM.getType(), resultLive);
        log.info("SN: {}-直播地址:{}", sn, resultLive);
    }
    public void StopLiveStreaming(String sn) {
@@ -74,14 +85,17 @@
            LiveTypeDTO param = getLiveParam(sn);
            // 停止直播逻辑
            rlive = _liveStreamService.liveStop(param.getVideoId());
            log.info("SN: {}-停止直播!返回值:{}", sn, rlive);
//            rlive.setGateway(sn);
//            rlive.setType(MessageType.LIVESTREAM.getType());
//            resultLive = _objectMapper.writeValueAsString(rlive);
            RedisOpsUtils.del(RedisConst.WEBSOCKET_VIDEO_ADDRESS_PREFIX + sn);
            log.info("SN: {}-停止直播,并删除redis直播信息!", sn);
        } catch (Exception e) {
            log.info("SN: {}-停止直播时发生异常,原因:{}", sn,e.getMessage());
            e.printStackTrace();
        }
        //_dockWebSocketHandler.sendMessageToSubscribers(sn, MessageType.LIVESTREAM.getType(), resultLive);
        // 停止直播不返回数据,直接删除redis中的直播地址标记即可;并且方法在websocket连接断开后执行。
    }
    public String getResult(String sn, String msg) {
@@ -117,8 +131,9 @@
        List<CapacityDeviceDTO> devicesList = _liveStreamService.getLiveCapacity();
        if (devicesList == null || devicesList.isEmpty()) {
            log.info("SN: {}-未获得设备直播能力!", sn);
            return null;
            // 抛弃出异常,给调用者处理
            throw new Exception("未获得设备直播能力!");
            // throw new Exception("未获得设备直播能力!");
        }
        for (CapacityDeviceDTO device : devicesList) {
            if (!device.getSn().equals(sn)) {
@@ -126,9 +141,21 @@
            }
            List<CapacityCameraDTO> camerasList = device.getCamerasList();
            for (CapacityCameraDTO camera : camerasList) {
                if (camera.getName() == null || camera.getName().isEmpty()) {
                    continue;
                // 机场3中飞行器,没有name,需要其他条件确定主摄像头参数
                for(CapacityVideoDTO video : camera.getVideosList())
                {
                    if(video.getSwitchVideoTypes().size() == 1 && camera.getName() == null)
                    {
                        continue;
                    }
                }
//                camera.getVideosList().get(0).getSwitchVideoTypes().add("main");
//                if(camera.getVideosList().size() == 1 && camera.getName() == null) {
//                    continue;
//                }
//                if (camera.getName() == null || camera.getName().isEmpty()) {
//                    continue;
//                }
                String videoid = device.getSn() + "/" + camera.getIndex();
                List<CapacityVideoDTO> videosList = camera.getVideosList();
                for (CapacityVideoDTO video : videosList) {