forked from uav/ard-uav-server
blame | history | patch | commit | commitdiff | show whitespace
zhaowenyu
2025-12-01 73bc82f63cecf23b74cbf59ebb8bdfb40fe6e5b0 
 ard-sample/src/main/java/com/ard/sample/manage/service/impl/DeviceServiceImpl.java


@@ -1,6 +1,9 @@


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;


@@ -69,6 +72,9 @@




    @Autowired


    private LiveStreamHandler _liveStreamHandler;




    @Autowired


    private IArdCameraService _cameraService;




    @Autowired


    private IMessageSenderService messageSender;


@@ -363,6 +369,17 @@


        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()


@@ -763,6 +780,7 @@


                .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)


@@ -822,6 +840,16 @@


        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) {


@@ -1213,6 +1241,7 @@


                .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();