2025-11-7 zwy 飞行器视频增加video_type 直播视频流镜头类型

zhaowenyu

2025-11-07 4e9465a4608f569e6d7a91048e41cb5aac3828fd

2025-11-7 zwy 飞行器视频增加video_type	直播视频流镜头类型

 ard-sample/src/main/java/com/ard/sample/component/websocket/handler/DockWebSocketHandler.java

@@ -4,6 +4,7 @@
import com.ard.sample.component.websocket.enums.MessageType;
import com.ard.sample.component.websocket.model.Payload;
import com.ard.sample.component.websocket.model.WebSocketMessage;
import lombok.extern.slf4j.Slf4j;
import org.checkerframework.checker.units.qual.A;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Component;
@@ -16,6 +17,7 @@
import java.util.*;
import java.util.concurrent.ConcurrentHashMap;

@Slf4j
@Component
public class DockWebSocketHandler extends TextWebSocketHandler {

@@ -46,7 +48,8 @@
        userSessions.put(userId, session);
        // 为新会话初始化锁对象
        sessionLocks.put(session, new Object());
        System.out.println("用户[" + userId + "]已连接，当前在线人数：" + userSessions.size());
        //System.out.println("用户[" + userId + "]已连接，当前在线人数：" + userSessions.size());
        log.info("用户[{}]已连接，当前在线人数：{}", userId, userSessions.size());
    }

    /**
@@ -84,17 +87,19 @@
    private void handleSubscription(String userId, String type, Payload payload) {
        String sn = payload.getSn();
        boolean subscribe = payload.isSubscribe();
        String videoType = payload.getVideotype();
        String subscriptionKey = getSubscriptionKey(sn, type); // 生成唯一订阅标识

        if (subscribe) {
            // 订阅操作
            subscriptions.computeIfAbsent(subscriptionKey, k -> ConcurrentHashMap.newKeySet()).add(userId);
            System.out.println("用户[" + userId + "]订阅了 设备[" + sn + "]的[" + type + "]类型消息");
            //System.out.println("用户[" + userId + "]订阅了 设备[" + sn + "]的[" + type + "]类型消息");
            log.info("用户[{}]订阅了 设备[{}]的[{}]类型消息", userId, sn, type);
            if(MessageType.LIVESTREAM.getType().equals(type)){
                // 开启直播
                // 开启直播逻辑
                System.out.println("开启直播");
                _liveStreamService.StartLiveStreaming(sn);
                _liveStreamService.StartLiveStreaming(sn, videoType);
            }
        } else {
            // 停止直播
@@ -108,7 +113,8 @@
                if (subscriptions.get(subscriptionKey).isEmpty()) {
                    subscriptions.remove(subscriptionKey);
                }
                System.out.println("用户[" + userId + "]取消订阅了 设备[" + sn + "]的[" + type + "]类型消息");
                //System.out.println("用户[" + userId + "]取消订阅了 设备[" + sn + "]的[" + type + "]类型消息");
                log.info("用户[{}]取消订阅了 设备[{}]的[{}]类型消息", userId, sn, type);
            }
        }
    }
@@ -124,7 +130,8 @@
            sessionLocks.remove(session); // 移除会话锁
            // 清除该用户的所有订阅
            removeUserAllSubscriptions(userId);
            System.out.println("用户[" + userId + "]已断开连接，当前在线人数：" + userSessions.size());
            //System.out.println("用户[" + userId + "]已断开连接，当前在线人数：" + userSessions.size());
            log.info("用户[{}]已断开连接，当前在线人数：{}", userId, userSessions.size());
        }
    }

@@ -153,17 +160,6 @@
        }

        try {
            // 构建发送的消息
//            WebSocketMessage message = new WebSocketMessage();
//            message.setType(type);
//
//            Payload payload = new Payload();
//            payload.setSn(sn);
//            payload.setSubscribe(true); // 仅作为标识，无实际意义
//            message.setPayload(payload);
//
//            String jsonMessage = JSON.toJSONString(message);

            // 向所有订阅者发送消息
            for (String userId : subscriberIds) {
                WebSocketSession session = userSessions.get(userId);
@@ -193,7 +189,8 @@
//                }
            }
        } catch (IOException e) {
            System.err.println("发送消息错误：" + e.getMessage());
//            System.err.println("发送消息错误：" + e.getMessage());
            log.error("发送消息错误：{}", e.getMessage());
        }
    }


 ard-sample/src/main/java/com/ard/sample/component/websocket/handler/LiveStreamHandler.java

@@ -34,10 +34,11 @@
    /**
     * 开启直播
     */
    public void StartLiveStreaming(String sn) {
    public void StartLiveStreaming(String sn, String videotype ) {
        // 检查设备是否在线
        if (!_deviceService.checkDeviceOnline(sn)) {
            String jsonString = getResult(sn, "设备不在线，请检查网络连接！");
            log.info("SN: {}-设备不在线，请检查网络连接！", sn);
            _dockWebSocketHandler.sendMessageToSubscribers(sn, MessageType.LIVESTREAM.getType(), jsonString);
            return;
        }
@@ -45,6 +46,7 @@
        List<CapacityDeviceDTO> devicesList = _liveStreamService.getLiveCapacity();
        if (devicesList == null || devicesList.isEmpty()) {
            String jsonString = getResult(sn, "未获得设备直播能力！");
            log.info("SN: {}-未获得设备直播能力！", sn);
            _dockWebSocketHandler.sendMessageToSubscribers(sn, MessageType.LIVESTREAM.getType(), jsonString);
            return;
        }
@@ -66,7 +68,7 @@
                    param.setUrl("");
                    param.setVideoId(videoid);
                    param.setVideoQuality(1);
                    param.setVideoType(video.getSwitchVideoTypes().get(0));
                    param.setVideoType(videotype);
                    //调用开始直播
                    ResponseResult rlive = null;
                    String resultLive = "";
@@ -77,18 +79,21 @@
                            while (rlive.getCode() == 513003) {
                                //Thread.sleep(200);
                                _liveStreamService.liveStop(param.getVideoId());
                                System.out.println("相机已经在直播中，关闭直播后重启直播！");
                                //System.out.println("相机已经在直播中，关闭直播后重启直播！");
                                log.info("SN: {}-相机已经在直播中，关闭直播后重启直播！", sn);
                                rlive = _liveStreamService.liveStart(param);
                            }
                            if(rlive.getCode() == 0){
                                // 直播成功后，在redis中存一个标记，将videoid保留，留给停止直播使用
                                System.out.println("开启直播成功！");
                                //System.out.println("开启直播成功！");
                                log.info("SN: {}-开启直播成功！", sn);
                                RedisOpsUtils.setWithExpire(RedisConst.WEBSOCKET_VideoId_PREFIX + sn, param.getVideoId(), RedisConst.WEBSOCKET_ALIVE_SECOND);
                            }
                            rlive.setGateway(sn);
                            rlive.setType(MessageType.LIVESTREAM.getType());
                            resultLive = _objectMapper.writeValueAsString(rlive);
                            _dockWebSocketHandler.sendMessageToSubscribers(sn, MessageType.LIVESTREAM.getType(), resultLive);
                            log.info("SN: {}-直播地址：{}", sn, resultLive);
                            break;
                        }
                    } catch (Exception e) {

 ard-sample/src/main/java/com/ard/sample/component/websocket/model/Payload.java

@@ -21,4 +21,9 @@
     * 是否订阅
     * */
    private boolean subscribe;

    /**
     * 直播视频流镜头类型    enum_string    {"ir":"红外","normal":"默认","wide":"广角","zoom":"变焦"}
     * */
    private String  videotype;
}

 ard-sample/src/main/java/com/ard/sample/component/websocket/model/WebSocketMessage.java

@@ -21,5 +21,4 @@
     * 访问的消息实体类
     * */
    private Payload payload;
    //private String userId; // 服务器端添加的用户ID
}