feat: role COMMENT 增加 analyst 角色

之前 insert_wave_data 的 relay_out 被硬编码为空字符串，
decode_relay_info 的计算结果未写入。现在增加参数 relay_out
并传入格式化后的继电器状态字符串。

src/dg430.py

@@ -19,7 +19,7 @@ class DG430Status:
     """解析后的 DG430 状态数据"""
     addr: int          # 地址
     dev_model: int     # 1 PD132, 2 DLD110
-    test_mode: int     # 0 灵敏度, 1 模拟过车
+    test_mode: int     # 0 灵敏度, 1 波动测试
     is_finished: bool  # 是否正常完成
     finish_code: int   # 0 正常, 1 未完成, 2 地感死机
     fault: int         # bitmask
@@ -150,7 +150,7 @@ def parse_b2_status(data: bytes) -> DG430Status | None:
 
     # 设备型号
     dev_model = payload[0]   # 1=PD132, 2=DLD110
-    test_mode = payload[1]   # 0=灵敏度, 1=模拟过车
+    test_mode = payload[1]   # 0=灵敏度, 1=波动测试
     finish_code = payload[2]  # 0=正常, 1=未完成, 2=死机
     fault = payload[3]       # bitmask
     relay_out = payload[4]   # bitmask
@@ -191,6 +191,70 @@ def parse_b2_status(data: bytes) -> DG430Status | None:
     )
 
 
