From 9a5df3658cc50dee0ac7d6873ae2744da5141311 Mon Sep 17 00:00:00 2001 From: mmc <1556375442@qq.com> Date: Mon, 1 Jun 2026 15:44:02 +0800 Subject: [PATCH] =?UTF-8?q?=E4=B8=89=E4=B8=AA=E9=A1=B5=E9=9D=A2=E6=97=A0?= =?UTF-8?q?=E4=BA=BA=E6=9C=BAmqtt=E6=98=BE=E7=A4=BA=E6=88=90=E5=8A=9F?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/components/devices/DeviceOverviewPage.tsx | 40 +++++++- src/components/devices/DeviceStatusPage.tsx | 91 +++++++++++++++---- src/components/devices/DroneVideoPlayer.tsx | 1 - src/components/devices/WayLinePage.tsx | 47 ++++++++-- src/pages/Devices.tsx | 12 ++- 5 files changed, 158 insertions(+), 33 deletions(-) diff --git a/src/components/devices/DeviceOverviewPage.tsx b/src/components/devices/DeviceOverviewPage.tsx index 4d4a1d2..b38183a 100644 --- a/src/components/devices/DeviceOverviewPage.tsx +++ b/src/components/devices/DeviceOverviewPage.tsx @@ -45,11 +45,40 @@ const logs = [ { time: '10:05:22', device: 'RBT-01', type: '事件', desc: '电量较低,建议回充', level: '低电量' }, ]; -export default function DeviceOverviewPage({ devices, planedevices, devicesAll, onViewStatus, selectedSn, onDeviceSelect }) { +export default function DeviceOverviewPage({ devices, planedevices, devicesAll, onViewStatus, selectedSn, onDeviceSelect, mqttDroneData }) { const [zoomedVideo, setZoomedVideo] = useState(null); const [mowerView, setMowerView] = useState('front'); const [videoSource, setVideoSource] = useState('drone'); // 恢复 videoSource 状态管理 const [uavState, setUavState] = useState(null); + const [persistentDroneData, setPersistentDroneData] = useState(null); // 持久化无人机数据 + + // 当MQTT数据更新时,更新持久化数据(只在有新数据时更新) + useEffect(() => { + if (mqttDroneData && mqttDroneData.host) { + const { host } = mqttDroneData; + setPersistentDroneData({ + // 无人机状态数据映射 + capacity_percent: host.drone_charge_state?.capacity_percent, + environment_temperature: host.environment_temperature, + height: host.height, + wind_speed: host.wind_speed, + rainfall: host.rainfall === 0 ? 'no_rain' : 'rain', + position_state: host.position_state, + longitude: host.longitude, + latitude: host.latitude, + heading: host.heading, + humidity: host.humidity, + drone_in_dock: host.drone_in_dock, + cover_state: host.cover_state, + temperature: host.temperature, + }); + } + }, [mqttDroneData]); + + // 优先使用持久化数据,然后是API数据 + const currentDroneData = React.useMemo(() => { + return persistentDroneData; // 总是返回持久化数据(不会变回null) + }, [persistentDroneData]); const selectedDevice = React.useMemo(() => { const sn = selectedSn || (devicesAll?.[0]?.device_sn || devicesAll?.[0]?.serialNumber); @@ -111,14 +140,15 @@ export default function DeviceOverviewPage({ devices, planedevices, devicesAll, if (onDeviceSelect) onDeviceSelect(id); }; - // 用于视频、状态展示的实时设备数据(只合并一次) + // 用于视频、状态展示的实时设备数据(优先使用持久化MQTT数据) const realtimeDevice = useMemo(() => { if (!selectedDevice) return null; return { ...selectedDevice, - ...uavState, // 无人机实时状态覆盖 + ...uavState, + ...currentDroneData, // 持久化数据最后覆盖,确保优先显示 }; - }, [selectedDevice, uavState]); + }, [selectedDevice, uavState, currentDroneData]); useEffect(() => { @@ -140,7 +170,7 @@ export default function DeviceOverviewPage({ devices, planedevices, devicesAll, } }; - fetchUavState(); + fetchUavState(); }, [isUAV, selectedDevice]); diff --git a/src/components/devices/DeviceStatusPage.tsx b/src/components/devices/DeviceStatusPage.tsx index 5b48c83..dcfab91 100644 --- a/src/components/devices/DeviceStatusPage.tsx +++ b/src/components/devices/DeviceStatusPage.tsx @@ -58,8 +58,40 @@ export default function DeviceStatusPage({ devicesAll, serialNumber, onDeviceChange, + mqttDroneData, }) { const { userInfo } = useSelector((state: RootState) => state.user); + const [persistentDroneData, setPersistentDroneData] = useState(null); // 持久化无人机数据 + + // 当MQTT数据更新时,更新持久化数据(只在有新数据时更新) + useEffect(() => { + if (mqttDroneData && mqttDroneData.host) { + const { host } = mqttDroneData; + setPersistentDroneData({ + // 无人机状态数据映射 + capacity_percent: host.drone_charge_state?.capacity_percent, + environment_temperature: host.environment_temperature, + height: host.height, + wind_speed: host.wind_speed, + rainfall: host.rainfall === 0 ? 'no_rain' : 'rain', + position_state: host.position_state, + longitude: host.longitude, + latitude: host.latitude, + heading: host.heading, + humidity: host.humidity, + drone_in_dock: host.drone_in_dock, + cover_state: host.cover_state, + temperature: host.temperature, + home_distance: host.home_distance, + air_conditioner_state: host.air_conditioner_state, + }); + } + }, [mqttDroneData]); + + // 优先使用持久化数据,保持显示稳定 + const currentDroneData = React.useMemo(() => { + return persistentDroneData; + }, [persistentDroneData]); const [messageApi, contextHolder] = message.useMessage(); @@ -174,7 +206,7 @@ export default function DeviceStatusPage({ } }; - fetchUavState(); + fetchUavState(); }, [isUAV, device]); // 获取执行中任务的轨迹 @@ -230,9 +262,9 @@ export default function DeviceStatusPage({ const mapDevices = useMemo(() => { if (!device) return null; - // 优先使用无人机实时数据 - const lng = uavState?.longitude ?? runningStatus.longitude ?? device.longitude; - const lat = uavState?.latitude ?? runningStatus.latitude ?? device.latitude; + // 优先使用持久化MQTT数据,其次使用uavState + const lng = currentDroneData?.longitude ?? uavState?.longitude ?? runningStatus.longitude ?? device.longitude; + const lat = currentDroneData?.latitude ?? uavState?.latitude ?? runningStatus.latitude ?? device.latitude; return { ...device, @@ -251,14 +283,15 @@ export default function DeviceStatusPage({ ? 'mower' : 'robot', }; - }, [device, isUAV, runningStatus, uavState]); + }, [device, isUAV, runningStatus, uavState, currentDroneData]); const realtimeDevice = useMemo(() => { if (!device) return null; return { ...device, - ...uavState, // 无人机实时状态覆盖 + ...uavState, + ...currentDroneData, // 持久化数据最后覆盖,确保优先显示 }; - }, [device, uavState]); + }, [device, uavState, currentDroneData]); const handleGamepadUpdate = useCallback((state) => { controllerRef.current?.sendGamepad(state); @@ -506,26 +539,50 @@ export default function DeviceStatusPage({ {isUAV ? ( 电池电量}> - + 飞行高度}> - {fix2((uavState || device).height)} m + {fix2((currentDroneData || uavState || device).height)} m + + {fix2((currentDroneData || uavState || device).wind_speed)} m/s + {fix2((currentDroneData || uavState || device).environment_temperature)} ℃ + + {(currentDroneData?.humidity) || '-'}{currentDroneData?.humidity ? '%' : ''} + + + {fix2(currentDroneData?.temperature)} ℃ - {fix2((uavState || device).wind_speed)} m/s - {fix2((uavState || device).environment_temperature)} ℃ - {getVal((uavState || device).rainfall)} + {getVal((currentDroneData || uavState || device).rainfall)} + + {fix2((currentDroneData || uavState || device).home_distance)} m + + {fix2(currentDroneData?.heading)}° + + + + {currentDroneData?.drone_in_dock === 1 ? '在库' : '外出'} + + + + + {currentDroneData?.cover_state === 1 ? '舱门打开' : '舱门关闭'} + + + + + {currentDroneData?.air_conditioner_state === 1 ? '开启' : '关闭'} + - {fix2((uavState || device).home_distance)} m - + - + - - {(uavState || device).position_state?.is_fixed === 'fixing_successful' ? 'RTK 已固定' : '未固定'} + + {(currentDroneData || uavState || device).position_state?.is_fixed === 'fixing_successful' ? 'RTK 已固定' : '未固定'} diff --git a/src/components/devices/DroneVideoPlayer.tsx b/src/components/devices/DroneVideoPlayer.tsx index 468153f..416c4c5 100644 --- a/src/components/devices/DroneVideoPlayer.tsx +++ b/src/components/devices/DroneVideoPlayer.tsx @@ -91,7 +91,6 @@ const DroneVideoPlayer: React.FC = ({ const cameraIndex = targetCamera?.camera_index || ""; if (!cameraIndex) { - utils.message.warning('未找到无人机相机配置'); return; } diff --git a/src/components/devices/WayLinePage.tsx b/src/components/devices/WayLinePage.tsx index 5c10a26..d43df3c 100644 --- a/src/components/devices/WayLinePage.tsx +++ b/src/components/devices/WayLinePage.tsx @@ -29,7 +29,7 @@ import { fix2, getVal } from '@/lib/utils'; const { Text, Title } = Typography; const { RangePicker } = DatePicker; -export default function WayLinePage({ planedevices, onRefresh }) { +export default function WayLinePage({ planedevices, onRefresh, mqttDroneData }) { const fontSmall = 'clamp(10px, 0.7vw, 11px)'; const fontNormal = 'clamp(12px, 0.75vw, 13px)'; const fontTitle = 'clamp(14px, 0.85vw, 16px)'; @@ -42,9 +42,38 @@ export default function WayLinePage({ planedevices, onRefresh }) { const [listDroneRealtime, setListDroneRealtime] = useState(null); const [listDateRange, setListDateRange] = useState(null); const [taskList, setTaskList] = useState([]); + const [persistentDroneData, setPersistentDroneData] = useState(null); // 持久化无人机数据 const listDroneTimerRef = useRef(null); + // 当MQTT数据更新时,更新持久化数据(只在有新数据时更新) + useEffect(() => { + if (mqttDroneData && mqttDroneData.host) { + const { host } = mqttDroneData; + setPersistentDroneData({ + // 无人机状态数据映射 + capacity_percent: host.drone_charge_state?.capacity_percent, + environment_temperature: host.environment_temperature, + height: host.height, + wind_speed: host.wind_speed, + rainfall: host.rainfall === 0 ? 'no_rain' : 'rain', + position_state: host.position_state, + longitude: host.longitude, + latitude: host.latitude, + heading: host.heading, + humidity: host.humidity, + drone_in_dock: host.drone_in_dock, + cover_state: host.cover_state, + temperature: host.temperature, + }); + } + }, [mqttDroneData]); + + // 优先使用持久化数据,保持显示稳定 + const mqttDerivedData = React.useMemo(() => { + return persistentDroneData; + }, [persistentDroneData]); + // 定时获取任务列表所选无人机的实时状态 useEffect(() => { const fetchRealtime = async () => { @@ -940,7 +969,7 @@ export default function WayLinePage({ planedevices, onRefresh }) {
风速
-
{fix2((listDroneRealtime || listDrone)?.wind_speed)} m/s
+
{fix2((mqttDerivedData || listDroneRealtime || listDrone)?.wind_speed)} m/s
适宜
@@ -951,7 +980,7 @@ export default function WayLinePage({ planedevices, onRefresh }) {
温度
-
{fix2((listDroneRealtime || listDrone)?.environment_temperature)}℃
+
{fix2((mqttDerivedData || listDroneRealtime || listDrone)?.environment_temperature)}℃
适宜
@@ -962,9 +991,9 @@ export default function WayLinePage({ planedevices, onRefresh }) {
降水状态
-
{getVal((listDroneRealtime || listDrone)?.rainfall)}
-
- {(listDroneRealtime || listDrone)?.rainfall === 'no_rain' ? '低风险' : '有雨'} +
{getVal((mqttDerivedData || listDroneRealtime || listDrone)?.rainfall)}
+
+ {(mqttDerivedData || listDroneRealtime || listDrone)?.rainfall === 'no_rain' ? '低风险' : '有雨'}
@@ -976,10 +1005,10 @@ export default function WayLinePage({ planedevices, onRefresh }) {
GNSS质量
- {(listDroneRealtime || listDrone)?.position_state?.rtk_number ?? 0} RTK + {(mqttDerivedData || listDroneRealtime || listDrone)?.position_state?.rtk_number ?? 0} RTK
-
- {(listDroneRealtime || listDrone)?.position_state?.is_fixed === 'fixing_successful' ? '已固定' : '未固定'} +
+ {(mqttDerivedData || listDroneRealtime || listDrone)?.position_state?.is_fixed === 'fixing_successful' ? '已固定' : '未固定'}
diff --git a/src/pages/Devices.tsx b/src/pages/Devices.tsx index a4c45aa..dc60184 100644 --- a/src/pages/Devices.tsx +++ b/src/pages/Devices.tsx @@ -23,6 +23,8 @@ export default function DeviceIndexPage() { const [devices, setDevices] = useState([]); const [planedevices, setPlaneDevices] = useState([]); const [devicesAll, setDevicesAll] = useState([]); + // MQTT实时数据状态 + const [mqttDroneData, setMqttDroneData] = useState(null); const tabs = [ { key: 'overview', label: '装备总览', icon: }, @@ -39,7 +41,13 @@ export default function DeviceIndexPage() { try { const parsedMessage = JSON.parse(message); console.log('解析后的消息对象:', parsedMessage); + // 更新MQTT无人机数据 + if (parsedMessage.data) { + if (parsedMessage.data?.host?.humidity) { + setMqttDroneData(parsedMessage.data); + } + } } catch (error) { console.error('解析消息失败:', error); } @@ -114,6 +122,7 @@ export default function DeviceIndexPage() { onViewStatus={handleViewStatus} selectedSn={selectedSn} onDeviceSelect={(sn) => setSelectedSn(sn)} + mqttDroneData={mqttDroneData} />; } if (activeTab === 'status') { @@ -121,9 +130,10 @@ export default function DeviceIndexPage() { devicesAll={devicesAll} serialNumber={selectedSn} onDeviceChange={(sn) => setSelectedSn(sn)} + mqttDroneData={mqttDroneData} />; } - if (activeTab === 'wayLineTask') return ; + if (activeTab === 'wayLineTask') return ; if (activeTab === 'robotTask') return ; return null; };