2025-12-01 zwy 多路直播，将外接相机直播地址插入设备列表中。数据库增加字段“cameraWebrtcUrl”，实体增加cameraWeb...

zhaowenyu

2025-12-01 73bc82f63cecf23b74cbf59ebb8bdfb40fe6e5b0

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

@@ -1,6 +1,10 @@
package com.ard.sample.manage.service.impl;

import com.alibaba.fastjson2.JSONObject;
import com.ard.device.camera.domain.ArdCamera;
import com.ard.device.camera.service.IArdCameraService;
import com.ard.device.channel.domain.ArdChannel;
import com.ard.sample.component.websocket.handler.LiveStreamHandler;
import com.ard.system.authorize.service.AuthorizeService;
import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
@@ -65,6 +69,12 @@
@Slf4j
@Transactional
public class DeviceServiceImpl implements IDeviceService {

    @Autowired
    private LiveStreamHandler _liveStreamHandler;

    @Autowired
    private IArdCameraService _cameraService;

    @Autowired
    private IMessageSenderService messageSender;
@@ -355,6 +365,22 @@
                DeviceQueryParam.builder()
                        .domains(List.of(DeviceDomainEnum.GATEWAY.getVal(), DeviceDomainEnum.DOCK.getVal()))
                        .build());
        // 在獲取设备列表时，顺便获取直播地址
        for(DeviceDTO devices : devicesList){
            _liveStreamHandler.StartLiveStreaming(devices.getDeviceSn());
            _liveStreamHandler.StartLiveStreaming(devices.getChildDeviceSn());
            ArdCamera ardCamera = new ArdCamera();
            ardCamera.setDockId(devices.getId());
            List<ArdCamera> ardCameraList = _cameraService.selectArdCameraList(ardCamera);
            for(ArdCamera ardCamera1 : ardCameraList){
                for(ArdChannel ardChannel : ardCamera1.getChannelList()) {
                    if(ardChannel.getChanNo() == 1) {
                        // 修改列表中外接相机地址
                        updateCameraWebrtcUrl(devices.getDeviceSn(), ardChannel.getArdVtdu().getWebrtcUrl());
                    }
                }
            }
        }

        devicesList.stream()
                .filter(gateway -> DeviceDomainEnum.DOCK.getVal() == gateway.getDomain() ||
@@ -499,10 +525,10 @@
    @Override
    @ServiceActivator(inputChannel = ChannelName.INBOUND_OSD)
    public void handleOSD(Message<?> message) {
        String topic = message.getHeaders().get(MqttHeaders.RECEIVED_TOPIC).toString();
        byte[] payload = (byte[]) message.getPayload();
        CommonTopicReceiver receiver;
        try {
            String topic = message.getHeaders().get(MqttHeaders.RECEIVED_TOPIC).toString();
            byte[] payload = (byte[]) message.getPayload();
            CommonTopicReceiver receiver;
            String from = topic.substring((THING_MODEL_PRE + PRODUCT).length(),
                    topic.indexOf(OSD_SUF));

@@ -540,7 +566,12 @@

            tsaService.handleOSD(receiver, device, webSessions, wsMessage);

        } catch (IOException e) {
        } catch (NullPointerException e) {
            log.error("处理OSD消息NPE，headers={}, payload={}",
                    message.getHeaders(), message.getPayload(), e); // 打印完整栈
        }
        catch (IOException e) {
            log.error("处理OSD消息的IO异常：{}",e.getMessage(), e);
            e.printStackTrace();
        }
    }
@@ -748,6 +779,8 @@
                .firmwareVersion(entity.getFirmwareVersion())
                .deptId(entity.getDeptId())
                .workType(entity.getWorkType())
                .webrtcUrl(entity.getWebrtcUrl())
                .cameraWebrtcUrl(entity.getCameraWebrtcUrl())
                .workspaceName(entity.getDeptId() != null
                        ? Optional.ofNullable(sysDeptService.selectDeptById(entity.getDeptId()))
                        .map(SysDept::getDeptName)
@@ -798,6 +831,25 @@
        int update = mapper.update(null, lambdaUpdateWrapper);
        return update > 0;
    }

    @Override
    public Boolean updateWebrtcUrl(String sn, String webrtcUrl){
        LambdaUpdateWrapper<DeviceEntity> lambdaUpdateWrapper = new LambdaUpdateWrapper<>();
        lambdaUpdateWrapper.eq(DeviceEntity::getDeviceSn, sn)
                .set(DeviceEntity::getWebrtcUrl, webrtcUrl);
        int update = mapper.update(null, lambdaUpdateWrapper);
        return update > 0;
    }

    public Boolean updateCameraWebrtcUrl(String sn, String CameraWebrtcUrl){
        LambdaUpdateWrapper<DeviceEntity> lambdaUpdateWrapper = new LambdaUpdateWrapper<>();
        lambdaUpdateWrapper.eq(DeviceEntity::getDeviceSn, sn)
                .set(DeviceEntity::getCameraWebrtcUrl, CameraWebrtcUrl);
        int update = mapper.update(null, lambdaUpdateWrapper);
        return update > 0;
    }



    @Override
    public Boolean bindDevice(DeviceDTO device) {
@@ -1188,6 +1240,8 @@
                .domain(dto.getDomain())
                .firmwareVersion(dto.getFirmwareVersion())
                .workType(dto.getWorkType())
                .webrtcUrl(dto.getWebrtcUrl())
                .cameraWebrtcUrl(dto.getCameraWebrtcUrl())
                .compatibleStatus(dto.getFirmwareStatus() == null ? null :
                        DeviceFirmwareStatusEnum.CONSISTENT_UPGRADE != DeviceFirmwareStatusEnum.find(dto.getFirmwareStatus()))
                .build();