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