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),