Compare commits
2 Commits
6434cae21c
...
dc38313cdc
| Author | SHA1 | Date | |
|---|---|---|---|
| dc38313cdc | |||
| f19962510a |
@@ -1,6 +1,5 @@
|
|||||||
from collections import defaultdict, deque
|
from collections import defaultdict, deque
|
||||||
from functools import lru_cache
|
from functools import lru_cache
|
||||||
import time
|
|
||||||
from typing import Any
|
from typing import Any
|
||||||
|
|
||||||
from app.services.tjnetwork import (
|
from app.services.tjnetwork import (
|
||||||
|
|||||||
@@ -280,6 +280,7 @@ async def fastapi_flushing_analysis(
|
|||||||
drainage_node_ID: str = Query(...),
|
drainage_node_ID: str = Query(...),
|
||||||
flush_flow: float = 0,
|
flush_flow: float = 0,
|
||||||
duration: int | None = None,
|
duration: int | None = None,
|
||||||
|
scheme_name: str | None = None,
|
||||||
) -> str:
|
) -> str:
|
||||||
valve_opening = {
|
valve_opening = {
|
||||||
valve_id: float(valves_k[idx]) for idx, valve_id in enumerate(valves)
|
valve_id: float(valves_k[idx]) for idx, valve_id in enumerate(valves)
|
||||||
@@ -291,6 +292,7 @@ async def fastapi_flushing_analysis(
|
|||||||
modify_valve_opening=valve_opening,
|
modify_valve_opening=valve_opening,
|
||||||
drainage_node_ID=drainage_node_ID,
|
drainage_node_ID=drainage_node_ID,
|
||||||
flushing_flow=flush_flow,
|
flushing_flow=flush_flow,
|
||||||
|
scheme_name=scheme_name,
|
||||||
)
|
)
|
||||||
return result or "success"
|
return result or "success"
|
||||||
|
|
||||||
|
|||||||
@@ -8,7 +8,9 @@ from .schemas.realtime import RealtimeRepository
|
|||||||
from .schemas.scheme import SchemeRepository
|
from .schemas.scheme import SchemeRepository
|
||||||
from .schemas.scada import ScadaRepository
|
from .schemas.scada import ScadaRepository
|
||||||
from .composite_queries import CompositeQueries
|
from .composite_queries import CompositeQueries
|
||||||
from app.infra.db.postgresql.database import get_database_instance as get_postgres_database_instance
|
from app.infra.db.postgresql.database import (
|
||||||
|
get_database_instance as get_postgres_database_instance,
|
||||||
|
)
|
||||||
|
|
||||||
router = APIRouter()
|
router = APIRouter()
|
||||||
|
|
||||||
@@ -152,7 +154,7 @@ async def query_realtime_simulation_by_id_time(
|
|||||||
results = await RealtimeRepository.query_simulation_result_by_id_time(
|
results = await RealtimeRepository.query_simulation_result_by_id_time(
|
||||||
conn, id, type, query_time
|
conn, id, type, query_time
|
||||||
)
|
)
|
||||||
return {"results": results}
|
return {"result": results}
|
||||||
except ValueError as e:
|
except ValueError as e:
|
||||||
raise HTTPException(status_code=400, detail=str(e))
|
raise HTTPException(status_code=400, detail=str(e))
|
||||||
|
|
||||||
|
|||||||
Reference in New Issue
Block a user