Merge remote-tracking branch 'origin/dev' into dev

zhaowenyu

2026-01-06 4e8a1c02b45f72f6377603778e8c8746ed82f374

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

@@ -38,6 +38,11 @@
        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));
@@ -122,8 +127,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)) {