补全 realtime scheme 中的复合 存储、查询方法

This commit is contained in:
JIANG
2025-12-05 10:52:04 +08:00
parent ef2ad7e107
commit 03e2fb9fd8
7 changed files with 910 additions and 275 deletions

View File

@@ -227,7 +227,7 @@ async def delete_scheme_nodes(
async def insert_scada_data(
data: List[dict], conn: AsyncConnection = Depends(get_database_connection)
):
await ScadaRepository.insert_batch(conn, data)
await ScadaRepository.insert_scada_batch(conn, data)
return {"message": f"Inserted {len(data)} records"}
@@ -238,18 +238,23 @@ async def get_scada_data(
end_time: datetime,
conn: AsyncConnection = Depends(get_database_connection),
):
return await ScadaRepository.get_data_by_time(conn, device_id, start_time, end_time)
return await ScadaRepository.get_scada_by_id_time_range(
conn, device_id, start_time, end_time
)
@router.get("/scada/{device_id}/field")
async def get_scada_field(
device_id: str,
time: datetime,
start_time: datetime,
end_time: datetime,
field: str,
conn: AsyncConnection = Depends(get_database_connection),
):
try:
return await ScadaRepository.get_field(conn, time, device_id, field)
return await ScadaRepository.get_scada_field_by_id_time_range(
conn, device_id, start_time, end_time, field
)
except ValueError as e:
raise HTTPException(status_code=400, detail=str(e))
@@ -263,7 +268,7 @@ async def update_scada_field(
conn: AsyncConnection = Depends(get_database_connection),
):
try:
await ScadaRepository.update_field(conn, time, device_id, field, value)
await ScadaRepository.update_scada_field(conn, time, device_id, field, value)
return {"message": "Updated successfully"}
except ValueError as e:
raise HTTPException(status_code=400, detail=str(e))
@@ -276,5 +281,5 @@ async def delete_scada_data(
end_time: datetime,
conn: AsyncConnection = Depends(get_database_connection),
):
await ScadaRepository.delete_data_by_time(conn, device_id, start_time, end_time)
await ScadaRepository.delete_scada_by_id_time(conn, device_id, start_time, end_time)
return {"message": "Deleted successfully"}