From f35d1b98fec6e68a741d8ef62c97dfd30383f98b Mon Sep 17 00:00:00 2001
From: sdy <mhy_ad1929@163.com>
Date: Wed, 24 Jun 2026 16:06:25 +0800
Subject: [PATCH] =?UTF-8?q?1.=E8=B0=83=E8=AF=95=E6=A8=A1=E5=BC=8F=E5=A2=9E?=
 =?UTF-8?q?=E5=8A=A0=E6=9C=BA=E5=BA=93=E5=BC=BA=E5=88=B6=E7=A9=BA=E9=97=B2?=
 =?UTF-8?q?=E6=8E=A5=E5=8F=A3=202.=E9=A3=9E=E8=A1=8C=E6=97=A5=E5=BF=97?=
 =?UTF-8?q?=E5=A2=9E=E5=8A=A0=E6=9C=BA=E5=BA=93=E8=BF=90=E8=A1=8C=E6=97=A5?=
 =?UTF-8?q?=E5=BF=97?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../common/constant/BusinessConstant.java       |  1 +
 .../business/controller/DebugController.java    |  8 ++++++++
 .../modules/business/handler/EventsHandler.java | 17 +++++++++++++++++
 3 files changed, 26 insertions(+)

diff --git a/admin/src/main/java/com/multictrl/common/constant/BusinessConstant.java b/admin/src/main/java/com/multictrl/common/constant/BusinessConstant.java
index 6c84a5a..73381d3 100644
--- a/admin/src/main/java/com/multictrl/common/constant/BusinessConstant.java
+++ b/admin/src/main/java/com/multictrl/common/constant/BusinessConstant.java
@@ -70,6 +70,7 @@ public interface BusinessConstant {
     String OBSTACLE_AVOIDANCE_NOTIFY = "obstacle_avoidance_notify";
     String OTA_PROGRESS = "ota_progress";
     String HMS = "hms";
+    String RUN_LOG = "run_log";
     //********************************* dj status topic method *********************************//
     String UPDATE_TOPO = "update_topo";
     //********************************* dj cache key *********************************//
diff --git a/admin/src/main/java/com/multictrl/modules/business/controller/DebugController.java b/admin/src/main/java/com/multictrl/modules/business/controller/DebugController.java
index 484f5d6..19edc84 100644
--- a/admin/src/main/java/com/multictrl/modules/business/controller/DebugController.java
+++ b/admin/src/main/java/com/multictrl/modules/business/controller/DebugController.java
@@ -270,4 +270,12 @@ public class DebugController {
     public Result<Object> putterClose(@PathVariable String dockSn) {
         return new Result<>().ok(djiBaseService.executeAndReturnResult(dockSn, "putter_close"));
     }
+
+    @Operation(summary = "强制机场空闲（仅支持阿罗斯系列）")
+    @PostMapping("/resetMode/{dockSn}")
+    @LogOperation("强制机场空闲")
+    @RequiresPermissions("bus:debug:resetMode")
+    public Result<Object> resetMode(@PathVariable String dockSn) {
+        return new Result<>().ok(djiBaseService.executeAndReturnResult(dockSn, "reset_mode"));
+    }
 }
diff --git a/admin/src/main/java/com/multictrl/modules/business/handler/EventsHandler.java b/admin/src/main/java/com/multictrl/modules/business/handler/EventsHandler.java
index 87eda15..47dacc4 100644
--- a/admin/src/main/java/com/multictrl/modules/business/handler/EventsHandler.java
+++ b/admin/src/main/java/com/multictrl/modules/business/handler/EventsHandler.java
@@ -437,6 +437,23 @@ public class EventsHandler implements MessageHandler {
                     flightLog.setMessage(msg.toString());
                     influxService.addRecord(flightLog);
                 }
+            } else if (BusinessConstant.RUN_LOG.equals(method)) {
+                log.debug("events --> 运行日志事件通知: {}", payload);
+                //飞行日志
+                JSONObject data = message.getJSONObject(BusinessConstant.DATA);
+                FlightLog flightLog = new FlightLog();
+                flightLog.setDockSn(gateway);
+                flightLog.setLevel(data.getInt("level") == 1 ? 0 : data.getInt("level"));
+                flightLog.setMethod("运行日志上报\n" + BusinessConstant.RUN_LOG);
+                flightLog.setTime(Instant.ofEpochMilli(message.getLong("timestamp")));
+                String from = data.getStr("from");
+                String fromStr = "uav".equals(from) ? "飞机" : "机场";
+                flightLog.setMessage(
+                        "架次编号: " + data.getStr("flight_id") + "\n" +
+                                "来源: " + fromStr + "\n" +
+                                "详情: " + data.getStr("msg")
+                );
+                influxService.addRecord(flightLog);
             }
         } else {
             log.debug("events --> payload解析失败，解析后为null");