Merge remote-tracking branch 'origin/dev' into dev

zhaowenyu

2025-10-15 a9780c49f8cf587af26cc83d439320ad02b8668f

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

@@ -26,7 +26,7 @@
import com.ard.sample.manage.model.param.DeviceQueryParam;
import com.ard.sample.manage.model.receiver.*;
import com.ard.sample.manage.service.*;
import com.ard.system.service.ISysDeptService;
import com.ard.system.system.service.ISysDeptService;
import com.fasterxml.jackson.core.type.TypeReference;
import com.fasterxml.jackson.databind.JsonNode;
import com.fasterxml.jackson.databind.ObjectMapper;
@@ -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())
@@ -780,6 +794,14 @@

    }

    /**
     * 根据域名分页获取已绑定的设备信息
     *
     * @param page      当前页码
     * @param pageSize  每页显示数量
     * @param domain    域名
     * @return PaginationData<DeviceDTO> 包含分页信息的设备DTO列表
     */
    @Override
    public PaginationData<DeviceDTO> getBoundDevicesWithDomain(Long page,
                                                               Long pageSize, Integer domain) {
@@ -1090,6 +1112,12 @@
    }


    /**
     * 处理获取机场组织信息的请求
     *
     * @param receiver 接收到的消息
     * @param headers 消息头
     */
    @ServiceActivator(inputChannel = ChannelName.INBOUND_REQUESTS_AIRPORT_ORGANIZATION_GET, outputChannel =
            ChannelName.OUTBOUND)
    public void replyOrganizationGet(CommonTopicReceiver receiver, MessageHeaders headers) {