OrgTJWater/TJWaterServer
2
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Refine

Browse Source
This commit is contained in:
DingZQ
2025-03-22 15:16:22 +08:00
parent 360a3eae94
commit cbcf964c23
1 changed files with 2 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
influxdb_api.py
View File

@@ -1453,11 +1453,12 @@ def query_SCADA_data_by_device_ID_and_timerange(query_ids_list: List[str], start
beijing_end_time = datetime.fromisoformat(end_time) beijing_end_time = datetime.fromisoformat(end_time)
utc_end_time = beijing_end_time.astimezone(timezone.utc) + timedelta(seconds=1) utc_end_time = beijing_end_time.astimezone(timezone.utc) + timedelta(seconds=1)
print(utc_end_time) print(utc_end_time)
# |> range(start: {utc_start_time.isoformat()}, stop: {utc_end_time.isoformat()})
SCADA_dict = {} SCADA_dict = {}
for device_id in query_ids_list: for device_id in query_ids_list:
flux_query = f''' flux_query = f'''
from(bucket: "{bucket}") from(bucket: "{bucket}")
|> 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") |> filter(fn: (r) => r["_measurement"] == "SCADA_data" and r["device_ID"] = {device_id} and r["_field"] == "monitored_value")
|> pivot(rowKey: ["_time"], columnKey: ["device_ID"], valueColumn: "_value") |> pivot(rowKey: ["_time"], columnKey: ["device_ID"], valueColumn: "_value")
|> sort(columns: ["_time"]) |> sort(columns: ["_time"])