From bf2639e4821122e0bf2d8b25b1de74e75bb6cff5 Mon Sep 17 00:00:00 2001
From: zhaowenyu <35589726@qq.com>
Date: Mon, 09 Mar 2026 14:30:01 +0800
Subject: [PATCH] 2026-03-09 标记功能接口调整： 1、目录表增加is_delete字段，用于标记目录是否可以删除；只要true/false； 2、目录数据库中增加“默认文件夹”数据，不可被删除；在删除目录中判断固定id为default_directory_00000001的数据不可删除。
---
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