+# ─── 0xB4 波动测试上报 ──────────────────────────────────────────
+
+@dataclass
+class DG430WaveStatus:
+    """波动测试状态上报数据"""
+    addr: int           # 地址
+    remain_count: int   # 剩余波动次数
+    relay_out: int      # 继电器输出 bitmask
+    work_freq: float    # 工作频率 Hz
+    curr_dist: int      # 当前距离 mm
+    speed: int          # 当前速度 dm/s
+    near_dist: int      # 波动最近距离 mm
+    far_dist: int       # 波动最远距离 mm
+    enter_dist: int     # 进入高度 mm
+    leave_dist: int     # 离开高度 mm
+
+
+def parse_b4_wave_status(data: bytes) -> DG430WaveStatus | None:
+    """解析 0xB4 波动测试状态上报包
+
+    格式: STX | ADDR | 11 | B4 | DATA(16B) | XOR | SUM
+    DATA: RemainCount(1) | Relay(1) | WorkFreq(2 LE) | CurrDist(2 LE) |
+          Speed(2 LE) | NearDist(2 LE) | FarDist(2 LE) |
+          EnterDist(2 LE) | LeaveDist(2 LE)
+    """
+    if not verify_packet(data):
+        logger.warning("DG430 B4 数据包校验失败")
+        return None
+
+    cmd = data[3]
+    if cmd != 0xB4:
+        logger.debug(f"非 B4 指令: 0x{cmd:02X}")
+        return None
+
+    payload = data[4:3 + data[2]]
+    if len(payload) < 16:
+        logger.warning(f"B4 数据长度不足: {len(payload)} < 16")
+        return None
+
+    addr = data[1] & 0x7F
+    remain_count = payload[0]
+    relay_out = payload[1]
+    work_freq = _le16(payload, 2) * 10.0
+    curr_dist = _le16(payload, 4)
+    speed = _le16(payload, 6)
+    near_dist = _le16(payload, 8)
+    far_dist = _le16(payload, 10)
+    enter_dist = _le16(payload, 12)
+    leave_dist = _le16(payload, 14)
+
+    return DG430WaveStatus(
+        addr=addr,
+        remain_count=remain_count,
+        relay_out=relay_out,
+        work_freq=round(work_freq, 1),
+        curr_dist=curr_dist,
+        speed=speed,
+        near_dist=near_dist,
+        far_dist=far_dist,
+        enter_dist=enter_dist,
+        leave_dist=leave_dist,
+    )
+
+
 # ─── 故障解码 ───────────────────────────────────────────────────────
 
 FAULT_BITS = {
@@ -216,12 +280,16 @@ def decode_fault_info(fault: int) -> str:
 
 
 def decode_relay_info(relay: int) -> str:
-    """解码继电器 bitmask"""
-    items = []
-    for bit, desc in RELAY_BITS.items():
-        if relay & (1 << bit):
-            items.append(desc)
-    return "; ".join(items) if items else "无输出"
+    """解码继电器输出状态为可读字符串
+
+    0xB2 继电器输出状态原始值 x 的解析规则：
+      - x & 0x01 为真 → "存在继电器有输出"，否则 "存在继电器无输出"
+      - x & 0x02 为真 → "脉冲继电器有输出"，否则 "脉冲继电器无输出"
+    汇总格式: "存在继电器有输出，脉冲继电器有输出"
+    """
+    exist = "存在继电器有输出" if (relay & 0x01) else "存在继电器无输出"
+    pulse = "脉冲继电器有输出" if (relay & 0x02) else "脉冲继电器无输出"
+    return f"{exist}，{pulse}"
 
 
 # ─── 0x4A 获取设备版本号响应 ──────────────────────────────────────
@@ -290,7 +358,7 @@ class DG430FixtureParams:
     flag: int           # 0=正常, 1=故障
     dev_addr: int       # 设备地址
     dev_type: int       # 设备型号
-    test_mode: int      # 0 灵敏度, 1 模拟过车
+    test_mode: int      # 0 灵敏度, 1 波动测试
     reset_dis: int      # 复位距离 cm
     minus_dis: int      # 皮距 cm
     sens_min: int       # 灵敏度最小值
@@ -299,14 +367,22 @@ class DG430FixtureParams:
     fre_max: int        # 频率最大值 Hz
     peak_min: int       # 峰峰值最小值
     peak_max: int       # 峰峰值最大值
+    far_tol: int        # 最远容差 cm
+    near_tol: int       # 最近容差 cm
+    step_tol: int       # 步进容差 cm
+    back_forth: int     # 来回次数
+    near_stay: int      # 最近停留时间 ms
+    far_stay: int       # 最远停留时间 ms
 
 
 def parse_4c_params(data: bytes) -> DG430FixtureParams | None:
-    """解析 0x4C 查询测试参数响应
+    """解析 0x4C 查询测试参数响应 (V2.0.3 扩展)
 
-    格式: 7F | ADDR | 13 | 4C | Flag | Addr | DevType | TestMode |
+    格式: 7F | ADDR | 1B | 4C | Flag | Addr | DevType | TestMode |
           ResetDis | MinusDis | SensMin(2) | SensMax(2) |
-          FreMin(2) | FreMax(2) | PeakMin(2) | PeakMax(2) | XOR | SUM
+          FreMin(2) | FreMax(2) | PeakMin(2) | PeakMax(2) |
+          FarTol(1) | NearTol(1) | StepTol(1) | BackForth(1) |
+          NearStay(2) | FarStay(2) | XOR | SUM
     """
     if not verify_packet(data):
         return None
@@ -320,6 +396,14 @@ def parse_4c_params(data: bytes) -> DG430FixtureParams | None:
 
     addr = data[1] & 0x7F
     # 0x4B/0x4C 多字节字段为小端序
+    # V2.0.3 新增6个波动参数字段，兼容旧版（长度不足时默认为0）
+    far_tol = payload[18] if len(payload) >= 19 else 0
+    near_tol = payload[19] if len(payload) >= 20 else 0
+    step_tol = payload[20] if len(payload) >= 21 else 0
+    back_forth = payload[21] if len(payload) >= 22 else 0
+    near_stay = _le16(payload, 22) if len(payload) >= 24 else 0
+    far_stay = _le16(payload, 24) if len(payload) >= 26 else 0
+
     return DG430FixtureParams(
         addr=addr,
         flag=payload[0],
@@ -334,6 +418,12 @@ def parse_4c_params(data: bytes) -> DG430FixtureParams | None:
         fre_max=_le16(payload, 12),
         peak_min=_le16(payload, 14),
         peak_max=_le16(payload, 16),
+        far_tol=far_tol,
+        near_tol=near_tol,
+        step_tol=step_tol,
+        back_forth=back_forth,
+        near_stay=near_stay,
+        far_stay=far_stay,
     )
 
 

src/handlers.py

@@ -12,6 +12,7 @@ import asyncio
 import json
 import logging
 import time
+from collections import deque
 from datetime import datetime
 
 from src.models import (
@@ -22,18 +23,23 @@ from src.models import (
     fetch_unparsed_serial,
     mark_record_state,
     insert_test_result,
+    insert_wave_data,
     get_dnt_by_serial,
     get_pending_serialnet,
     mark_serialnet_sent,
     mark_serialnet_done,
     mark_serialnet_timeout,
     upsert_fixture_param,
+    insert_device_log,
+    update_device_status,
+    get_all_device_serials,
 )
 from src.dg430 import (
     parse_b2_status,
     parse_4a_version,
     parse_flag_response,
     parse_4c_params,
+    parse_b4_wave_status,
     get_packet_cmd,
     hex_str_to_bytes,
     split_packets,
@@ -56,6 +62,12 @@ _registry: dict[str, int] = {}
 # 设备心跳时间: {device_id: last_heartbeat}
 _heartbeat: dict[str, float] = {}
 
+# 设备交互时间记录: {device_id: deque[float]} (最近 60s 内)
+_interactions: dict[str, deque] = {}
+
+# 设备当前状态: {device_id: int} (0=离线 1=在线 2=通信不良)
+_device_status: dict[str, int] = {}
+
 # UDP transport 引用，由 server.py 注入
 _udp_sender: object | None = None
 
@@ -66,6 +78,18 @@ def set_udp_sender(sender):
     _udp_sender = sender
 
 
+def record_interaction(device_id: str):
+    """记录一次设备交互（心跳/上报/解析成功）"""
+    now = time.time()
+    if device_id not in _interactions:
+        _interactions[device_id] = deque()
+    _interactions[device_id].append(now)
+    # 清理 120s 前的旧记录
+    cutoff = now - 120
+    while _interactions[device_id] and _interactions[device_id][0] < cutoff:
+        _interactions[device_id].popleft()
+
+
 async def handle_count_off(data: dict, addr: tuple):
     """处理设备登录/身份上报 (Count_Off 返回格式)
 
@@ -123,9 +147,20 @@ async def handle_count_off(data: dict, addr: tuple):
     )
     _registry[serial] = dnt_id
     _heartbeat[serial] = time.time()
+    record_interaction(serial)
+    _device_status[serial] = 1  # 登录即视为在线状态
 
     await ensure_collect_table(serial)
 
