From 662d683813733543b67dd0bec7243bfaa34c3ef9 Mon Sep 17 00:00:00 2001 From: "DESKTOP-1JS6RSM\\Admin" Date: Sat, 7 Mar 2026 15:48:47 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E5=A4=8D=E5=91=8A=E8=AD=A6=E7=AD=89?= =?UTF-8?q?=E7=BA=A7=E4=BC=98=E5=85=88bug?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- iti/applications/service/iot/alert.py | 2 +- iti/applications/service/iot/influxdb_mgr.py | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/iti/applications/service/iot/alert.py b/iti/applications/service/iot/alert.py index 89099f8..43b8830 100644 --- a/iti/applications/service/iot/alert.py +++ b/iti/applications/service/iot/alert.py @@ -10,7 +10,7 @@ from iti.applications.models import ( IotNode, IotEndpoint, ) -from sqlalchemy import select, distinct +from sqlalchemy import select, distinct, desc from simpleeval import simple_eval def delete_node_alert_rule(node: IotNode): diff --git a/iti/applications/service/iot/influxdb_mgr.py b/iti/applications/service/iot/influxdb_mgr.py index 2b6d677..9b69ce8 100644 --- a/iti/applications/service/iot/influxdb_mgr.py +++ b/iti/applications/service/iot/influxdb_mgr.py @@ -140,7 +140,7 @@ class InfluxDBMgr: return self._reconnect() return True - def query_table(self, query_measurement: str, query_field: str)-> List[Dict[str, Any]]: + def query_table(self, query_measurement: str, query_field: str, rangeStr: str = "-5m")-> List[Dict[str, Any]]: """ 查询数据表，带自动重连功能 """ @@ -154,7 +154,7 @@ class InfluxDBMgr: flux_query = f''' from(bucket: "{self.bucket}") - |> range(start: -5m) + |> range(start: {rangeStr}) |> filter(fn: (r) => r._measurement == "{query_measurement}") |> filter(fn: (r) => r._field == "{query_field}") |> yield(name: "mean")