diff --git a/main.py b/main.py index ff7b3af..f700262 100644 --- a/main.py +++ b/main.py @@ -2119,20 +2119,13 @@ async def query_node_curve_by_id_property_daterange(id: str, prop: str, startdat async def query_link_curve_by_id_property_daterange(id: str, prop: str, startdate: str, enddate: str): return influxdb_api.query_curve_by_ID_property_daterange(id, type='link', property=prop, start_date=startdate, end_date=enddate, client=influx_client) +# ids 用,隔开 # 返回 { 'id': value1, 'id2': value2 } # def query_SCADA_data_by_device_ID_and_time(query_ids_list: List[str], query_time: str, bucket: str="SCADA_data", client: InfluxDBClient=client) -> Dict[str, float]: -@app.get("/queryscadadatabydeviceidsandtime/") -async def query_scada_data_by_device_ids_and_time(ids: list[str], querytime: str): - logger.info(ids) - logger.info(querytime) - return influxdb_api.query_SCADA_data_by_device_ID_and_time(query_ids_list=ids, query_time=querytime, client=influx_client) - - - - @app.get("/queryscadadatabydeviceidandtime/") -async def query_scada_data_by_device_id_and_time(id: str, querytime: str): - return influxdb_api.query_SCADA_data_by_device_ID_and_time(query_ids_list=[id], query_time=querytime, client=influx_client) +async def query_scada_data_by_device_id_and_time(ids: str, querytime: str): + query_ids = ids.split(',') + return influxdb_api.query_SCADA_data_by_device_ID_and_time(query_ids_list=query_ids, query_time=querytime, client=influx_client)