From 9c2ae2b6b2f2bf2fc0b3c5ed22bbe8844d1931f2 Mon Sep 17 00:00:00 2001 From: DingZQ Date: Tue, 20 Sep 2022 23:57:04 +0800 Subject: [PATCH] Change name to network --- main.py | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) diff --git a/main.py b/main.py index a6207d9..f6d4d03 100644 --- a/main.py +++ b/main.py @@ -311,12 +311,12 @@ def fastapi_set_tank_coord(name: str, tank: str, x: float, y: float) -> ChangeSe ############################################################ @app.post("/addpipe/") -def fastapi_add_pipe(name: str, pipe: str, node1: str, node2: str, length: float = 0, diameter: float = 0, roughness: float = 0, minorloss: float = 0, status: str = PIPE_STATUS_OPEN) -> ChangeSet: - return add_pipe(name, pipe, node1, node2, length, diameter, roughness, minorloss, status) +def fastapi_add_pipe(network: str, pipe: str, node1: str, node2: str, length: float = 0, diameter: float = 0, roughness: float = 0, minorloss: float = 0, status: str = PIPE_STATUS_OPEN) -> ChangeSet: + return add_pipe(network, pipe, node1, node2, length, diameter, roughness, minorloss, status) @app.post("/deletepipe/") -def fastapi_delete_pipe(name: str, pipe: str) -> ChangeSet: - return delete_pipe(name, pipe) +def fastapi_delete_pipe(network: str, pipe: str) -> ChangeSet: + return delete_pipe(network, pipe) @app.get("/getpipenode1/") def fastapi_get_pipe_node1(name: str, pipe: str) -> str | None: @@ -380,12 +380,12 @@ def fastapi_set_pipe_status(name: str, pipe: str, status: float) -> ChangeSet: ############################################################ @app.post("/addpump/") -def fastapi_add_pump(name: str, pump: str, node1: str, node2: str) -> ChangeSet: - return add_pump(name, pump, node1, node2) +def fastapi_add_pump(network: str, pump: str, node1: str, node2: str) -> ChangeSet: + return add_pump(network, pump, node1, node2) @app.post("/deletepump/") -def fastapi_delete_pump(name: str, pump: str) -> ChangeSet: - return delete_pump(name, pump) +def fastapi_delete_pump(network: str, pump: str) -> ChangeSet: + return delete_pump(network, pump) @app.get("/getpumpnode1/") def fastapi_get_pump_node1(name: str, pump: str) -> str | None: