Refine

influxdb_api.py

@@ -1454,13 +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)
 
-          # |> 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}")
           |> range(start: {utc_start_time.isoformat()}, stop: {utc_end_time.isoformat()})
+          |> filter(fn: (r) => r["device_ID"] = {device_id} and r["_field"] == "monitored_value")
           |> pivot(rowKey: ["_time"], columnKey: ["device_ID"], valueColumn: "_value")
           |> sort(columns: ["_time"])
         '''