forked from uav/ard-uav-server
blame | history | patch | commit | commitdiff | ignore whitespace
zhaowenyu
2026-04-02 504eaab19115cad29fe1fe91f1bb478052ac4196 
 ard-sample/src/main/java/com/ard/sample/manage/service/impl/DeviceServiceImpl.java


@@ -1,6 +1,8 @@


package com.ard.sample.manage.service.impl;




import com.alibaba.fastjson2.JSONObject;


import com.ard.common.core.domain.model.LoginUser;


import com.ard.common.utils.SecurityUtils;


import com.ard.device.camera.domain.ArdCamera;


import com.ard.device.camera.service.IArdCameraService;


import com.ard.device.channel.domain.ArdChannel;


@@ -369,6 +371,7 @@


    //region 单独写一个方法做权限验证，由于有好多定时任务也在实时获取设备列表，原方法不适用再添加权限注解


    @Override


    public List<DeviceDTO> getDockList(String nickname) {


        LoginUser loginUser = SecurityUtils.getLoginUser();


        List<DeviceDTO> devicesList = this.getDockListByParams(


                DeviceQueryParam.builder()


                        .domains(List.of(DeviceDomainEnum.GATEWAY.getVal(), DeviceDomainEnum.DOCK.getVal()))


@@ -376,8 +379,9 @@


                        .build());


        // 在獲取设备列表时，顺便获取直播地址


        for(DeviceDTO devices : devicesList){


            _liveStreamHandler.StartLiveStreaming(devices.getDeviceSn());


            _liveStreamHandler.StartLiveStreaming(devices.getChildDeviceSn());


            // 暂时注释掉机场设备视频直址 2026-04-01


//            _liveStreamHandler.StartLiveStreaming(devices.getDeviceSn(), loginUser.getUserId().toString());


//            _liveStreamHandler.StartLiveStreaming(devices.getChildDeviceSn(), loginUser.getUserId().toString());


            ArdCamera ardCamera = new ArdCamera();


            ardCamera.setDockId(devices.getId());


            List<ArdCamera> ardCameraList = _cameraService.selectArdCameraList(ardCamera);


@@ -1209,8 +1213,9 @@


        DeviceDTO deviceDTO = (DeviceDTO) RedisOpsUtils.get(RedisConst.DEVICE_ONLINE_PREFIX + dockSn);


        boolean deviceOnline = this.checkDeviceOnline(deviceDTO.getChildDeviceSn());


        if (!deviceOnline) {


            return ResponseResult.error(CommonErrorEnum.DEVICE_OFFLINE.getErrorCode(),"无人机" + CommonErrorEnum.DEVICE_OFFLINE.getErrorMsg());


            return ResponseResult.error(2222,"无人机" + CommonErrorEnum.DEVICE_OFFLINE.getErrorMsg());


            //throw new RuntimeException("Device is offline.");


            // CommonErrorEnum.DEVICE_OFFLINE.getErrorCode()


        }




        // Make sure the data is valid.


@@ -1512,7 +1517,7 @@


            CommonTopicReceiver<Map<String,Integer>> stateReceiver = new CommonTopicReceiver<>();


            stateReceiver.setTid(UUID.randomUUID().toString());


            stateReceiver.setBid(UUID.randomUUID().toString());


            stateReceiver.setType(MessageType.LIVESTREAM.getType());


            stateReceiver.setType(MessageType.LIVESTATUS.getType());


            stateReceiver.setGateway(sn);


            stateReceiver.setTimestamp(System.currentTimeMillis());


            Map<String,Integer> live_status = new HashMap<>();