+    # 登录事件日志
+    try:
+        await insert_device_log(
+            serial=serial, ip=dev_ip, event_type="login",
+            content=f"设备上线 type={dev_type} ver={dev_version}",
+        )
+    except Exception:
+        pass
+
     logger.info(
         f"设备登录: {serial} dnt_id={dnt_id} ip={dev_ip}:{dev_port} "
         f"type={dev_type} ver={dev_version}"
@@ -141,6 +176,7 @@ async def handle_heartbeat(data: dict) -> str | None:
         return None
 
     _heartbeat[device_id] = time.time()
+    record_interaction(device_id)
 
     try:
         await insert_collect_data(device_id, 0, str(data))
@@ -151,21 +187,11 @@ async def handle_heartbeat(data: dict) -> str | None:
 
 
 def handle_timestamp(data: dict) -> str:
-    """处理时间同步请求
-
-    TimeStamp 请求格式:
-    {
-        "Method": "TimeStamp",
-        "Params": {
-            "Device_id": "2345",
-            "TimeZone": "Asia/Shanghai"
-        }
-    }
-
-    返回格式参考 PGLC 协议 3.5 节。
-    """
+    """处理时间同步请求（也是设备交互）"""
     params = data.get("Params", {})
     device_id = params.get("Device_id", "")
+    if device_id:
+        record_interaction(device_id)
     return make_timestamp_response(device_id, int(time.time()))
 
 
@@ -184,6 +210,8 @@ async def handle_tsreport(data: dict) -> str | None:
     if not device_id or not sub_dat:
         return None
 
+    record_interaction(device_id)
+
     try:
         await insert_collect_data(device_id, 8, sub_dat)
     except Exception as e:
@@ -207,6 +235,8 @@ async def handle_serial_net(data: dict) -> str | None:
     if not device_id or not serial_dat:
         return None
 
+    record_interaction(device_id)
+
     try:
         await insert_collect_data(device_id, 9, serial_dat)
     except Exception as e:
@@ -284,6 +314,8 @@ async def parse_loop():
                                     exit_dist=status.exit_dist,
                                     enter_speed=status.enter_speed,
                                     exit_speed=status.exit_speed,
+                                    test_mode=status.test_mode,
+                                    relay_code=status.relay_out,
                                 )
 
                                 # 匹配 tb_serialnet 中的待确认记录
@@ -322,6 +354,12 @@ async def parse_loop():
                                         FreMax=params.fre_max,
                                         PeakMin=params.peak_min,
                                         PeakMax=params.peak_max,
+                                        FarTol=params.far_tol,
+                                        NearTol=params.near_tol,
+                                        StepTol=params.step_tol,
+                                        BackForth=params.back_forth,
+                                        NearStay=params.near_stay,
+                                        FarStay=params.far_stay,
                                     )
                                     logger.info(
                                         f"0x4C 工装参数已更新 dnt_id={dnt_id} "
@@ -332,6 +370,42 @@ async def parse_loop():
                                 has_valid = True
                                 all_failed = False
 
+                            # ── 0xB4 波动测试上报 ──
+                            elif cmd == 0xB4:
+                                if not verify_packet(pkt):
+                                    logger.debug(f"0xB4 数据包校验失败: {device_id}")
+                                    continue
+
+                                wave = parse_b4_wave_status(pkt)
+                                if wave is None:
+                                    logger.warning(f"0xB4 解析失败: {device_id}")
+                                    continue
+
+                                relay_info = decode_relay_info(wave.relay_out)
+                                await insert_wave_data(
+                                    dnt_id=dnt_id,
+                                    dpg430_addr=wave.addr,
+                                    remain_count=wave.remain_count,
+                                    relay_code=wave.relay_out,
+                                    relay_out=relay_info,
+                                    work_freq=wave.work_freq,
+                                    curr_dist=wave.curr_dist,
+                                    speed=wave.speed,
+                                    near_dist=wave.near_dist,
+                                    far_dist=wave.far_dist,
+                                    enter_dist=wave.enter_dist,
+                                    leave_dist=wave.leave_dist,
+                                )
+                                logger.info(
+                                    f"B4波动上报: {device_id} 剩余={wave.remain_count} "
+                                    f"当前距离={wave.curr_dist}mm 速度={wave.speed}dm/s "
+                                    f"最近={wave.near_dist}mm 最远={wave.far_dist}mm "
+                                    f"进入={wave.enter_dist}mm 离开={wave.leave_dist}mm "
+                                    f"继电器={relay_info}"
+                                )
+                                has_valid = True
+                                all_failed = False
+
                             # ── 测试指令 Flag 响应（不匹配 serialnet，等待 B2 完成）──
                             elif cmd in (0xB0, 0xB1, 0xBA, 0xBB, 0xBC):
                                 if not verify_packet(pkt):
@@ -364,6 +438,7 @@ async def parse_loop():
                                 logger.debug(f"跳过未知/不支持指令: 0x{cmd:02X}")
 
                         if has_valid:
+                            record_interaction(device_id)
                             await mark_record_state(device_id, rec["id"], state=1)
                         elif all_failed and packets:
                             await mark_record_state(device_id, rec["id"], state=3)
@@ -622,3 +697,148 @@ async def _match_serial_cmd(dnt_id: int, cmd: int, raw_hex: str):
             )
     except Exception as e:
         logger.warning(f"匹配 serialnet cmd 0x{cmd:02X} 失败: {e}")
