2025-12-12 zwy 优化，订阅视频时，谁订阅发给谁直播地址，其他订阅不变

zhaowenyu

2025-12-12 7beea5916728a84617d4791775d0aac70ab32eee

 ard-sample/src/main/java/com/ard/sample/manage/service/impl/ControlServiceImpl.java

@@ -63,6 +63,7 @@
            return ResponseResult.error("The " + serviceIdentifier + " method does not exist.");
        }


        Object data = "";
        // Add parameter validation.
        if (Objects.nonNull(controlMethodEnum.getClazz())) {
@@ -85,7 +86,7 @@

        boolean isExist = deviceService.checkDeviceOnline(sn);
        if (!isExist) {
            return ResponseResult.error("The dock is offline.");
            return ResponseResult.error(CommonErrorEnum.DEVICE_OFFLINE.getErrorMsg());
        }
        String topic = TopicConst.THING_MODEL_PRE + TopicConst.PRODUCT + sn + TopicConst.SERVICES_SUF;
        String bid = UUID.randomUUID().toString();
@@ -101,14 +102,33 @@
        ServiceReply<EventsOutputReceiver> serviceReply = mapper.convertValue(
                serviceReplyOpt, new TypeReference<ServiceReply<EventsOutputReceiver>>() {});
        if (ResponseResult.CODE_SUCCESS != serviceReply.getResult()) {
            return ResponseResult.error(serviceReply.getResult(),
                    Objects.nonNull(serviceReply.getOutput()) ? serviceReply.getOutput().getStatus() : "errorCode: "
                            + serviceReply.getResult());
            String errorMsg = CommonErrorEnum.getMsgByCode(serviceReply.getResult());
            return ResponseResult.error(serviceReply.getResult(),errorMsg);
//            return ResponseResult.error(serviceReply.getResult(),
//                    Objects.nonNull(serviceReply.getOutput()) ? serviceReply.getOutput().getStatus() : "errorCode: "
//                            + serviceReply.getResult());
        }
        if (controlMethodEnum.getProgress()) {
            RedisOpsUtils.setWithExpire(serviceIdentifier + RedisConst.DELIMITER +  bid, sn,
                    RedisConst.DEVICE_ALIVE_SECOND * RedisConst.DEVICE_ALIVE_SECOND);
        }
        // 执行操作成功后，更新摄像头内外镜头状态
        if(RemoteControlMethodEnum.COVER_OPEN == controlMethodEnum) {
            // 打开盖子,切换机场舱内摄像头镜头
            //打开，摄像头为舱内；将摄像头状态存到redis，格式为：CONVERSTATE:设备SN：1（舱外）或0（舱内）
            _deviceService.setRedisCameraPosition(sn,0);
        }
        if(RemoteControlMethodEnum.COVER_CLOSE == controlMethodEnum) {
            // 关闭盖子,切换机场舱外摄像头镜头
            //关闭，摄像头为舱外；将摄像头状态存到redis，格式为：CONVERSTATE:设备SN：1（舱外）或0（舱内）
            _deviceService.setRedisCameraPosition(sn,1);
        }
        // 重启机场时清redis视频直播地址，机场重启不掉线。但是流停了。
        if(RemoteControlMethodEnum.DEVICE_REBOOT == controlMethodEnum) {
            RedisOpsUtils.del(RedisConst.WEBSOCKET_VIDEO_ADDRESS_PREFIX + sn);
            RedisOpsUtils.del(RedisConst.COVER_STATE_PREFIX + sn);
        }

        return ResponseResult.success();
    }

@@ -171,7 +191,7 @@
            e.printStackTrace();
        }
        // 设备控制进度消息websocket发给前端
        _dockWebSocketHandler.sendMessageToSubscribers(sn, MessageType.PROGRESS.getType(), dockProgress);
        _dockWebSocketHandler.sendMessageToSubscribers(sn, MessageType.PROGRESS.getType(), dockProgress, "");

        if (receiver.getNeedReply() != null && receiver.getNeedReply() == 1) {
            String topic = headers.get(MqttHeaders.RECEIVED_TOPIC) + TopicConst._REPLY_SUF;