From 5948dbaaf5a4365512cc9f9e18458922cd422baa Mon Sep 17 00:00:00 2001 From: "WIN-20230613SRA\\Administrator" <871066422@qq.com> Date: Wed, 8 Jul 2026 16:50:59 +0800 Subject: [PATCH] =?UTF-8?q?=E5=A2=9E=E5=8A=A02=E4=BB=A3=E6=B5=81=E9=87=8F?= =?UTF-8?q?=E4=BC=A0=E6=84=9F=E5=99=A8=E7=9A=84=E6=95=B0=E6=8D=AE=E6=8D=A2?= =?UTF-8?q?=E7=AE=97?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- powerbus_service/sensor.py | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/powerbus_service/sensor.py b/powerbus_service/sensor.py index 15f6e89..ae6ad96 100644 --- a/powerbus_service/sensor.py +++ b/powerbus_service/sensor.py @@ -206,11 +206,12 @@ class SensorService: return 0.0 return 50 * 1000.0 * 60 * 10 / 660 / freq - def wsu_get_flow_rate_g2(self, freq): + def wsu_get_flow_rate_g2(self, freq, factor): """计算WSU流量""" if freq == 0: return 0.0 - return 50 * 1000.0 * 60 * 10 / 660 / freq + + return freq * 60 / factor def handle_wsu_data(self, device, regs): """处理WSU数据""" @@ -229,7 +230,8 @@ class SensorService: flow_rate = self.wsu_get_flow_rate_g1(flow_rate) water_temp = self.wsu_get_temperature(water_temp * 2) elif generation == "2": - flow_rate = self.wsu_get_flow_rate_g2(flow_rate) + factor = device.get("factor", 6000) + flow_rate = self.wsu_get_flow_rate_g2(flow_rate, factor) water_temp = self.wsu_get_temperature(water_temp * 2) return flow_rate, water_temp