+
+
+# ─── 设备状态监控服务 ──────────────────────────────────────────────────
+
+# 在线判定参数
+INTERACTION_TIMEOUT = 10       # 单次交互超时判定 (秒)
+ONLINE_MIN_INTERACTIONS = 3    # 连续几次交互在超时内即表示在线
+OFFLINE_IDLE_SEC = 60          # 超过此时间无交互 → 离线
+POOR_MIN_INTERACTIONS = 4      # 1 分钟内少于此次数 → 通信不良
+MONITOR_INTERVAL = 5           # 状态检查间隔 (秒)
+
+
+async def device_status_monitor():
+    """后台轮询：监控所有设备在线/离线状态
+
+    两个阶段：
+      Phase 1 — 遍历 _registry 中活跃设备，根据交互记录判定状态
+      Phase 2 — 扫描 dnt_info 全表，修正与实际交互不符的状态：
+        - state=1(在线) 但 >60s 无交互 → 更新为离线
+        - state=0(离线) 但有交互记录 → 根据交互模式更新为在线/通信不良
+        - state 与计算值不一致 → 同步修正
+    """
+    logger.info("设备状态监控服务启动")
+    await asyncio.sleep(5)  # 等其它服务就绪
+
+    while True:
+        try:
+            now = time.time()
+
+            # ── Phase 1: 活跃设备（在 _registry 中）────
+            for device_id, dnt_id in list(_registry.items()):
+                interactions = _interactions.get(device_id)
+                actual_state = _calc_device_state(interactions, now) if interactions else 0
+                old_state = _device_status.get(device_id, 1)  # 注册时默认在线
+
+                if actual_state != old_state:
+                    await _apply_state_change(device_id, actual_state, old_state)
+
+            # ── Phase 2: 扫描 dnt_info 全表，修正不一致 ──
+            try:
+                rows = await get_all_device_serials()
+            except Exception as e:
+                logger.error(f"查询 dnt_info 失败: {e}")
+                rows = []
+
+            for serial, db_state, ip in rows:
+                if not serial:
+                    continue
+
+                interactions = _interactions.get(serial)
+                actual_state = _calc_device_state(interactions, now) if interactions else 0
+                memory_state = _device_status.get(serial)
+
+                # 优先用内存状态做基准（更实时）；无内存状态则用 DB 状态
+                tracked_state = memory_state if memory_state is not None else db_state
+
+                if actual_state != tracked_state:
+                    await _apply_state_change(serial, actual_state, tracked_state, ip=ip)
+
+            # ── Phase 3: 清理 _registry 中已经不存在的设备 ──
+            # （已注销 / 长期无交互的设备不清除，继续监控）
+
+        except Exception as e:
+            logger.error(f"设备状态监控异常: {e}")
+
+        await asyncio.sleep(MONITOR_INTERVAL)
+
+
+async def _apply_state_change(device_id: str, new_state: int, old_state: int,
+                              ip: str = ""):
+    """应用状态变更：更新内存、dnt_info、写入日志"""
+    _device_status[device_id] = new_state
+    logger.info(
+        f"设备 {device_id} 状态变更: "
+        f"{_state_name(old_state)} → {_state_name(new_state)}"
+    )
+
+    # 更新 dnt_info
+    try:
+        await update_device_status(device_id, new_state)
+    except Exception as e:
+        logger.error(f"更新设备状态失败: {e}")
+
+    # 获取设备 IP（未传入时从 DB 查）
+    if not ip:
+        try:
+            dnt = await get_dnt_by_serial(device_id)
+            ip = dnt.get("ip", "") if dnt else ""
+        except Exception:
+            pass
+
+    # 写入事件日志
+    event_type, content = _state_event(new_state, old_state)
+    try:
+        await insert_device_log(
+            serial=device_id, ip=ip,
+            event_type=event_type, content=content,
+        )
+    except Exception as e:
+        logger.error(f"写入设备事件日志失败: {e}")
+
+
+def _calc_device_state(interactions: deque, now: float) -> int:
+    """根据交互记录计算设备状态 (0=离线 1=在线 2=通信不良)"""
+    # 清理过期记录（仅保留 60s 内）
+    cutoff = now - OFFLINE_IDLE_SEC
+    recent = [t for t in interactions if t >= cutoff]
+
+    if not recent:
+        return 0  # 离线
+
+    # 最近一次交互距今
+    last_interaction = recent[-1]
+    if now - last_interaction > OFFLINE_IDLE_SEC:
+        return 0  # 离线
+
+    # 1 分钟内交互次数
+    if len(recent) < POOR_MIN_INTERACTIONS:
+        return 2  # 通信不良
+
+    # 最近 3 次交互间隔是否都在超时内
+    if len(recent) >= ONLINE_MIN_INTERACTIONS:
+        last_n = recent[-ONLINE_MIN_INTERACTIONS:]
+        gaps = [last_n[i] - last_n[i - 1] for i in range(1, len(last_n))]
+        if gaps and all(g <= INTERACTION_TIMEOUT for g in gaps):
+            return 1  # 在线
+
+    # 默认：有交互但不够密集 → 通信不良
+    return 2
+
+
+def _state_name(state: int) -> str:
+    return {0: "离线", 1: "在线", 2: "通信不良"}.get(state, f"未知({state})")
+
+
+def _state_event(new_state: int, old_state: int) -> tuple[str, str]:
+    """根据状态变化生成事件类型和内容"""
+    name_new = _state_name(new_state)
+    name_old = _state_name(old_state)
+    if new_state == 0:
+        return "offline", f"设备离线（上次状态: {name_old}）"
+    elif new_state == 1:
+        return "online", f"设备已上线（上次状态: {name_old}）"
+    else:
+        return "poor", f"设备通信不良（上次状态: {name_old}）"

src/models.py

@@ -105,6 +105,8 @@ async def _create_tables(pool: aiomysql.Pool):
                     `serialnum` INT DEFAULT 0 COMMENT '流水号',
                     `sub_type` TINYINT DEFAULT 0 COMMENT '1 DLD110, 2 PD132',
                     `str_type` VARCHAR(30) DEFAULT '',
+                    `test_mode` TINYINT DEFAULT 0 COMMENT '0 灵敏度测试, 1 波动测试',
+                    `data_source` CHAR(2) DEFAULT 'B2' COMMENT '数据来源 B2/B4',
                     `iffinish` VARCHAR(5) DEFAULT '' COMMENT '是否完成',
                     `fault_info` VARCHAR(100) DEFAULT '',
                     `relay_out` VARCHAR(24) DEFAULT '',
@@ -116,6 +118,15 @@ async def _create_tables(pool: aiomysql.Pool):
                     `exit_dist` INT DEFAULT 0,
                     `enter_speed` INT DEFAULT 0,
                     `exit_speed` INT DEFAULT 0,
