Compare commits

..

No commits in common. "f5663d7552ca2bb6d32cad972613cde20fe3cd11" and "30f3ec344d42d78b8f1e2af6885ff209d0a6c3e4" have entirely different histories.

5 changed files with 13 additions and 21 deletions

View File

@ -1,6 +1,5 @@
package com.ruoyi.device.domain.impl.tuohengmqtt.model;
import com.fasterxml.jackson.annotation.JsonIgnoreProperties;
import com.fasterxml.jackson.annotation.JsonProperty;
import lombok.Data;
@ -142,7 +141,6 @@ public class TuohengRealTimeData {
}
@Data
@JsonIgnoreProperties(ignoreUnknown = true)
public static class TuohengChargerData {
@JsonProperty("startCharge")
private String startCharge;

View File

@ -35,12 +35,8 @@ public class FlightLogWebSocket {
private static final Map<String, FlightLogWebSocket> sessionMap = new ConcurrentHashMap<>();
private static FlightService flightService;
@Autowired
public void setFlightService(FlightService flightService) {
FlightLogWebSocket.flightService = flightService;
}
private FlightService flightService;
@OnOpen
public void onOpen(Session session, @PathParam("deviceSn") String deviceSn) {

View File

@ -36,12 +36,8 @@ public class PreCheckLogWebSocket {
private static final Map<String, PreCheckLogWebSocket> sessionMap = new ConcurrentHashMap<>();
private static FlightService flightService;
@Autowired
public void setFlightService(FlightService flightService) {
PreCheckLogWebSocket.flightService = flightService;
}
private FlightService flightService;
@OnOpen
public void onOpen(Session session, @PathParam("deviceSn") String deviceSn) {

View File

@ -30,12 +30,7 @@ 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)
@ -46,11 +41,7 @@ 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)

View File

@ -0,0 +1,11 @@
-- ============================================================
-- 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;