forked from uav/ard-uav-server
blame | history | patch | commit | commitdiff | ignore whitespace
zhaowenyu
2025-10-18 33a5fcfa483875836230eae3d4d62a9397e5f649 
 ard-sample/src/main/java/com/ard/sample/manage/service/impl/DeviceServiceImpl.java


@@ -256,6 +256,12 @@


                > 0;


    }




    /**


     * 发布状态回复消息


     *


     * @param sn 序列号


     * @param response 通用主题响应对象


     */


    @Override


    public void publishStatusReply(String sn, CommonTopicResponse<Object> response) {


        Map<String, Integer> result = new ConcurrentHashMap<>(1);


@@ -417,6 +423,12 @@


        this.pushDeviceUpdateTopo(allSessions, sn);


    }




    /**


     * 处理来自MQTT消息的OSD消息


     *


     * @param message 接收到的MQTT消息


     * @throws IOException 如果处理消息时出现IO异常


     */


    @Override


    @ServiceActivator(inputChannel = ChannelName.INBOUND_OSD)


    public void handleOSD(Message<?> message) {


@@ -559,6 +571,7 @@




    /**


     * Convert the received drone device object into a database entity object.


     * 将接收到的无人机设备对象转换为数据库实体对象。


     *


     * @param device


     * @return


@@ -600,6 +613,7 @@


            return null;


        }


        DeviceDTO.DeviceDTOBuilder deviceDTOBuilder = DeviceDTO.builder()


                .id(entity.getId())


                .deviceSn(entity.getDeviceSn())


                .childDeviceSn(entity.getChildSn())


                .deviceName(entity.getDeviceName())


@@ -622,6 +636,7 @@


                .nickname(entity.getNickname())


                .firmwareVersion(entity.getFirmwareVersion())


                .deptId(entity.getDeptId())


                .workType(entity.getWorkType())


                .workspaceName(entity.getDeptId() != null


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


                        .map(SysDept::getDeptName)


@@ -657,6 +672,19 @@


    public Boolean updateDevice(DeviceDTO deviceDTO) {


        int update = mapper.update(this.deviceDTO2Entity(deviceDTO),


                new LambdaUpdateWrapper<DeviceEntity>().eq(DeviceEntity::getDeviceSn, deviceDTO.getDeviceSn()));


        return update > 0;


    }




    @Override


    public Boolean updateWorkType(String sn, Long workType) {


        // 方式1：使用LambdaUpdateWrapper（推荐，类型安全，避免字段名硬编码）


        LambdaUpdateWrapper<DeviceEntity> lambdaUpdateWrapper = new LambdaUpdateWrapper<>();


        // 设置更新条件：deviceSn = sn


        lambdaUpdateWrapper.eq(DeviceEntity::getDeviceSn, sn)


                // 只更新workType字段


                .set(DeviceEntity::getWorkType, workType);


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


        int update = mapper.update(null, lambdaUpdateWrapper);


        return update > 0;


    }




@@ -780,14 +808,24 @@




    }




    /**


     * 根据域名分页获取已绑定的设备信息


     *


     * @param page      当前页码


     * @param pageSize  每页显示数量


     * @param domain    域名


     * @return PaginationData<DeviceDTO> 包含分页信息的设备DTO列表


     */


    @Override


    public PaginationData<DeviceDTO> getBoundDevicesWithDomain(Long page,


                                                               Long pageSize, Integer domain) {


                                                               Long pageSize, Integer domain, Long deptId) {




        Page<DeviceEntity> pagination = mapper.selectPage(new Page<>(page, pageSize),


                new LambdaQueryWrapper<DeviceEntity>()


                        .eq(DeviceEntity::getDomain, domain)


                        .eq(DeviceEntity::getBoundStatus, true));


                        .eq(deptId != null, DeviceEntity::getDeptId, deptId)


                        .isNotNull(DeviceEntity::getDeptId));


//                        .eq(DeviceEntity::getBoundStatus, true));


        List<DeviceDTO> devicesList = pagination.getRecords().stream().map(this::deviceEntityConvertToDTO)


                .peek(device -> {


                    device.setStatus(RedisOpsUtils.checkExist(RedisConst.DEVICE_ONLINE_PREFIX + device.getDeviceSn()));


@@ -813,6 +851,7 @@


        DeviceDTO device = DeviceDTO.builder()


                .deviceSn(deviceSn)


                .boundStatus(false)


                .deptId(null)


                .build();


        this.updateDevice(device);


    }


@@ -987,6 +1026,7 @@


                .childSn(dto.getChildDeviceSn())


                .domain(dto.getDomain())


                .firmwareVersion(dto.getFirmwareVersion())


                .workType(dto.getWorkType())


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


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


                .build();


@@ -1090,6 +1130,12 @@


    }






    /**


     * 处理获取机场组织信息的请求


     *


     * @param receiver 接收到的消息


     * @param headers 消息头


     */


    @ServiceActivator(inputChannel = ChannelName.INBOUND_REQUESTS_AIRPORT_ORGANIZATION_GET, outputChannel =


            ChannelName.OUTBOUND)


    public void replyOrganizationGet(CommonTopicReceiver receiver, MessageHeaders headers) {