diff --git a/src/main/java/com/ruoyi/device/domain/impl/tuohengmqtt/model/TuohengRealTimeData.java b/src/main/java/com/ruoyi/device/domain/impl/tuohengmqtt/model/TuohengRealTimeData.java index 5eba0c1..5352a90 100644 --- a/src/main/java/com/ruoyi/device/domain/impl/tuohengmqtt/model/TuohengRealTimeData.java +++ b/src/main/java/com/ruoyi/device/domain/impl/tuohengmqtt/model/TuohengRealTimeData.java @@ -141,6 +141,7 @@ public class TuohengRealTimeData { } @Data + @JsonIgnoreProperties(ignoreUnknown = true) public static class TuohengChargerData { @JsonProperty("startCharge") private String startCharge; diff --git a/src/main/java/com/ruoyi/device/websocket/FlightLogWebSocket.java b/src/main/java/com/ruoyi/device/websocket/FlightLogWebSocket.java index 2b2652c..4bfb543 100644 --- a/src/main/java/com/ruoyi/device/websocket/FlightLogWebSocket.java +++ b/src/main/java/com/ruoyi/device/websocket/FlightLogWebSocket.java @@ -35,8 +35,12 @@ public class FlightLogWebSocket { private static final Map sessionMap = new ConcurrentHashMap<>(); + private static FlightService flightService; + @Autowired - private FlightService flightService; + public void setFlightService(FlightService flightService) { + FlightLogWebSocket.flightService = flightService; + } @OnOpen public void onOpen(Session session, @PathParam("deviceSn") String deviceSn) { diff --git a/src/main/java/com/ruoyi/device/websocket/PreCheckLogWebSocket.java b/src/main/java/com/ruoyi/device/websocket/PreCheckLogWebSocket.java index 2c4ed25..df5b38a 100644 --- a/src/main/java/com/ruoyi/device/websocket/PreCheckLogWebSocket.java +++ b/src/main/java/com/ruoyi/device/websocket/PreCheckLogWebSocket.java @@ -36,8 +36,12 @@ public class PreCheckLogWebSocket { private static final Map sessionMap = new ConcurrentHashMap<>(); + private static FlightService flightService; + @Autowired - private FlightService flightService; + public void setFlightService(FlightService flightService) { + PreCheckLogWebSocket.flightService = flightService; + } @OnOpen public void onOpen(Session session, @PathParam("deviceSn") String deviceSn) { diff --git a/src/main/resources/db/migration/V6__Create_flight_log_tables.sql b/src/main/resources/db/migration/V6__Create_flight_log_tables.sql index 1afe1b0..bcbfc8e 100644 --- a/src/main/resources/db/migration/V6__Create_flight_log_tables.sql +++ b/src/main/resources/db/migration/V6__Create_flight_log_tables.sql @@ -30,7 +30,12 @@ CREATE TABLE IF NOT EXISTS device_pre_check_log ( log_id BIGINT NOT NULL AUTO_INCREMENT COMMENT '自检日志主键', flight_id BIGINT NOT NULL COMMENT '关联飞行表ID', log_content TEXT COMMENT '日志内容 (JSON字符串)', + success TINYINT(1) DEFAULT 0 COMMENT '是否成功 (1=成功, 0=失败)', + create_by VARCHAR(64) COMMENT '创建者', create_time DATETIME DEFAULT CURRENT_TIMESTAMP COMMENT '创建时间', + update_by VARCHAR(64) COMMENT '更新者', + update_time DATETIME DEFAULT CURRENT_TIMESTAMP ON UPDATE CURRENT_TIMESTAMP COMMENT '更新时间', + remark VARCHAR(500) COMMENT '备注', PRIMARY KEY (log_id), KEY idx_pre_check_flight_id (flight_id), KEY idx_pre_check_create_time (create_time) @@ -41,7 +46,11 @@ CREATE TABLE IF NOT EXISTS device_flight_log ( log_id BIGINT NOT NULL AUTO_INCREMENT COMMENT '飞行日志主键', flight_id BIGINT NOT NULL COMMENT '关联飞行表ID', log_content TEXT COMMENT '日志内容', + create_by VARCHAR(64) COMMENT '创建者', create_time DATETIME DEFAULT CURRENT_TIMESTAMP COMMENT '创建时间', + update_by VARCHAR(64) COMMENT '更新者', + update_time DATETIME DEFAULT CURRENT_TIMESTAMP ON UPDATE CURRENT_TIMESTAMP COMMENT '更新时间', + remark VARCHAR(500) COMMENT '备注', PRIMARY KEY (log_id), KEY idx_flight_log_flight_id (flight_id), KEY idx_flight_log_create_time (create_time) diff --git a/src/main/resources/db/migration/V7__Add_success_field_to_pre_check_log.sql b/src/main/resources/db/migration/V7__Add_success_field_to_pre_check_log.sql deleted file mode 100644 index 3e8469e..0000000 --- a/src/main/resources/db/migration/V7__Add_success_field_to_pre_check_log.sql +++ /dev/null @@ -1,11 +0,0 @@ --- ============================================================ --- Flyway Migration Script --- Version: V6 --- Description: Add success field to device_pre_check_log table --- Author: ruoyi --- Date: 2026-02-25 --- ============================================================ - -ALTER TABLE device_pre_check_log -ADD COLUMN success TINYINT(1) DEFAULT 0 COMMENT '是否成功 (1=成功, 0=失败)' -AFTER log_content;