From e5cfb7068f89f5ae5f643a00a0bb46a1670764d3 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E5=AD=99=E5=B0=8F=E4=BA=91?= Date: Mon, 23 Mar 2026 16:56:02 +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 --- .../com/ruoyi/device/controller/AircraftFlyController.java | 5 +++-- .../com/ruoyi/device/service/impl/FlightEventCallback.java | 2 +- .../com/ruoyi/device/service/impl/FlightLogCallback.java | 1 + 3 files changed, 5 insertions(+), 3 deletions(-) diff --git a/src/main/java/com/ruoyi/device/controller/AircraftFlyController.java b/src/main/java/com/ruoyi/device/controller/AircraftFlyController.java index fce281f..4e04523 100644 --- a/src/main/java/com/ruoyi/device/controller/AircraftFlyController.java +++ b/src/main/java/com/ruoyi/device/controller/AircraftFlyController.java @@ -202,6 +202,7 @@ public class AircraftFlyController extends BaseController @Parameter(description = "任务ID", required = true, example = "1") @PathVariable("taskId") Long taskId) { + // TODO: 实现获取实时信息逻辑 DroneRealtimeInfoVO vo = new DroneRealtimeInfoVO(); vo.setClimbSpeed(0); @@ -277,12 +278,12 @@ public class AircraftFlyController extends BaseController flightService.updateFlightStatus(request.getTaskId(), StatusEnum.CHECKING); return R.ok("无人机起飞命令发送成功"); } else { - log.error("无人机起飞命令发送失败: sn={}, reason={}", request.getSn(), result.getErrorMessage()); + log.error("无人机起飞失败 无人机起飞命令发送失败: sn={}, reason={}", request.getSn(), result.getErrorMessage()); flightService.updateFlightStatus(request.getTaskId(), StatusEnum.FAILED); return R.fail("无人机起飞命令发送失败: " + result.getErrorMessage()); } } catch (Exception e) { - log.error("无人机起飞命令发送失败: sn={}", request.getSn(), e); + log.error("无人机起飞失败 无人机起飞命令发送失败: sn={}", request.getSn(), e); flightService.updateFlightStatus(request.getTaskId(), StatusEnum.FAILED); 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 e6efab6..f25da41 100644 --- a/src/main/java/com/ruoyi/device/service/impl/FlightEventCallback.java +++ b/src/main/java/com/ruoyi/device/service/impl/FlightEventCallback.java @@ -142,7 +142,7 @@ public class FlightEventCallback implements IAirportFlyControlCallback, IAirport // 检查是否自检失败（code=1 表示失败） if (code != null && (code == 1 || code == -1)) { - log.info("【FlightEventCallback】检测到自检失败(code=1)，更新状态为ERROR: deviceSn={}, flightId={}", deviceSn, taskId); + log.info("无人机起飞失败【FlightEventCallback】检测到自检失败(code=1)，更新状态为ERROR: deviceSn={}, flightId={} msg {}", deviceSn, taskId, msg); flightService.updateFlightStatus(taskId, StatusEnum.FAILED); } } 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 07d1694..197e55a 100644 --- a/src/main/java/com/ruoyi/device/service/impl/FlightLogCallback.java +++ b/src/main/java/com/ruoyi/device/service/impl/FlightLogCallback.java @@ -104,6 +104,7 @@ public class FlightLogCallback implements IDroneRealTimeCallback { String logContent = check + " " + value + " " + statusText; if(Boolean.FALSE.equals(result)){ + log.info("无人机起飞失败: sn={}", deviceSn); flightService.updateFlightStatus(taskId, StatusEnum.FAILED); }