From 3d4d995d05c571b31282752f954f43628536a458 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E5=AD=99=E5=B0=8F=E4=BA=91?= Date: Tue, 24 Mar 2026 08:32:44 +0800 Subject: [PATCH] =?UTF-8?q?=E6=B7=BB=E5=8A=A0=E6=97=A5=E5=BF=97?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../ruoyi/device/controller/AircraftFlyController.java | 10 ++++++---- .../ruoyi/device/service/impl/FlightEventCallback.java | 6 +++--- .../ruoyi/device/service/impl/FlightLogCallback.java | 3 ++- 3 files changed, 11 insertions(+), 8 deletions(-) diff --git a/src/main/java/com/ruoyi/device/controller/AircraftFlyController.java b/src/main/java/com/ruoyi/device/controller/AircraftFlyController.java index 0d7a1c9..964ddba 100644 --- a/src/main/java/com/ruoyi/device/controller/AircraftFlyController.java +++ b/src/main/java/com/ruoyi/device/controller/AircraftFlyController.java @@ -275,17 +275,19 @@ public class AircraftFlyController extends BaseController CommandResult result = future.get(); if (result.isSuccess()) { - log.info("无人机起飞命令发送成功: sn={}", request.getSn()); - flightService.updateFlightStatus(request.getTaskId(), TaskResultVO.Checking()); + log.info("无人机起飞命令发送成功 executeCommand: sn={}", request.getSn()); + flightService.updateFlightStatus(request.getTaskId(), TaskResultVO.Checking("无人机起飞命令发送成功")); return R.ok("无人机起飞命令发送成功"); } else { log.error("无人机起飞失败 无人机起飞命令发送失败: sn={}, reason={}", request.getSn(), result.getErrorMessage()); - flightService.updateFlightStatus(request.getTaskId(), TaskResultVO.Error("人机起飞命令发送失败")); + flightService.updateFlightStatus(request.getTaskId(), + TaskResultVO.Error("人机起飞命令发送失败 executeCommand"+ result.getErrorMessage())); return R.fail("无人机起飞命令发送失败: " + result.getErrorMessage()); } } catch (Exception e) { log.error("无人机起飞失败 无人机起飞命令发送失败: sn={}", request.getSn(), e); - flightService.updateFlightStatus(request.getTaskId(), TaskResultVO.Error("人机起飞命令发送失败E")); + flightService.updateFlightStatus(request.getTaskId(), + TaskResultVO.Error("人机起飞命令发送失败 executeCommand E" + e.getMessage())); return R.fail("无人机起飞命令发送失败: " + e.getMessage()); } } diff --git a/src/main/java/com/ruoyi/device/service/impl/FlightEventCallback.java b/src/main/java/com/ruoyi/device/service/impl/FlightEventCallback.java index 071f3fd..d00dc24 100644 --- a/src/main/java/com/ruoyi/device/service/impl/FlightEventCallback.java +++ b/src/main/java/com/ruoyi/device/service/impl/FlightEventCallback.java @@ -126,12 +126,12 @@ public class FlightEventCallback implements IAirportFlyControlCallback, IAirport String dataContent = data.getString("data"); if ("操作成功".equals(msg) && "[地面站]任务飞行完成".equals(dataContent)) { log.info("【FlightEventCallback】检测到 [地面站]任务飞行完成 ，更新状态为HOME: deviceSn={}, flightId={}", deviceSn, taskId); - flightService.updateFlightStatus(taskId, TaskResultVO.Completed()); + flightService.updateFlightStatus(taskId, TaskResultVO.Completed("检测到 [地面站]任务飞行完成 ，更新状态为HOME")); } if ("[机巢]无人机关机成功".equals(dataContent)) { log.info("【FlightEventCallback】检测到 [机巢]无人机关机成功 ，更新状态为HOME: deviceSn={}, flightId={}", deviceSn, taskId); - flightService.updateFlightStatus(taskId, TaskResultVO.Completed()); + flightService.updateFlightStatus(taskId, TaskResultVO.Completed("[机巢]无人机关机成功 ，更新状态为HOME")); } @@ -144,7 +144,7 @@ public class FlightEventCallback implements IAirportFlyControlCallback, IAirport // 检查是否自检失败（code=1 表示失败） if (code != null && (code == 1 || code == -1)) { log.info("无人机起飞失败【FlightEventCallback】检测到自检失败(code=1)，更新状态为ERROR: deviceSn={}, flightId={} msg {}", deviceSn, taskId, msg); - flightService.updateFlightStatus(taskId, TaskResultVO.Error("检测到自检失败(code=1)")); + flightService.updateFlightStatus(taskId, TaskResultVO.Error("handleControlDataMessage 检测到自检失败(code=1)")); } } } diff --git a/src/main/java/com/ruoyi/device/service/impl/FlightLogCallback.java b/src/main/java/com/ruoyi/device/service/impl/FlightLogCallback.java index 90daef4..5c10f0b 100644 --- a/src/main/java/com/ruoyi/device/service/impl/FlightLogCallback.java +++ b/src/main/java/com/ruoyi/device/service/impl/FlightLogCallback.java @@ -106,7 +106,8 @@ public class FlightLogCallback implements IDroneRealTimeCallback { if(Boolean.FALSE.equals(result)){ log.info("无人机起飞失败: sn={}", deviceSn); - flightService.updateFlightStatus(taskId, TaskResultVO.Error("无人机起飞失败" + deviceSn)); + flightService.updateFlightStatus(taskId, TaskResultVO.Error("无人机起飞失败 " + + "handlePreCheckLog 自检失败" + deviceSn)); } logEntity.setLogContent(logContent);