From 296dedfcdcc4d769dbad703e4d80bda6b948f3f2 Mon Sep 17 00:00:00 2001
From: liusuyi <1951119284@qq.com>
Date: Fri, 12 Dec 2025 10:39:11 +0800
Subject: [PATCH] 优化
---
ard-work/src/main/java/com/ard/work/service/impl/TyServiceImpl.java | 11 +++--------
1 files changed, 3 insertions(+), 8 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..84dfaab 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;
}
/**
@@ -555,7 +555,7 @@
* 方向控制
*/
@CheckControlRight(UavControlType.FLY)
- @CheckTakeoffAltitude(minAltitude = 30.0)
+ @CheckTakeoffAltitude
@Override
public Boolean flyControl(FlyControlDTO flyControlDTO) {
String boxSn = flyControlDTO.getBoxSn();
@@ -572,7 +572,7 @@
* 指点飞行控制
*/
@CheckControlRight(UavControlType.FLY)
- @CheckTakeoffAltitude(minAltitude = 30.0)
+ @CheckTakeoffAltitude
@CheckNoFlyZone
@Override
public Boolean flyPointControl(FlyPointControlDTO flyPointControlDTO) {
@@ -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