diff --git a/api/s41_pipe_risk_probability.py b/api/s41_pipe_risk_probability.py index b072b78..33f0fe9 100644 --- a/api/s41_pipe_risk_probability.py +++ b/api/s41_pipe_risk_probability.py @@ -79,7 +79,7 @@ def get_pipe_risk_probability_geometries(name: str) -> dict[str, Any]: } for col in record: - if col != key_pipeId and col != key_geometry: + if col != key_geometry: pipe_risk_probability_geometries[id][col] = record[col] # print(len(pipe_risk_probability_geometries)) diff --git a/influxdb_api.py b/influxdb_api.py index 379397c..8de1528 100644 --- a/influxdb_api.py +++ b/influxdb_api.py @@ -1747,6 +1747,7 @@ def query_filling_SCADA_data_by_device_ID_and_timerange(query_ids_list: List[str print("{} -- Failed to connect to InfluxDB.".format(datetime.now().strftime('%Y-%m-%d %H:%M:%S'))) query_api = client.query_api() + print('start_time', start_time) print('end_time', end_time) # 将北京时间转换为 UTC 时间 @@ -1758,6 +1759,7 @@ def query_filling_SCADA_data_by_device_ID_and_timerange(query_ids_list: List[str print('beijing_end_time', beijing_end_time) utc_stop_time = time_api.to_utc_time(beijing_end_time) print('utc_stop_time', utc_stop_time) + SCADA_dict = {} for device_id in query_ids_list: flux_query = f'''