From 23481685023bb7da508f7ec8a551699bff26f496 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E5=AD=99=E5=B0=8F=E4=BA=91?= <sunpengchina85@gmail.com>
Date: Sat, 28 Feb 2026 10:05:38 +0800
Subject: [PATCH] =?UTF-8?q?=E5=A4=84=E7=90=86=E6=9C=BA=E5=9C=BA=E9=A3=9E?=
 =?UTF-8?q?=E8=A1=8C=E6=8E=A7=E5=88=B6=E6=95=B0=E6=8D=AE?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../ruoyi/device/service/FlightService.java   | 15 -------------
 .../service/impl/FlightServiceImpl.java       | 22 ++-----------------
 .../websocket/PreCheckLogWebSocket.java       |  3 +++
 3 files changed, 5 insertions(+), 35 deletions(-)

diff --git a/src/main/java/com/ruoyi/device/service/FlightService.java b/src/main/java/com/ruoyi/device/service/FlightService.java
index dfe6f0b..b5127fc 100644
--- a/src/main/java/com/ruoyi/device/service/FlightService.java
+++ b/src/main/java/com/ruoyi/device/service/FlightService.java
@@ -12,14 +12,6 @@ import java.util.Map;
  */
 public interface FlightService
 {
-    /**
-     * 获取或创建当前正在进行的飞行记录
-     * 用于MQTT回调，如果最新记录已返航则创建新记录
-     *
-     * @param deviceSn 设备SN号
-     * @return 飞行记录
-     */
-    FlightEntity getOrCreateCurrentFlight(String deviceSn);
 
     /**
      * 获取或创建飞行记录（通过messageID匹配）
@@ -41,13 +33,6 @@ public interface FlightService
      */
     FlightEntity getLatestFlight(String deviceSn);
 
-    /**
-     * 创建新的飞行记录
-     *
-     * @param deviceSn 设备SN号
-     * @return 飞行记录
-     */
-    FlightEntity createFlight(String deviceSn);
 
     /**
      * 更新飞行ID（外部ID）
diff --git a/src/main/java/com/ruoyi/device/service/impl/FlightServiceImpl.java b/src/main/java/com/ruoyi/device/service/impl/FlightServiceImpl.java
index 71b0a1f..8f90d22 100644
--- a/src/main/java/com/ruoyi/device/service/impl/FlightServiceImpl.java
+++ b/src/main/java/com/ruoyi/device/service/impl/FlightServiceImpl.java
@@ -37,16 +37,7 @@ public class FlightServiceImpl implements FlightService
     @Autowired
     private FlightLogMapper flightLogMapper;
 
-    @Override
-    public FlightEntity getOrCreateCurrentFlight(String deviceSn) {
-        FlightEntity flight = flightMapper.selectLatestFlightByDeviceSn(deviceSn);
 
-        if (flight == null || "已返航".equals(flight.getStatus())) {
-            flight = createFlight(deviceSn);
-        }
-
-        return flight;
-    }
 
     @Override
     @Transactional(rollbackFor = Exception.class)
@@ -79,16 +70,7 @@ public class FlightServiceImpl implements FlightService
         return flightMapper.selectLatestFlightByDeviceSn(deviceSn);
     }
 
-    @Override
-    @Transactional(rollbackFor = Exception.class)
-    public FlightEntity createFlight(String deviceSn) {
-        FlightEntity flight = new FlightEntity();
-        flight.setDeviceSn(deviceSn);
-        flight.setStatus("自检中");
-        flightMapper.insertFlight(flight);
-        log.info("创建新的飞行记录: deviceSn={}, flightId={}", deviceSn, flight.getFlightId());
-        return flight;
-    }
+
 
     @Override
     public void updateFlightIdExternal(Long flightId, String flightIdExternal) {
@@ -104,7 +86,7 @@ public class FlightServiceImpl implements FlightService
         flightMapper.updateFlightStatus(flightId, status);
         log.info("更新飞行状态: flightId={}, status={}", flightId, status);
 
-        if ("已返航".equals(status)) {
+        if ("HOME".equals(status) ||"ERROR".equals(status)) {
             flightMapper.updateReturnTime(flightId);
             log.info("更新返航时间: flightId={}", flightId);
         }
diff --git a/src/main/java/com/ruoyi/device/websocket/PreCheckLogWebSocket.java b/src/main/java/com/ruoyi/device/websocket/PreCheckLogWebSocket.java
index eb7379f..e8126b7 100644
--- a/src/main/java/com/ruoyi/device/websocket/PreCheckLogWebSocket.java
+++ b/src/main/java/com/ruoyi/device/websocket/PreCheckLogWebSocket.java
@@ -12,6 +12,7 @@ import org.springframework.stereotype.Component;
 import jakarta.websocket.*;
 import jakarta.websocket.server.PathParam;
 import jakarta.websocket.server.ServerEndpoint;
+import java.util.ArrayList;
 import java.util.List;
 import java.util.Map;
 import java.util.concurrent.ConcurrentHashMap;
@@ -94,4 +95,6 @@ public class PreCheckLogWebSocket {
             ws.sendMessage(JSON.toJSONString(flightData));
         }
     }
+
+
 }