From cdddfac60999b728fd7a6d991aafb9e1d0ed9b3d Mon Sep 17 00:00:00 2001 From: wangfq Date: Wed, 10 Jun 2026 17:27:38 +0800 Subject: [PATCH] =?UTF-8?q?fix:=200xB4=20=E7=BB=A7=E7=94=B5=E5=99=A8=20rel?= =?UTF-8?q?ay=5Fout=20=E5=AD=97=E6=AE=B5=E4=B8=8E=200xB2=20=E4=BD=BF?= =?UTF-8?q?=E7=94=A8=E7=9B=B8=E5=90=8C=E6=A0=BC=E5=BC=8F?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit 之前 insert_wave_data 的 relay_out 被硬编码为空字符串， decode_relay_info 的计算结果未写入。现在增加参数 relay_out 并传入格式化后的继电器状态字符串。 --- src/handlers.py | 1 + src/models.py | 5 +++-- 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/src/handlers.py b/src/handlers.py index a696ca7..b918a5b 100644 --- a/src/handlers.py +++ b/src/handlers.py @@ -387,6 +387,7 @@ async def parse_loop(): 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, diff --git a/src/models.py b/src/models.py index b854b55..9fdacae 100644 --- a/src/models.py +++ b/src/models.py @@ -522,7 +522,8 @@ 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): + 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) @@ -542,7 +543,7 @@ async def insert_wave_data(dnt_id: int, dpg430_addr: int, 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_code, + relay_out, relay_code, remain_count, work_freq, curr_dist, speed, near_dist, far_dist, enter_dist, leave_dist, coil_id, simulate_car_id),