+                    `remain_count` INT DEFAULT 0 COMMENT '剩余波动次数 (B4)',
+                    `work_freq` FLOAT DEFAULT 0 COMMENT '工作频率 Hz (B4)',
+                    `curr_dist` INT DEFAULT 0 COMMENT '当前距离 mm (B4)',
+                    `speed` INT DEFAULT 0 COMMENT '当前速度 dm/s (B4)',
+                    `near_dist` INT DEFAULT 0 COMMENT '波动最近距离 mm (B4)',
+                    `far_dist` INT DEFAULT 0 COMMENT '波动最远距离 mm (B4)',
+                    `b4_enter_dist` INT DEFAULT 0 COMMENT 'B4 进入高度 mm',
+                    `b4_leave_dist` INT DEFAULT 0 COMMENT 'B4 离开高度 mm',
+                    `relay_code` TINYINT DEFAULT 0 COMMENT '继电器原始值 (0x00-0x03)',
                     `create_time` DATETIME DEFAULT CURRENT_TIMESTAMP,
                     INDEX `idx_dnt_id` (`dnt_id`)
                 ) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4
@@ -141,7 +152,7 @@ async def _create_tables(pool: aiomysql.Pool):
                     `id` INT AUTO_INCREMENT PRIMARY KEY,
                     `username` VARCHAR(45) UNIQUE NOT NULL,
                     `password_hash` VARCHAR(256) NOT NULL,
-                    `role` VARCHAR(20) DEFAULT 'operator' COMMENT 'admin/operator',
+                    `role` VARCHAR(20) DEFAULT 'operator' COMMENT 'admin/manager/operator/analyst',
                     `is_active` TINYINT DEFAULT 1,
                     `create_time` DATETIME DEFAULT CURRENT_TIMESTAMP
                 ) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4
@@ -154,7 +165,7 @@ async def _create_tables(pool: aiomysql.Pool):
                     `dnt_id` INT NOT NULL COMMENT 'FK → dnt_info.id',
                     `Addr` TINYINT DEFAULT 1 COMMENT '工装设备地址',
                     `DevType` TINYINT DEFAULT 0 COMMENT '被检设备型号类型编码',
-                    `TestMode` TINYINT DEFAULT 0 COMMENT '0 灵敏度测试, 1 模拟过车',
+                    `TestMode` TINYINT DEFAULT 0 COMMENT '0 灵敏度测试, 1 波动测试',
                     `RestDis` INT DEFAULT 0 COMMENT '复位距离 cm',
                     `MinusDis` INT DEFAULT 0 COMMENT '皮距/开始距离 cm',
                     `SensMin` INT DEFAULT 0 COMMENT '灵敏度最小值',
@@ -163,12 +174,55 @@ async def _create_tables(pool: aiomysql.Pool):
                     `FreMax` INT DEFAULT 0 COMMENT '频率最大值 Hz',
                     `PeakMin` INT DEFAULT 0 COMMENT '峰峰值最小值',
                     `PeakMax` INT DEFAULT 0 COMMENT '峰峰值最大值',
