diff --git a/postgresql/scada_info.py b/postgresql/scada_info.py index b96af6b..26ed2d6 100644 --- a/postgresql/scada_info.py +++ b/postgresql/scada_info.py @@ -5,7 +5,7 @@ from psycopg import AsyncConnection class ScadaRepository: @staticmethod - async def get_scadas_info(conn: AsyncConnection) -> List[dict]: + async def get_scadas(conn: AsyncConnection) -> List[dict]: """ 查询pg数据库中,scada_info 的所有记录 :param conn: 异步数据库连接 @@ -14,7 +14,7 @@ class ScadaRepository: async with conn.cursor() as cur: await cur.execute( """ - SELECT id, type, transmission_mode, transmission_frequency, reliability + SELECT id, type, associated_element_id, transmission_mode, transmission_frequency, reliability FROM public.scada_info """ ) @@ -26,9 +26,10 @@ class ScadaRepository: record_dict = { "id": record[0], "type": record[1], - "transmission_mode": record[2], - "transmission_frequency": record[3], - "reliability": record[4], + "associated_element_id": record[2], + "transmission_mode": record[3], + "transmission_frequency": record[4], + "reliability": record[5], } records_list.append(record_dict) diff --git a/timescaledb/composite_queries.py b/timescaledb/composite_queries.py new file mode 100644 index 0000000..e69de29