From 3c8d6b8e60f02b9a40fc5acd4dc6c34a6b594eb6 Mon Sep 17 00:00:00 2001
From: liusuyi <1951119284@qq.com>
Date: Mon, 19 Jan 2026 11:23:32 +0800
Subject: [PATCH] 增加用户优先级和所属平台 调整无人机控制逻辑增加优先级判断
---
ard-admin/src/main/java/com/ard/web/controller/route/RouteController.java | 8 ++++----
1 files changed, 4 insertions(+), 4 deletions(-)
diff --git a/ard-admin/src/main/java/com/ard/web/controller/route/RouteController.java b/ard-admin/src/main/java/com/ard/web/controller/route/RouteController.java
index 82d7a8a..f0a50cf 100644
--- a/ard-admin/src/main/java/com/ard/web/controller/route/RouteController.java
+++ b/ard-admin/src/main/java/com/ard/web/controller/route/RouteController.java
@@ -49,8 +49,8 @@
*/
@ApiOperation("获取设备当前航线状态")
@GetMapping("/{boxSn}/state")
- public RouteState getRouteState(@PathVariable String boxSn) {
- return stateMachineService.getCurrentState(boxSn);
+ public AjaxResult getRouteState(@PathVariable String boxSn) {
+ return AjaxResult.success(stateMachineService.getCurrentState(boxSn));
}
/**
@@ -58,8 +58,8 @@
*/
@ApiOperation("重置设备航线状态")
@PostMapping("/{boxSn}/reset")
- public String resetRouteState(@PathVariable String boxSn) {
+ public AjaxResult resetRouteState(@PathVariable String boxSn) {
stateMachineService.resetStateMachine(boxSn);
- return "设备" + boxSn + "航线状态已重置为：" + RouteState.IDLE;
+ return AjaxResult.success( "设备" + boxSn + "航线状态已重置为：" + RouteState.IDLE);
}
}
\ No newline at end of file
--
Gitblit v1.9.3