+                    `FarTol` INT DEFAULT 0 COMMENT '最远容差 cm (V2.0.3)',
+                    `NearTol` INT DEFAULT 0 COMMENT '最近容差 cm (V2.0.3)',
+                    `StepTol` INT DEFAULT 0 COMMENT '步进容差 cm (V2.0.3)',
+                    `BackForth` INT DEFAULT 0 COMMENT '来回次数 (V2.0.3)',
+                    `NearStay` INT DEFAULT 0 COMMENT '最近停留时间 ms (V2.0.3)',
+                    `FarStay` INT DEFAULT 0 COMMENT '最远停留时间 ms (V2.0.3)',
                     `create_time` DATETIME DEFAULT CURRENT_TIMESTAMP,
                     `update_time` DATETIME DEFAULT CURRENT_TIMESTAMP ON UPDATE CURRENT_TIMESTAMP,
                     UNIQUE INDEX `idx_dnt_id` (`dnt_id`)
                 ) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4
             """)
 
+            # V2.0.3 迁移：为旧表补充波动测试参数字段
+            for col, col_def in [
+                ("FarTol", "INT DEFAULT 0 COMMENT '最远容差 cm'"),
+                ("NearTol", "INT DEFAULT 0 COMMENT '最近容差 cm'"),
+                ("StepTol", "INT DEFAULT 0 COMMENT '步进容差 cm'"),
+                ("BackForth", "INT DEFAULT 0 COMMENT '来回次数'"),
+                ("NearStay", "INT DEFAULT 0 COMMENT '最近停留时间 ms'"),
+                ("FarStay", "INT DEFAULT 0 COMMENT '最远停留时间 ms'"),
+            ]:
+                try:
+                    await cur.execute(
+                        f"ALTER TABLE `tb_fixture_param` ADD COLUMN `{col}` {col_def}"
+                    )
+                except Exception:
+                    pass  # 列已存在，忽略
+
+            # V2.0.4 迁移：tb_state_tst 增加波动测试字段
+            for col, col_def in [
+                ("test_mode", "TINYINT DEFAULT 0 COMMENT '0 灵敏度, 1 波动测试'"),
+                ("data_source", "CHAR(2) DEFAULT 'B2' COMMENT 'B2/B4'"),
+                ("remain_count", "INT DEFAULT 0 COMMENT '剩余波动次数'"),
+                ("work_freq", "FLOAT DEFAULT 0 COMMENT '工作频率 Hz'"),
+                ("curr_dist", "INT DEFAULT 0 COMMENT '当前距离 mm'"),
+                ("speed", "INT DEFAULT 0 COMMENT '当前速度 dm/s'"),
+                ("near_dist", "INT DEFAULT 0 COMMENT '波动最近距离 mm'"),
+                ("far_dist", "INT DEFAULT 0 COMMENT '波动最远距离 mm'"),
+                ("b4_enter_dist", "INT DEFAULT 0 COMMENT 'B4 进入高度 mm'"),
+                ("b4_leave_dist", "INT DEFAULT 0 COMMENT 'B4 离开高度 mm'"),
+                ("relay_code", "TINYINT DEFAULT 0 COMMENT '继电器原始值 0x00-0x03'"),
+            ]:
+                try:
+                    await cur.execute(
+                        f"ALTER TABLE `tb_state_tst` ADD COLUMN `{col}` {col_def}"
+                    )
+                except Exception:
+                    pass
+
             # 7. 车检器测试基准参数表
             await cur.execute("""
                 CREATE TABLE IF NOT EXISTS `tb_vechicle_base_test` (
@@ -205,6 +259,100 @@ async def _create_tables(pool: aiomysql.Pool):
                 ) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4
             """)
 
+            # 9. 线圈参数表
+            await cur.execute("""
+                CREATE TABLE IF NOT EXISTS `tb_coil_info` (
+                    `id` INT AUTO_INCREMENT PRIMARY KEY,
+                    `coil_num` VARCHAR(45) DEFAULT '' COMMENT '线圈编号',
+                    `name` VARCHAR(100) DEFAULT '' COMMENT '名称',
+                    `induct` FLOAT DEFAULT 0 COMMENT '电感量',
+                    `shape` VARCHAR(20) DEFAULT '' COMMENT '形状（矩形、圆形等）',
+                    `length` FLOAT DEFAULT 0 COMMENT '长 cm（矩形有效）',
+                    `width` FLOAT DEFAULT 0 COMMENT '宽 cm（矩形有效）',
+                    `radius` FLOAT DEFAULT 0 COMMENT '半径 cm（圆形有效）',
+                    `turns` INT DEFAULT 0 COMMENT '圈数',
+                    `resistance` FLOAT DEFAULT 0 COMMENT '电阻 欧姆',
+                    `material` VARCHAR(50) DEFAULT '' COMMENT '材质',
+                    `remark` VARCHAR(500) DEFAULT '' COMMENT '备注',
+                    `create_time` DATETIME DEFAULT CURRENT_TIMESTAMP,
+                    `update_time` DATETIME DEFAULT CURRENT_TIMESTAMP ON UPDATE CURRENT_TIMESTAMP
+                ) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4
+            """)
+
+            # 10. 模拟车辆参数表
+            await cur.execute("""
+                CREATE TABLE IF NOT EXISTS `tb_simulate_car` (
+                    `id` INT AUTO_INCREMENT PRIMARY KEY,
+                    `simulate_num` VARCHAR(45) DEFAULT '' COMMENT '模拟编号',
+                    `name` VARCHAR(100) DEFAULT '' COMMENT '名称',
+                    `shape` VARCHAR(20) DEFAULT '' COMMENT '形状（矩形、圆形等）',
+                    `length` FLOAT DEFAULT 0 COMMENT '长 cm（矩形有效）',
+                    `width` FLOAT DEFAULT 0 COMMENT '宽 cm（矩形有效）',
+                    `radius` FLOAT DEFAULT 0 COMMENT '半径 cm（圆形有效）',
+                    `material` VARCHAR(50) DEFAULT '' COMMENT '材质（铁板、合金等）',
+                    `remark` VARCHAR(500) DEFAULT '' COMMENT '备注',
+                    `create_time` DATETIME DEFAULT CURRENT_TIMESTAMP,
+                    `update_time` DATETIME DEFAULT CURRENT_TIMESTAMP ON UPDATE CURRENT_TIMESTAMP
+                ) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4
+            """)
+
+            # V2.1.0 迁移：tb_fixture_param 增加线圈/模拟车辆关联
+            for col, col_def in [
+                ("coil_id", "INT DEFAULT NULL COMMENT 'FK → tb_coil_info.id'"),
+                ("simulate_car_id", "INT DEFAULT NULL COMMENT 'FK → tb_simulate_car.id'"),
+            ]:
+                try:
+                    await cur.execute(
+                        f"ALTER TABLE `tb_fixture_param` ADD COLUMN `{col}` {col_def}"
+                    )
+                except Exception:
+                    pass
+
+            # V2.1.0 迁移：tb_state_tst 增加线圈/模拟车辆关联
+            for col, col_def in [
+                ("coil_id", "INT DEFAULT NULL COMMENT 'FK → tb_coil_info.id'"),
+                ("simulate_car_id", "INT DEFAULT NULL COMMENT 'FK → tb_simulate_car.id'"),
+            ]:
+                try:
+                    await cur.execute(
+                        f"ALTER TABLE `tb_state_tst` ADD COLUMN `{col}` {col_def}"
+                    )
+                except Exception:
+                    pass
+
+            # 11. 设备事件日志表
+            await cur.execute("""
+                CREATE TABLE IF NOT EXISTS `tb_device_log` (
+                    `id` INT AUTO_INCREMENT PRIMARY KEY,
+                    `device_serial` VARCHAR(45) NOT NULL COMMENT '设备序列号',
+                    `device_ip` VARCHAR(45) DEFAULT '' COMMENT '设备IP',
+                    `event_type` VARCHAR(30) NOT NULL COMMENT 'login/online/offline/poor',
+                    `event_content` VARCHAR(500) DEFAULT '' COMMENT '事件详情',
+                    `create_time` DATETIME DEFAULT CURRENT_TIMESTAMP,
+                    INDEX `idx_serial` (`device_serial`),
+                    INDEX `idx_event_type` (`event_type`),
+                    INDEX `idx_create_time` (`create_time`)
+                ) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4
+            """)
+
+            # V2.2.0 迁移：扩展 dnt_info 状态值（0=离线 1=在线 2=通信不良）
+            try:
+                await cur.execute(
+                    "ALTER TABLE dnt_info MODIFY COLUMN `state` TINYINT DEFAULT 0 "
+                    "COMMENT '0 offline, 1 online, 2 poor'"
+                )
+            except Exception:
+                pass
+
+            # V2.3.0 迁移：tb_user 角色增加 manager
+            try:
+                await cur.execute(
+                    "ALTER TABLE tb_user MODIFY COLUMN `role` VARCHAR(20) DEFAULT 'operator' "
+                    "COMMENT 'admin/manager/operator/analyst'"
+                )
+            except Exception:
+                pass
+
             logger.info("数据库表初始化完成")
 
 
@@ -322,30 +470,102 @@ async def upsert_dnt(serial: str, ip: str, port: int, mac: str,
                 return cur.lastrowid
 
 
+async def get_fixture_coil_car_ids(dnt_id: int) -> tuple[int | None, int | None]:
+    """从 tb_fixture_param 获取当前线圈和模拟车辆关联 ID"""
+    pool = await get_pool()
+    async with pool.acquire() as conn:
+        async with conn.cursor(aiomysql.DictCursor) as cur:
+            await cur.execute(
+                "SELECT coil_id, simulate_car_id FROM tb_fixture_param WHERE dnt_id=%s",
+                (dnt_id,),
+            )
+            row = await cur.fetchone()
+            if row:
+                return row.get("coil_id"), row.get("simulate_car_id")
+            return None, None
+
+
+async def get_fixture_dev_type(dnt_id: int) -> int:
+    """从 tb_fixture_param 获取被检设备型号类型编码 (DevType)"""
+    pool = await get_pool()
+    async with pool.acquire() as conn:
+        async with conn.cursor() as cur:
+            await cur.execute(
+                "SELECT DevType FROM tb_fixture_param WHERE dnt_id=%s",
+                (dnt_id,),
+            )
+            row = await cur.fetchone()
+            return row[0] if row else 0
+
+
 async def insert_test_result(dnt_id: int, dpg430_addr: int, pcnum: str,
                              serialnum: int, sub_type: int, str_type: str,
                              iffinish: str, fault_info: str, relay_out: str,
                              ppvalue: float, idle_freq: float, enter_freq: float,
                              exit_freq: float, enter_dist: int, exit_dist: int,
-                             enter_speed: int, exit_speed: int):
+                             enter_speed: int, exit_speed: int,
+                             test_mode: int = 0, data_source: str = "B2",
+                             relay_code: int = 0):
     """插入测试结果到 tb_state_tst"""
+    coil_id, simulate_car_id = await get_fixture_coil_car_ids(dnt_id)
     pool = await get_pool()
     async with pool.acquire() as conn:
         async with conn.cursor() as cur:
             await cur.execute(
                 """INSERT INTO tb_state_tst
                    (dnt_id, dpg430_addr, pcnum, serialnum, sub_type, str_type,
+                    test_mode, data_source,
                     iffinish, fault_info, relay_out, ppvalue, idle_freq,
-                    enter_freq, exit_freq, enter_dist, exit_dist, enter_speed, exit_speed)
-                   VALUES (%s,%s,%s,%s,%s,%s,%s,%s,%s,%s,%s,%s,%s,%s,%s,%s,%s)""",
+                    enter_freq, exit_freq, enter_dist, exit_dist, enter_speed, exit_speed,
+                    relay_code, coil_id, simulate_car_id)
+                   VALUES (%s,%s,%s,%s,%s,%s,%s,%s,%s,%s,%s,%s,%s,%s,%s,%s,%s,%s,%s,%s,%s,%s)""",
                 (dnt_id, dpg430_addr, pcnum, serialnum, sub_type, str_type,
+                 test_mode, data_source,
                  iffinish, fault_info, relay_out, ppvalue, idle_freq,
-                 enter_freq, exit_freq, enter_dist, exit_dist, enter_speed, exit_speed),
+                 enter_freq, exit_freq, enter_dist, exit_dist, enter_speed, exit_speed,
+                 relay_code, coil_id, simulate_car_id),
             )
 
 
