新增 scheme 表下的字段 scheme_type scheme_name

timescaledb/router.py

@@ -168,19 +168,21 @@ async def insert_scheme_links(
 
 @router.get("/scheme/links")
 async def get_scheme_links(
-    scheme: str,
+    scheme_type: str,
+    scheme_name: str,
     start_time: datetime,
     end_time: datetime,
     conn: AsyncConnection = Depends(get_database_connection),
 ):
     return await SchemeRepository.get_links_by_scheme_and_time_range(
-        conn, scheme, start_time, end_time
+        conn, scheme_type, scheme_name, start_time, end_time
     )
 
 
 @router.get("/scheme/links/{link_id}/field")
 async def get_scheme_link_field(
-    scheme: str,
+    scheme_type: str,
+    scheme_name: str,
     link_id: str,
     start_time: datetime,
     end_time: datetime,
@@ -189,7 +191,7 @@ async def get_scheme_link_field(
 ):
     try:
         return await SchemeRepository.get_link_field_by_scheme_and_time_range(
-            conn, scheme, start_time, end_time, link_id, field
+            conn, scheme_type, scheme_name, start_time, end_time, link_id, field
         )
     except ValueError as e:
         raise HTTPException(status_code=400, detail=str(e))
@@ -197,7 +199,8 @@ async def get_scheme_link_field(
 
 @router.patch("/scheme/links/{link_id}/field")
 async def update_scheme_link_field(
-    scheme: str,
+    scheme_type: str,
+    scheme_name: str,
     link_id: str,
     time: datetime,
     field: str,
@@ -206,7 +209,7 @@ async def update_scheme_link_field(
 ):
     try:
         await SchemeRepository.update_link_field(
-            conn, time, scheme, link_id, field, value
+            conn, time, scheme_type, scheme_name, link_id, field, value
         )
         return {"message": "Updated successfully"}
     except ValueError as e:
@@ -215,13 +218,14 @@ async def update_scheme_link_field(
 
 @router.delete("/scheme/links")
 async def delete_scheme_links(
-    scheme: str,
+    scheme_type: str,
+    scheme_name: str,
     start_time: datetime,
     end_time: datetime,
     conn: AsyncConnection = Depends(get_database_connection),
 ):
     await SchemeRepository.delete_links_by_scheme_and_time_range(
-        conn, scheme, start_time, end_time
+        conn, scheme_type, scheme_name, start_time, end_time
     )
     return {"message": "Deleted successfully"}
 
@@ -236,7 +240,8 @@ async def insert_scheme_nodes(
 
 @router.get("/scheme/nodes/{node_id}/field")
 async def get_scheme_node_field(
-    scheme: str,
+    scheme_type: str,
+    scheme_name: str,
     node_id: str,
     start_time: datetime,
     end_time: datetime,
@@ -245,7 +250,7 @@ async def get_scheme_node_field(
 ):
     try:
         return await SchemeRepository.get_node_field_by_scheme_and_time_range(
-            conn, scheme, start_time, end_time, node_id, field
+            conn, scheme_type, scheme_name, start_time, end_time, node_id, field
         )
     except ValueError as e:
         raise HTTPException(status_code=400, detail=str(e))
@@ -253,7 +258,8 @@ async def get_scheme_node_field(
 
 @router.patch("/scheme/nodes/{node_id}/field")
 async def update_scheme_node_field(
-    scheme: str,
+    scheme_type: str,
+    scheme_name: str,
     node_id: str,
     time: datetime,
     field: str,
@@ -262,7 +268,7 @@ async def update_scheme_node_field(
 ):
     try:
         await SchemeRepository.update_node_field(
-            conn, time, scheme, node_id, field, value
+            conn, time, scheme_type, scheme_name, node_id, field, value
         )
         return {"message": "Updated successfully"}
     except ValueError as e:
@@ -271,20 +277,22 @@ async def update_scheme_node_field(
 
 @router.delete("/scheme/nodes")
 async def delete_scheme_nodes(
-    scheme: str,
+    scheme_type: str,
+    scheme_name: str,
     start_time: datetime,
     end_time: datetime,
     conn: AsyncConnection = Depends(get_database_connection),
 ):
     await SchemeRepository.delete_nodes_by_scheme_and_time_range(
-        conn, scheme, start_time, end_time
+        conn, scheme_type, scheme_name, start_time, end_time
     )
     return {"message": "Deleted successfully"}
 
 
 @router.post("/scheme/simulation/store", status_code=201)
 async def store_scheme_simulation_result(
-    scheme: str,
+    scheme_type: str,
+    scheme_name: str,
     node_result_list: List[dict],
     link_result_list: List[dict],
     result_start_time: str,
@@ -292,14 +300,20 @@ async def store_scheme_simulation_result(
 ):
     """Store scheme simulation results to TimescaleDB"""
     await SchemeRepository.store_scheme_simulation_result(
-        conn, scheme, node_result_list, link_result_list, result_start_time
+        conn,
+        scheme_type,
+        scheme_name,
+        node_result_list,
+        link_result_list,
+        result_start_time,
     )
     return {"message": "Scheme simulation results stored successfully"}
 
 
 @router.get("/scheme/query/by-scheme-time-property")
 async def query_scheme_records_by_scheme_time_property(
-    scheme: str,
+    scheme_type: str,
+    scheme_name: str,
     query_time: str,
     type: str,
     property: str,
@@ -308,7 +322,7 @@ async def query_scheme_records_by_scheme_time_property(
     """Query all scheme records by scheme, time and property"""
     try:
         return await SchemeRepository.query_all_record_by_scheme_time_property(
-            conn, scheme, query_time, type, property
+            conn, scheme_type, scheme_name, query_time, type, property
         )
     except ValueError as e:
         raise HTTPException(status_code=400, detail=str(e))
@@ -316,7 +330,8 @@ async def query_scheme_records_by_scheme_time_property(
 
 @router.get("/scheme/query/by-id-time")
 async def query_scheme_simulation_by_id_time(
-    scheme: str,
+    scheme_type: str,
+    scheme_name: str,
     ID: str,
     type: str,
     query_time: str,
@@ -325,7 +340,7 @@ async def query_scheme_simulation_by_id_time(
     """Query scheme simulation results by ID and time"""
     try:
         return await SchemeRepository.query_scheme_simulation_result_by_ID_time(
-            conn, scheme, ID, type, query_time
+            conn, scheme_type, scheme_name, ID, type, query_time
         )
     except ValueError as e:
         raise HTTPException(status_code=400, detail=str(e))