forked from uav/ard-uav-server
blame | history | patch | commit | commitdiff | ignore whitespace
zhaowenyu
2025-11-29 2e5e7a94ada4509fa286d8438b6b127aaa906570 
 ard-sample/src/main/java/com/ard/sample/manage/service/impl/DeviceServiceImpl.java


@@ -1,10 +1,8 @@


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




import com.alibaba.fastjson2.JSONObject;


import com.ard.common.annotation.DataScope;


import com.ard.common.annotation.DataScopePlus;


import com.ard.sample.component.websocket.handler.LiveStreamHandler;


import com.ard.system.authorize.service.AuthorizeService;


import com.baomidou.mybatisplus.core.conditions.Wrapper;


import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;


import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;


import com.baomidou.mybatisplus.core.conditions.update.LambdaUpdateWrapper;


@@ -36,7 +34,6 @@


import com.fasterxml.jackson.core.type.TypeReference;


import com.fasterxml.jackson.databind.JsonNode;


import com.fasterxml.jackson.databind.ObjectMapper;


import com.fasterxml.jackson.databind.node.ObjectNode;


import lombok.extern.slf4j.Slf4j;


import org.springframework.beans.factory.annotation.Autowired;


import org.springframework.beans.factory.annotation.Qualifier;


@@ -69,6 +66,9 @@


@Slf4j


@Transactional


public class DeviceServiceImpl implements IDeviceService {




    @Autowired


    private LiveStreamHandler _liveStreamHandler;




    @Autowired


    private IMessageSenderService messageSender;


@@ -359,6 +359,11 @@


                DeviceQueryParam.builder()


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


                        .build());


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


        for(DeviceDTO devices : devicesList){


            _liveStreamHandler.StartLiveStreaming(devices.getDeviceSn());


            _liveStreamHandler.StartLiveStreaming(devices.getChildDeviceSn());


        }




        devicesList.stream()


                .filter(gateway -> DeviceDomainEnum.DOCK.getVal() == gateway.getDomain() ||


@@ -503,10 +508,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));




@@ -544,7 +549,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();


        }


    }


@@ -616,6 +626,7 @@


            // 验证授权数量


            validateAuthorization(devicesList.size(), 1);


        } catch (Exception e) {


            log.error("保存设备时验证授权异常，请联系管理员！错误信息：" + e.getMessage());


            return Optional.empty();


        }


        // 调用验证方法


@@ -751,6 +762,7 @@


                .firmwareVersion(entity.getFirmwareVersion())


                .deptId(entity.getDeptId())


                .workType(entity.getWorkType())


                .webrtcUrl(entity.getWebrtcUrl())


                .workspaceName(entity.getDeptId() != null


                        ? Optional.ofNullable(sysDeptService.selectDeptById(entity.getDeptId()))


                        .map(SysDept::getDeptName)


@@ -798,6 +810,15 @@


                // 只更新workType字段


                .set(DeviceEntity::getWorkType, workType);


        // 执行更新（第一个参数传null，因为更新字段已通过wrapper的set指定）


        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;


    }


@@ -877,6 +898,9 @@


        BindDeviceReceiver dock = null;


        BindDeviceReceiver drone = null;


        for (BindDeviceReceiver device : devices) {


            if(device.getDeviceModelKey().isEmpty()){


                continue;


            }


            int val = Integer.parseInt(device.getDeviceModelKey().split("-")[0]);


            if (val == DeviceDomainEnum.DOCK.getVal()) {


                dock = device;


@@ -1188,6 +1212,7 @@


                .domain(dto.getDomain())


                .firmwareVersion(dto.getFirmwareVersion())


                .workType(dto.getWorkType())


                .webrtcUrl(dto.getWebrtcUrl())


                .compatibleStatus(dto.getFirmwareStatus() == null ? null :


                        DeviceFirmwareStatusEnum.CONSISTENT_UPGRADE != DeviceFirmwareStatusEnum.find(dto.getFirmwareStatus()))


                .build();


@@ -1247,7 +1272,7 @@


                .sn(device.getDeviceSn())


                .deviceCallsign(device.getNickname())


                .isDeviceBindOrganization(device.getBoundStatus())


                .organizationId(device.getDeptId().toString())


                .organizationId(String.valueOf(device.getDeptId()))


                .organizationName(device.getWorkspaceName())


                .build();


    }