+async def insert_wave_data(dnt_id: int, dpg430_addr: int,
+                           remain_count: int, relay_code: int,
+                           work_freq: float, curr_dist: int, speed: int,
+                           near_dist: int, far_dist: int,
+                           enter_dist: int, leave_dist: int,
+                           relay_out: str = ""):
+    """插入 0xB4 波动测试上报数据到 tb_state_tst"""
+    coil_id, simulate_car_id = await get_fixture_coil_car_ids(dnt_id)
+    dev_type = await get_fixture_dev_type(dnt_id)
+    dev_model_map = {1: "PD132", 2: "DLD110"}
+    str_type = dev_model_map.get(dev_type, f"Unknown({dev_type})") if dev_type else ""
+    pool = await get_pool()
+    async with pool.acquire() as conn:
+        async with conn.cursor() as cur:
+            await cur.execute(
+                """INSERT INTO tb_state_tst
+                   (dnt_id, dpg430_addr, sub_type, str_type,
+                    test_mode, data_source,
+                    relay_out, relay_code,
+                    remain_count, work_freq, curr_dist, speed,
+                    near_dist, far_dist, b4_enter_dist, b4_leave_dist,
+                    coil_id, simulate_car_id)
+                   VALUES (%s,%s,%s,%s,%s,%s,%s,%s,%s,%s,%s,%s,%s,%s,%s,%s,%s,%s)""",
+                (dnt_id, dpg430_addr, dev_type, str_type,
+                 1, "B4",
+                 relay_out, relay_code,
+                 remain_count, work_freq, curr_dist, speed,
+                 near_dist, far_dist, enter_dist, leave_dist,
+                 coil_id, simulate_car_id),
+            )
+    logger.info(
+        f"B4波动数据已存储 dnt_id={dnt_id} relay=0x{relay_code:02X} "
+        f"剩余={remain_count} 当前距离={curr_dist}mm 速度={speed}dm/s"
+        f" 最近={near_dist}mm 最远={far_dist}mm"
+    )
+
+
 async def set_device_offline(serial: str):
-    """标记设备离线"""
+    """标记设备离线（保持向后兼容）"""
     pool = await get_pool()
     async with pool.acquire() as conn:
         async with conn.cursor() as cur:
@@ -355,6 +575,56 @@ async def set_device_offline(serial: str):
             )
 
 
+# ─── tb_device_log + 设备状态 ───────────────────────────────────────
+
+async def insert_device_log(serial: str, ip: str, event_type: str,
+                            content: str = ""):
+    """插入设备事件日志"""
+    pool = await get_pool()
+    async with pool.acquire() as conn:
+        async with conn.cursor() as cur:
+            await cur.execute(
+                "INSERT INTO tb_device_log (device_serial, device_ip, "
+                "event_type, event_content) VALUES (%s,%s,%s,%s)",
+                (serial, ip, event_type, content),
+            )
+
+
+async def update_device_status(serial: str, state: int):
+    """更新 dnt_info 设备状态（0=离线 1=在线 2=通信不良）"""
+    pool = await get_pool()
+    async with pool.acquire() as conn:
+        async with conn.cursor() as cur:
+            if state == 0:
+                await cur.execute(
+                    "UPDATE dnt_info SET state=0, last_off=NOW() "
+                    "WHERE serial=%s AND state != 0",
+                    (serial,),
+                )
+            elif state == 1:
+                await cur.execute(
+                    "UPDATE dnt_info SET state=1, last_login=NOW() "
+                    "WHERE serial=%s AND state != 1",
+                    (serial,),
+                )
+            else:
+                await cur.execute(
+                    "UPDATE dnt_info SET state=%s WHERE serial=%s",
+                    (state, serial),
+                )
+
+
+async def get_all_device_serials() -> list[tuple[str, int, str]]:
+    """获取所有设备 (serial, state, ip)，用于状态扫描"""
+    pool = await get_pool()
+    async with pool.acquire() as conn:
+        async with conn.cursor() as cur:
+            await cur.execute(
+                "SELECT serial, state, ip FROM dnt_info ORDER BY id"
+            )
+            return await cur.fetchall()
+
+
 # ─── tb_serialnet CRUD ─────────────────────────────────────────────
 
 async def get_pending_serialnet(dnt_id: int) -> dict | None:
@@ -479,6 +749,7 @@ async def upsert_fixture_param(dnt_id: int, **kwargs):
             fields = [
                 "Addr", "DevType", "TestMode", "RestDis", "MinusDis",
                 "SensMin", "SensMax", "FreMin", "FreMax", "PeakMin", "PeakMax",
+                "FarTol", "NearTol", "StepTol", "BackForth", "NearStay", "FarStay",
             ]
             if existing:
                 sets = ", ".join(f"`{f}`=%s" for f in fields)

src/server.py

@@ -34,8 +34,10 @@ from src.handlers import (
     parse_loop,
     serialnet_loop,
     serialnet_response_loop,
+    device_status_monitor,
     set_udp_sender,
 )
+from src.models import insert_device_log
 
 logging.basicConfig(
     level=getattr(logging, LOG_LEVEL),
@@ -74,6 +76,7 @@ class EDCProtocol:
         logger.info(f"UDP {msg} from {addr}")
 
         method = msg.get("Method", "")
+        method_lower = method.lower()
         logger.debug(f"UDP {method} from {addr}")
 
         try:
@@ -81,11 +84,11 @@ class EDCProtocol:
             if method == "Count_Off":
                 # 设备登录上报，只处理不回复
                 await handle_count_off(msg, addr)
-            elif method == "Heartbeat":
+            elif method_lower == "heartbeat":
                 response = await handle_heartbeat(msg)
-            elif method == "TSReport":
+            elif method_lower == "tsreport":
                 response = await handle_tsreport(msg)
-            elif method == "SerialNet":
+            elif method_lower == "serialnet":
                 response = await handle_serial_net(msg)
 
             if response and self.transport:
@@ -104,24 +107,36 @@ async def handle_tcp_client(reader: asyncio.StreamReader,
       - 紧凑 JSON (无换行)
     """
     addr = writer.get_extra_info("peername")
+    addr_ip = addr[0] if addr else ""
     logger.info(f"TCP 连接: {addr}")
 
+    # TCP 连接事件日志
+    try:
+        asyncio.ensure_future(insert_device_log(
+            serial="", ip=addr_ip,
+            event_type="tcp_connect",
+            content=f"TCP 连接: {addr}",
+        ))
+    except Exception:
+        pass
+
     buffer = b""
 
     async def process_message(msg: dict):
         """处理单条消息并返回响应文本"""
         logger.info(f"TCP get_rcv {msg} from {addr}") 
         method = msg.get("Method", "")
+        method_lower = method.lower()
         logger.debug(f"TCP {method} from {addr}")
 
         try:
-            if method == "TimeStamp":
+            if method_lower == "timestamp":
                 return handle_timestamp(msg)
-            elif method == "TSReport":
+            elif method_lower == "tsreport":
                 return await handle_tsreport(msg)
-            elif method == "SerialNet":
+            elif method_lower == "serialnet":
                 return await handle_serial_net(msg)
-            elif method == "Heartbeat":
+            elif method_lower == "heartbeat":
                 return await handle_heartbeat(msg)
             else:
                 logger.debug(f"TCP 未知方法: {method}")
@@ -175,6 +190,15 @@ async def handle_tcp_client(reader: asyncio.StreamReader,
         pass
     finally:
         logger.info(f"TCP 断开: {addr}")
+        # TCP 断开事件日志
+        try:
+            asyncio.ensure_future(insert_device_log(
+                serial="", ip=addr_ip,
+                event_type="tcp_disconnect",
+                content=f"TCP 断开: {addr}",
+            ))
+        except Exception:
+            pass
         writer.close()
         await writer.wait_closed()
 
@@ -187,6 +211,7 @@ async def main():
     asyncio.create_task(parse_loop())
     asyncio.create_task(serialnet_loop())
     asyncio.create_task(serialnet_response_loop())
+    asyncio.create_task(device_status_monitor())
 
     loop = asyncio.get_running_loop()