From ecb9599b25fde0e3569b46e667ca1990294f8665 Mon Sep 17 00:00:00 2001
From: liusuyi <1951119284@qq.com>
Date: Tue, 16 Dec 2025 10:26:21 +0800
Subject: [PATCH] 修复【在线用户强制退出正在使用的账号】bug
---
ard-work/src/main/java/com/ard/work/service/impl/TyServiceImpl.java | 19 ++++++++++---------
1 files changed, 10 insertions(+), 9 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 76ea6c5..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
@@ -29,6 +29,7 @@
import com.ard.work.domain.cache.UavSignalInfoCache;
import com.ard.work.domain.cache.UavStateCache;
import com.ard.work.domain.cache.UavTelemetryDataCache;
+import com.ard.work.domain.cache.UavWaylineCache;
import com.ard.work.domain.dto.BoxHistoryDTO;
import com.ard.work.domain.dto.BoxPhotosDTO;
import com.ard.work.domain.dto.BoxSettingsDTO;
@@ -123,8 +124,8 @@
if (ardDroneInfo == null) {
throw new ControlException("未找到对应的飞行器信息,boxSn:{}" + boxSn);
}
-
-
+
+
TyHttpCommonReceiver<BoxStreamUrlReceiver> boxLiveUrl = tyClient.getBoxLiveUrl(ardDroneInfo.getServerId(),
boxSn);
return boxLiveUrl == null ? null : boxLiveUrl.getContent();
@@ -175,7 +176,7 @@
throw new ControlException("未找到对应的飞行器信息,boxSn:{}" + boxSn);
}
TyHttpCommonReceiver<?> result = tyClient.updateBoxSettings(ardDroneInfo.getServerId(), boxSettingsDTO);
- return result.getState() == 1;
+ return result.getState() == 0;
}
/**
@@ -554,7 +555,7 @@
* 方向控制
*/
@CheckControlRight(UavControlType.FLY)
- @CheckTakeoffAltitude(minAltitude = 30.0)
+ @CheckTakeoffAltitude
@Override
public Boolean flyControl(FlyControlDTO flyControlDTO) {
String boxSn = flyControlDTO.getBoxSn();
@@ -571,7 +572,7 @@
* 指点飞行控制
*/
@CheckControlRight(UavControlType.FLY)
- @CheckTakeoffAltitude(minAltitude = 30.0)
+ @CheckTakeoffAltitude
@CheckNoFlyZone
@Override
public Boolean flyPointControl(FlyPointControlDTO flyPointControlDTO) {
@@ -596,8 +597,8 @@
if (ardDroneInfo == null) {
throw new ControlException("未找到对应的飞行器信息,boxSn:{}" + boxSn);
}
-
-
+
+
FlyPointControlCancelCmd flyPointControlCancelCmd = new FlyPointControlCancelCmd(flyPointControlCancelDTO);
this.sendMessage(ardDroneInfo.getServerId(), flyPointControlCancelCmd);
return true;
@@ -645,8 +646,8 @@
if (ardDroneInfo == null) {
throw new ControlException("未找到对应的飞行器信息,boxSn:{}" + boxSn);
}
-
-
+
+
EmergencyBrakeCmd emergencyBrakeCmd = new EmergencyBrakeCmd(emeragencyBrakeDTO);
this.sendMessage(ardDroneInfo.getServerId(), emergencyBrakeCmd);
return true;
--
Gitblit v1.9.3