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

zhaowenyu

2025-10-20 fc365c426e431a73d116e5d51deaec667f4864de

 ard-work/src/main/java/com/ard/work/service/impl/TyServiceImpl.java

@@ -103,7 +103,7 @@
    @Override
    public List<BoxInfoReceiver> getBoxList(String serverId) {
        TyHttpCommonReceiver<List<BoxInfoReceiver>> boxList = tyClient.getBoxList(serverId);
        return boxList.getContent();
        return boxList == null ? null : boxList.getContent();
    }

    /**
@@ -133,7 +133,7 @@
        ArdDroneInfo ardDroneInfo = ardDroneService.selectArdDroneByboxSn(boxHistoryDTO.getBoxSn());
        TyHttpCommonReceiver<List<BoxHistoryReceiver>> boxHistory = tyClient.getBoxHistory(ardDroneInfo.getServerId(),
                boxHistoryDTO);
        return boxHistory.getContent();
        return boxHistory == null ? null : boxHistory.getContent();
    }

    /**
@@ -146,7 +146,7 @@
        ArdDroneInfo ardDroneInfo = ardDroneService.selectArdDroneByboxSn(boxPhotosDTO.getBoxSn());
        TyHttpCommonReceiver<List<BoxPhotosReceiver>> boxPhotos = tyClient.getBoxPhotos(ardDroneInfo.getServerId(),
                boxPhotosDTO);
        return boxPhotos.getContent();
        return boxPhotos == null ? null : boxPhotos.getContent();
    }

    /**
@@ -481,7 +481,7 @@
     */
    @Override
    public UavState getUavState(String boxSn) {
        return UavStateCache.getUavState(boxSn);
        return UavStateCache.get(boxSn);
    }

    /**
@@ -489,7 +489,7 @@
     */
    @Override
    public TelemetryData getUavTelemetryData(String boxSn) {
        return UavTelemetryDataCache.getUavTelemetryData(boxSn);
        return UavTelemetryDataCache.get(boxSn);
    }

    /**
@@ -497,7 +497,7 @@
     */
    @Override
    public SignalInfo getSignalInfo(String boxSn) {
        return UavSignalInfoCache.getUavSignalInfo(boxSn);
        return UavSignalInfoCache.get(boxSn);
    }

    /**
@@ -700,14 +700,14 @@
            case (byte) 0xA8:
                // 处理无人机状态消息
                UavStateCmd uavStateCmd = (UavStateCmd) tyCommand;
                UavStateCache.putUavState(uavStateCmd.getUavState());
                UavStateCache.put(uavStateCmd.getUavState());
                //logPrint("无人机状态", uavStateCmd.getUavState().getBoxSn());
                // WebSocketUtil.sendMessageAll(uavStateCmd.getUavState());
                break;
            case (byte) 0xA9:
                // 处理无人机遥测消息
                UavTelemetryDataCmd uavTelemetryDataCmd = (UavTelemetryDataCmd) tyCommand;
                UavTelemetryDataCache.putUavTelemetryData(uavTelemetryDataCmd.getTelemetryData());
                UavTelemetryDataCache.put(uavTelemetryDataCmd.getTelemetryData());
                //logPrint("无人机遥测", uavTelemetryDataCmd.getTelemetryData().getBoxSn());
                //WebSocketUtil.sendMessageAll(uavTelemetryDataCmd.getTelemetryData());
                break;
@@ -715,7 +715,7 @@
            case (byte) 0x0C:
                // 处理无人机信道质量数据
                SignalInfoCmd signalInfoCmd = (SignalInfoCmd) tyCommand;
                UavSignalInfoCache.putUavSignalInfoCache(signalInfoCmd.getSignalInfo());
                UavSignalInfoCache.put(signalInfoCmd.getSignalInfo());
                //logPrint("无人机信道质量", signalInfoCmd.getSignalInfo().getBoxSn());
                break;
            case (byte) 0xD1: