wangfq/edc_server
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

fix: 0xB4 继电器 relay_out 字段与 0xB2 使用相同格式

Browse Source 
之前 insert_wave_data 的 relay_out 被硬编码为空字符串，
decode_relay_info 的计算结果未写入。现在增加参数 relay_out
并传入格式化后的继电器状态字符串。
This commit is contained in:
wangfq
2026-06-10 17:27:38 +08:00
parent 944870496a
commit cdddfac609
2 changed files with 4 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
src/handlers.py
View File

@@ -387,6 +387,7 @@ async def parse_loop():
dpg430_addr=wave.addr, dpg430_addr=wave.addr,
remain_count=wave.remain_count, remain_count=wave.remain_count,
relay_code=wave.relay_out, relay_code=wave.relay_out,
relay_out=relay_info,
work_freq=wave.work_freq, work_freq=wave.work_freq,
curr_dist=wave.curr_dist, curr_dist=wave.curr_dist,
speed=wave.speed, speed=wave.speed,

5
src/models.py
View File

@@ -522,7 +522,8 @@ async def insert_wave_data(dnt_id: int, dpg430_addr: int,
remain_count: int, relay_code: int, remain_count: int, relay_code: int,
work_freq: float, curr_dist: int, speed: int, work_freq: float, curr_dist: int, speed: int,
near_dist: int, far_dist: 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""" """插入 0xB4 波动测试上报数据到 tb_state_tst"""
coil_id, simulate_car_id = await get_fixture_coil_car_ids(dnt_id) coil_id, simulate_car_id = await get_fixture_coil_car_ids(dnt_id)
dev_type = await get_fixture_dev_type(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)""", 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, (dnt_id, dpg430_addr, dev_type, str_type,
1, "B4", 1, "B4",
"", relay_code, relay_out, relay_code,
remain_count, work_freq, curr_dist, speed, remain_count, work_freq, curr_dist, speed,
near_dist, far_dist, enter_dist, leave_dist, near_dist, far_dist, enter_dist, leave_dist,
coil_id, simulate_car_id), coil_id, simulate_car_id),