From 6f4bba5d1c3444af4a7975b6b7601584c373d65d Mon Sep 17 00:00:00 2001
From: zhaowenyu <35589726@qq.com>
Date: Sat, 06 Dec 2025 15:27:45 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/dev' into dev
---
ard-work/src/main/java/com/ard/work/service/impl/TyServiceImpl.java | 7 +------
1 files changed, 1 insertions(+), 6 deletions(-)
diff --git a/ard-work/src/main/java/com/ard/work/service/impl/TyServiceImpl.java b/ard-work/src/main/java/com/ard/work/service/impl/TyServiceImpl.java
index 3d40757..c9b84d4 100644
--- a/ard-work/src/main/java/com/ard/work/service/impl/TyServiceImpl.java
+++ b/ard-work/src/main/java/com/ard/work/service/impl/TyServiceImpl.java
@@ -176,7 +176,7 @@
throw new ControlException("未找到对应的飞行器信息,boxSn:{}" + boxSn);
}
TyHttpCommonReceiver<?> result = tyClient.updateBoxSettings(ardDroneInfo.getServerId(), boxSettingsDTO);
- return result.getState() == 1;
+ return result.getState() == 0;
}
/**
@@ -942,11 +942,6 @@
// 处理无人机状态消息
UavStateCmd uavStateCmd = (UavStateCmd) tyCommand;
UavStateCache.put(uavStateCmd.getUavState());
- int flightMode = uavStateCmd.getUavState().getFlightControllerState().getFlightMode();
- if (flightMode != 14) {
- //不在航线中 移除航线信息
- UavWaylineCache.remove(uavStateCmd.getUavState().getBoxSn());
- }
//logPrint("无人机状态", uavStateCmd.getUavState().getBoxSn());
// WebSocketUtil.sendMessageAll(uavStateCmd.getUavState());
break;
--
Gitblit v1.9.3