From 3c8b308419f367121cef90c579a538c6753c344e Mon Sep 17 00:00:00 2001 From: DingZQ Date: Sat, 22 Mar 2025 15:17:47 +0800 Subject: [PATCH] Refine --- influxdb_api.py | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/influxdb_api.py b/influxdb_api.py index 9a5dd24..66e9130 100644 --- a/influxdb_api.py +++ b/influxdb_api.py @@ -1454,12 +1454,13 @@ def query_SCADA_data_by_device_ID_and_timerange(query_ids_list: List[str], start utc_end_time = beijing_end_time.astimezone(timezone.utc) + timedelta(seconds=1) print(utc_end_time) - # |> range(start: {utc_start_time.isoformat()}, stop: {utc_end_time.isoformat()}) + # |> filter(fn: (r) => r["_measurement"] == "SCADA_data" and r["device_ID"] = {device_id} and r["_field"] == "monitored_value") + SCADA_dict = {} for device_id in query_ids_list: flux_query = f''' from(bucket: "{bucket}") - |> filter(fn: (r) => r["_measurement"] == "SCADA_data" and r["device_ID"] = {device_id} and r["_field"] == "monitored_value") + |> range(start: {utc_start_time.isoformat()}, stop: {utc_end_time.isoformat()}) |> pivot(rowKey: ["_time"], columnKey: ["device_ID"], valueColumn: "_value") |> sort(columns: ["_time"]) '''