OrgTJWater/TJWaterServer
2
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Refine param name

Browse Source
This commit is contained in:
DingZQ
2022-09-20 23:37:32 +08:00
parent 73836d728b
commit b23fd91dc9
1 changed files with 126 additions and 126 deletions
Download Patch File Download Diff File Expand all files Collapse all files

252
main.py
View File

@@ -190,36 +190,36 @@ async def fastapi_set_junction_pattern(network: str, junction: str, pattern: str
############################################################ ############################################################
@app.post("addreservoir/") @app.post("addreservoir/")
def fastapi_add_reservoir(name: str, reservoir_id: str, x: float, y: float, head: float) -> ChangeSet: def fastapi_add_reservoir(name: str, reservoir: str, x: float, y: float, head: float) -> ChangeSet:
return add_reservoir(name, reservoir_id, x, y, head) return add_reservoir(name, reservoir, x, y, head)
@app.post("/deletereservoir/") @app.post("/deletereservoir/")
def fastapi_delete_reservoir(name: str, reservoir_id: str) -> ChangeSet: def fastapi_delete_reservoir(name: str, reservoir: str) -> ChangeSet:
return delete_reservoir(name, reservoir_id) return delete_reservoir(name, reservoir)
@app.get("/getreservoirhead/") @app.get("/getreservoirhead/")
def fastapi_get_reservoir_head(name: str, reservoir_id: str) -> float | None: def fastapi_get_reservoir_head(name: str, reservoir: str) -> float | None:
return get_reservoir_head(name, reservoir_id) return get_reservoir_head(name, reservoir)
@app.get("/getreservoirpattern/") @app.get("/getreservoirpattern/")
def fastapi_get_reservoir_pattern(name: str, reservoir_id: str) -> str | None: def fastapi_get_reservoir_pattern(name: str, reservoir: str) -> str | None:
return get_reservoir_pattern(name, reservoir_id) return get_reservoir_pattern(name, reservoir)
@app.get("/getreservoircoord/") @app.get("/getreservoircoord/")
def fastapi_get_reservoir_coord(name: str, reservoir_id: str) -> dict[str, float] | None: def fastapi_get_reservoir_coord(name: str, reservoir: str) -> dict[str, float] | None:
return get_reservoir_coord(name, reservoir_id) return get_reservoir_coord(name, reservoir)
@app.post("/setreservoirhead/") @app.post("/setreservoirhead/")
def fastapi_set_reservoir_head(name: str, reservoir_id: str, head: float) -> ChangeSet: def fastapi_set_reservoir_head(name: str, reservoir: str, head: float) -> ChangeSet:
return set_reservoir_head(name, reservoir_id, head) return set_reservoir_head(name, reservoir, head)
@app.post("/setreservoirpattern/") @app.post("/setreservoirpattern/")
def fastapi_set_reservoir_pattern(name: str, reservoir_id: str, pattern: str) -> ChangeSet: def fastapi_set_reservoir_pattern(name: str, reservoir: str, pattern: str) -> ChangeSet:
return set_reservoir_pattern(name, reservoir_id, pattern) return set_reservoir_pattern(name, reservoir, pattern)
@app.post("/setreservoircoord/") @app.post("/setreservoircoord/")
def fastapi_set_reservoir_coord(name: str, reservoir_id: str, x: float, y: float) -> ChangeSet: def fastapi_set_reservoir_coord(name: str, reservoir: str, x: float, y: float) -> ChangeSet:
return set_reservoir_coord(name, reservoir_id, x, y) return set_reservoir_coord(name, reservoir, x, y)
############################################################ ############################################################
@@ -227,152 +227,152 @@ def fastapi_set_reservoir_coord(name: str, reservoir_id: str, x: float, y: float
############################################################ ############################################################
@app.post("/addtank/") @app.post("/addtank/")
def fastapi_add_tank(name: str, tank_id: str, x: float, y: float, elevation: float, init_level: float = 0, min_level: float = 0, max_level: float = 0, diameter: float = 0, min_vol: float = 0) -> ChangeSet: def fastapi_add_tank(name: str, tank: str, x: float, y: float, elevation: float, init_level: float = 0, min_level: float = 0, max_level: float = 0, diameter: float = 0, min_vol: float = 0) -> ChangeSet:
return add_tank(name, tank_id, x, y, elevation, init_level, min_level, max_level, diameter, min_vol) return add_tank(name, tank, x, y, elevation, init_level, min_level, max_level, diameter, min_vol)
@app.post("/deletetank/") @app.post("/deletetank/")
def fastapi_delete_tank(name: str, tank_id: str) -> ChangeSet: def fastapi_delete_tank(name: str, tank: str) -> ChangeSet:
return delete_tank(name, tank_id) return delete_tank(name, tank)
@app.get("/gettankelevation/") @app.get("/gettankelevation/")
def fastapi_get_tank_elevation(name: str, tank_id: str) -> float | None: def fastapi_get_tank_elevation(name: str, tank: str) -> float | None:
return get_tank_elevation(name, tank_id) return get_tank_elevation(name, tank)
@app.get("/gettankinitlevel/") @app.get("/gettankinitlevel/")
def fastapi_get_tank_init_level(name: str, tank_id: str) -> float | None: def fastapi_get_tank_init_level(name: str, tank: str) -> float | None:
return get_tank_init_level(name, tank_id) return get_tank_init_level(name, tank)
@app.get("/gettankminlevel/") @app.get("/gettankminlevel/")
def fastapi_get_tank_min_level(name: str, tank_id: str) -> float | None: def fastapi_get_tank_min_level(name: str, tank: str) -> float | None:
return get_tank_min_level(name, tank_id) return get_tank_min_level(name, tank)
@app.get("/gettankmaxlevel/") @app.get("/gettankmaxlevel/")
def fastapi_get_tank_max_level(name: str, tank_id: str) -> float | None: def fastapi_get_tank_max_level(name: str, tank: str) -> float | None:
return get_tank_max_level(name, tank_id) return get_tank_max_level(name, tank)
@app.get("/gettankdiameter/") @app.get("/gettankdiameter/")
def fastapi_get_tank_diameter(name: str, tank_id: str) -> float | None: def fastapi_get_tank_diameter(name: str, tank: str) -> float | None:
return get_tank_diameter(name, tank_id) return get_tank_diameter(name, tank)
@app.get("/gettankminvol/") @app.get("/gettankminvol/")
def fastapi_get_tank_min_vol(name: str, tank_id: str) -> float | None: def fastapi_get_tank_min_vol(name: str, tank: str) -> float | None:
return get_tank_min_vol(name, tank_id) return get_tank_min_vol(name, tank)
@app.get("/gettankvolcurve/") @app.get("/gettankvolcurve/")
def fastapi_get_tank_vol_curve(name: str, tank_id: str) -> str | None: def fastapi_get_tank_vol_curve(name: str, tank: str) -> str | None:
return get_tank_vol_curve(name, tank_id) return get_tank_vol_curve(name, tank)
@app.get("/gettankoverflow/") @app.get("/gettankoverflow/")
def fastapi_get_tank_overflow(name: str, tank_id: str) -> str | None: def fastapi_get_tank_overflow(name: str, tank: str) -> str | None:
return get_tank_overflow(name, tank_id) return get_tank_overflow(name, tank)
@app.get("/gettankcoord/") @app.get("/gettankcoord/")
def fastapi_get_tank_coord(name: str, tank_id: str) -> dict[str, float] | None: def fastapi_get_tank_coord(name: str, tank: str) -> dict[str, float] | None:
return get_tank_coord(name, tank_id) return get_tank_coord(name, tank)
@app.post("/settankelevation/") @app.post("/settankelevation/")
def fastapi_set_tank_elevation(name: str, tank_id: str, elevation: float) -> ChangeSet: def fastapi_set_tank_elevation(name: str, tank: str, elevation: float) -> ChangeSet:
return set_tank_elevation(name, tank_id, elevation) return set_tank_elevation(name, tank, elevation)
@app.post("/settankinitlevel/") @app.post("/settankinitlevel/")
def fastapi_set_tank_init_level(name: str, tank_id: str, init_level: float) -> ChangeSet: def fastapi_set_tank_init_level(name: str, tank: str, init_level: float) -> ChangeSet:
return set_tank_init_level(name, tank_id, init_level) return set_tank_init_level(name, tank, init_level)
@app.post("/settankminlevel/") @app.post("/settankminlevel/")
def fastapi_set_tank_min_level(name: str, tank_id: str, min_level: float) -> ChangeSet: def fastapi_set_tank_min_level(name: str, tank: str, min_level: float) -> ChangeSet:
return set_tank_min_level(name, tank_id, min_level) return set_tank_min_level(name, tank, min_level)
@app.post("/settankmaxlevel/") @app.post("/settankmaxlevel/")
def fastapi_set_tank_max_level(name: str, tank_id: str, max_level: float) -> ChangeSet: def fastapi_set_tank_max_level(name: str, tank: str, max_level: float) -> ChangeSet:
return set_tank_max_level(name, tank_id, max_level) return set_tank_max_level(name, tank, max_level)
@app.post("settankdiameter//") @app.post("settankdiameter//")
def fastapi_set_tank_diameter(name: str, tank_id: str, diameter: float) -> ChangeSet: def fastapi_set_tank_diameter(name: str, tank: str, diameter: float) -> ChangeSet:
return set_tank_diameter(name, tank_id, diameter) return set_tank_diameter(name, tank, diameter)
@app.post("/settankminvol/") @app.post("/settankminvol/")
def fastapi_set_tank_min_vol(name: str, tank_id: str, min_vol: float) -> ChangeSet: def fastapi_set_tank_min_vol(name: str, tank: str, min_vol: float) -> ChangeSet:
return set_tank_min_vol(name, tank_id, min_vol) return set_tank_min_vol(name, tank, min_vol)
@app.post("/settankvolcurve/") @app.post("/settankvolcurve/")
def fastapi_set_tank_vol_curve(name: str, tank_id: str, vol_curve: str) -> ChangeSet: def fastapi_set_tank_vol_curve(name: str, tank: str, vol_curve: str) -> ChangeSet:
return set_tank_vol_curve(name, tank_id, vol_curve) return set_tank_vol_curve(name, tank, vol_curve)
@app.post("/settankoverflow/") @app.post("/settankoverflow/")
def fastapi_set_tank_overflow(name: str, tank_id: str, overflow: str) -> ChangeSet: def fastapi_set_tank_overflow(name: str, tank: str, overflow: str) -> ChangeSet:
return set_tank_overflow(name, tank_id, overflow) return set_tank_overflow(name, tank, overflow)
@app.post("/settankcoord/") @app.post("/settankcoord/")
def fastapi_set_tank_coord(name: str, tank_id: str, x: float, y: float) -> ChangeSet: def fastapi_set_tank_coord(name: str, tank: str, x: float, y: float) -> ChangeSet:
return set_tank_coord(name, tank_id, x, y) return set_tank_coord(name, tank, x, y)
############################################################ ############################################################
# pipe 4.[PIPES] # pipe 4.[PIPES]
############################################################ ############################################################
@app.post("/addpipe/") @app.post("/addpipe/")
def fastapi_add_pipe(name: str, pipe_id: str, node1: str, node2: str, length: float = 0, diameter: float = 0, roughness: float = 0, minor_loss: float = 0, status: str = PIPE_STATUS_OPEN) -> ChangeSet: def fastapi_add_pipe(name: str, pipe: str, node1: str, node2: str, length: float = 0, diameter: float = 0, roughness: float = 0, minor_loss: float = 0, status: str = PIPE_STATUS_OPEN) -> ChangeSet:
return add_pipe(name, pipe_id, node1, node2, length, diameter, roughness, minor_loss, status) return add_pipe(name, pipe, node1, node2, length, diameter, roughness, minor_loss, status)
@app.post("/deletepipe/") @app.post("/deletepipe/")
def fastapi_delete_pipe(name: str, pipe_id: str) -> ChangeSet: def fastapi_delete_pipe(name: str, pipe: str) -> ChangeSet:
return delete_pipe(name, pipe_id) return delete_pipe(name, pipe)
@app.get("/getpipenode1/") @app.get("/getpipenode1/")
def fastapi_get_pipe_node1(name: str, pipe_id: str) -> str | None: def fastapi_get_pipe_node1(name: str, pipe: str) -> str | None:
return get_pipe_node1(name, pipe_id) return get_pipe_node1(name, pipe)
@app.get("/getpipenode2/") @app.get("/getpipenode2/")
def fastapi_get_pipe_node2(name: str, pipe_id: str) -> str | None: def fastapi_get_pipe_node2(name: str, pipe: str) -> str | None:
return get_pipe_node2(name, pipe_id) return get_pipe_node2(name, pipe)
@app.get("/getpipelength/") @app.get("/getpipelength/")
def fastapi_get_pipe_length(name: str, pipe_id: str) -> float | None: def fastapi_get_pipe_length(name: str, pipe: str) -> float | None:
return get_pipe_length(name, pipe_id) return get_pipe_length(name, pipe)
@app.get("/getpipediameter/") @app.get("/getpipediameter/")
def fastapi_get_pipe_diameter(name: str, pipe_id: str) -> float | None: def fastapi_get_pipe_diameter(name: str, pipe: str) -> float | None:
return get_pipe_diameter(name, pipe_id) return get_pipe_diameter(name, pipe)
@app.get("/getpiperoughness/") @app.get("/getpiperoughness/")
def fastapi_get_pipe_roughness(name: str, pipe_id: str) -> float | None: def fastapi_get_pipe_roughness(name: str, pipe: str) -> float | None:
return get_pipe_roughness(name, pipe_id) return get_pipe_roughness(name, pipe)
@app.get("/getpipeminorloss/") @app.get("/getpipeminorloss/")
def fastapi_get_pipe_minor_loss(name: str, pipe_id: str) -> float | None: def fastapi_get_pipe_minor_loss(name: str, pipe: str) -> float | None:
return get_pipe_minor_loss(name, pipe_id) return get_pipe_minor_loss(name, pipe)
@app.get("/getpipestatus/") @app.get("/getpipestatus/")
def fastapi_get_pipe_status(name: str, pipe_id: str) -> str | None: def fastapi_get_pipe_status(name: str, pipe: str) -> str | None:
return get_pipe_status(name, pipe_id) return get_pipe_status(name, pipe)
@app.post("/setpipenode1/") @app.post("/setpipenode1/")
def fastapi_set_pipe_node1(name: str, pipe_id: str, node1: str) -> ChangeSet: def fastapi_set_pipe_node1(name: str, pipe: str, node1: str) -> ChangeSet:
return set_pipe_node1(name, pipe_id, node1) return set_pipe_node1(name, pipe, node1)
@app.post("/setpipenode2/") @app.post("/setpipenode2/")
def fastapi_set_pipe_node2(name: str, pipe_id: str, node2: str) -> ChangeSet: def fastapi_set_pipe_node2(name: str, pipe: str, node2: str) -> ChangeSet:
return set_pipe_node2(name, pipe_id, node2) return set_pipe_node2(name, pipe, node2)
@app.post("/setpipelength/") @app.post("/setpipelength/")
def fastapi_set_pipe_length(name: str, pipe_id: str, length: float) -> ChangeSet: def fastapi_set_pipe_length(name: str, pipe: str, length: float) -> ChangeSet:
return set_pipe_length(name, pipe_id, length) return set_pipe_length(name, pipe, length)
@app.post("/setpipediameter/") @app.post("/setpipediameter/")
def fastapi_set_pipe_diameter(name: str, pipe_id: str, diameter: float) -> ChangeSet: def fastapi_set_pipe_diameter(name: str, pipe: str, diameter: float) -> ChangeSet:
return set_pipe_diameter(name, pipe_id, diameter) return set_pipe_diameter(name, pipe, diameter)
@app.post("/setpiperoughness/") @app.post("/setpiperoughness/")
def fastapi_set_pipe_roughness(name: str, pipe_id: str, roughness: float) -> ChangeSet: def fastapi_set_pipe_roughness(name: str, pipe: str, roughness: float) -> ChangeSet:
return set_pipe_roughness(name, pipe_id, roughness) return set_pipe_roughness(name, pipe, roughness)
@app.post("/setpipeminorloss/") @app.post("/setpipeminorloss/")
def fastapi_set_pipe_minor_loss(name: str, pipe_id: str, minor_loss: float) -> ChangeSet: def fastapi_set_pipe_minor_loss(name: str, pipe: str, minor_loss: float) -> ChangeSet:
return set_pipe_minor_loss(name, pipe_id, minor_loss) return set_pipe_minor_loss(name, pipe, minor_loss)
@app.post("/setpipestatus/") @app.post("/setpipestatus/")
def fastapi_set_pipe_status(name: str, pipe_id: str, status: float) -> ChangeSet: def fastapi_set_pipe_status(name: str, pipe: str, status: float) -> ChangeSet:
return set_pipe_status(name, pipe_id, status) return set_pipe_status(name, pipe, status)
############################################################ ############################################################
@@ -380,28 +380,28 @@ def fastapi_set_pipe_status(name: str, pipe_id: str, status: float) -> ChangeSet
############################################################ ############################################################
@app.post("/addpump/") @app.post("/addpump/")
def fastapi_add_pump(name: str, pump_id: str, node1: str, node2: str) -> ChangeSet: def fastapi_add_pump(name: str, pump: str, node1: str, node2: str) -> ChangeSet:
return add_pump(name, pump_id, node1, node2) return add_pump(name, pump, node1, node2)
@app.post("/deletepump/") @app.post("/deletepump/")
def fastapi_delete_pump(name: str, pump_id: str) -> ChangeSet: def fastapi_delete_pump(name: str, pump: str) -> ChangeSet:
return delete_pump(name, pump_id) return delete_pump(name, pump)
@app.get("/getpumpnode1/") @app.get("/getpumpnode1/")
def fastapi_get_pump_node1(name: str, pump_id: str) -> str | None: def fastapi_get_pump_node1(name: str, pump: str) -> str | None:
return get_pump_node1(name, pump_id) return get_pump_node1(name, pump)
@app.get("/getpumpnode2/") @app.get("/getpumpnode2/")
def fastapi_get_pump_node2(name: str, pump_id: str) -> str | None: def fastapi_get_pump_node2(name: str, pump: str) -> str | None:
return get_pump_node2(name, pump_id) return get_pump_node2(name, pump)
@app.post("/setpumpnode1/") @app.post("/setpumpnode1/")
def fastapi_set_pump_node1(name: str, pump_id: str, node1: str) -> ChangeSet: def fastapi_set_pump_node1(name: str, pump: str, node1: str) -> ChangeSet:
return set_pump_node1(name, pump_id, node1) return set_pump_node1(name, pump, node1)
@app.post("/setpumpnode2/") @app.post("/setpumpnode2/")
def fastapi_set_pump_node2(name: str, pump_id: str, node2: str) -> ChangeSet: def fastapi_set_pump_node2(name: str, pump: str, node2: str) -> ChangeSet:
return set_pump_node2(name, pump_id, node2) return set_pump_node2(name, pump, node2)
############################################################ ############################################################
@@ -409,56 +409,56 @@ def fastapi_set_pump_node2(name: str, pump_id: str, node2: str) -> ChangeSet:
############################################################ ############################################################
@app.post("/addvalve/") @app.post("/addvalve/")
def fastapi_add_valve(name: str, valve_id: str, node1: str, node2: str, diameter: float = 0, type: str = VALVES_TYPE_PRV, setting: float = 0, minor_loss: float = 0) -> ChangeSet: def fastapi_add_valve(name: str, valve: str, node1: str, node2: str, diameter: float = 0, type: str = VALVES_TYPE_PRV, setting: float = 0, minor_loss: float = 0) -> ChangeSet:
return add_valve(name, valve_id, node1, node2, diameter, type, setting, minor_loss) return add_valve(name, valve, node1, node2, diameter, type, setting, minor_loss)
@app.post("/deletevalve/") @app.post("/deletevalve/")
def fastapi_delete_valve(name: str, valve_id: str) -> ChangeSet: def fastapi_delete_valve(name: str, valve: str) -> ChangeSet:
return delete_valve(name, valve_id) return delete_valve(name, valve)
@app.get("/getvalvenode1/") @app.get("/getvalvenode1/")
def fastapi_get_valve_node1(name: str, valve_id: str) -> str | None: def fastapi_get_valve_node1(name: str, valve: str) -> str | None:
return get_valve_node1(name, valve_id) return get_valve_node1(name, valve)
@app.get("/getvalvenode2/") @app.get("/getvalvenode2/")
def fastapi_get_valve_node2(name: str, valve_id: str) -> str | None: def fastapi_get_valve_node2(name: str, valve: str) -> str | None:
return get_valve_node2(name, valve_id) return get_valve_node2(name, valve)
@app.get("/getvalvediameter/") @app.get("/getvalvediameter/")
def fastapi_get_valve_diameter(name: str, valve_id: str) -> float | None: def fastapi_get_valve_diameter(name: str, valve: str) -> float | None:
return get_valve_diameter(name, valve_id) return get_valve_diameter(name, valve)
@app.get("/getvalvetype/") @app.get("/getvalvetype/")
def fastapi_get_valve_type(name: str, valve_id: str) -> str | None: def fastapi_get_valve_type(name: str, valve: str) -> str | None:
return get_valve_type(name, valve_id) return get_valve_type(name, valve)
@app.get("/getvalvesetting/") @app.get("/getvalvesetting/")
def fastapi_get_valve_setting(name: str, valve_id: str) -> float | None: def fastapi_get_valve_setting(name: str, valve: str) -> float | None:
return get_valve_setting(name, valve_id) return get_valve_setting(name, valve)
@app.get("/getvalveminorloss/") @app.get("/getvalveminorloss/")
def fastapi_get_valve_minor_loss(name: str, valve_id: str) -> float | None: def fastapi_get_valve_minor_loss(name: str, valve: str) -> float | None:
return get_valve_minor_loss(name, valve_id) return get_valve_minor_loss(name, valve)
@app.post("/setvalvenode1/") @app.post("/setvalvenode1/")
def fastapi_set_valve_node1(name: str, valve_id: str, node1: str) -> ChangeSet: def fastapi_set_valve_node1(name: str, valve: str, node1: str) -> ChangeSet:
return set_valve_node1(name, valve_id, node1) return set_valve_node1(name, valve, node1)
@app.post("/setvalvenode2/") @app.post("/setvalvenode2/")
def fastapi_set_valve_node2(name: str, valve_id: str, node2: str) -> ChangeSet: def fastapi_set_valve_node2(name: str, valve: str, node2: str) -> ChangeSet:
return set_valve_node2(name, valve_id, node2) return set_valve_node2(name, valve, node2)
@app.post("/setvalvenodediameter/") @app.post("/setvalvenodediameter/")
def fastapi_set_valve_diameter(name: str, valve_id: str, diameter: float) -> ChangeSet: def fastapi_set_valve_diameter(name: str, valve: str, diameter: float) -> ChangeSet:
return set_valve_diameter(name, valve_id, diameter) return set_valve_diameter(name, valve, diameter)
@app.post("/setvalvetype/") @app.post("/setvalvetype/")
def fastapi_set_valve_type(name: str, valve_id: str, type: str) -> ChangeSet: def fastapi_set_valve_type(name: str, valve: str, type: str) -> ChangeSet:
return set_valve_type(name, valve_id, type) return set_valve_type(name, valve, type)
@app.post("/setvalvesetting/") @app.post("/setvalvesetting/")
def fastapi_set_valve_setting(name: str, valve_id: str, setting: float) -> ChangeSet: def fastapi_set_valve_setting(name: str, valve: str, setting: float) -> ChangeSet:
return set_valve_setting(name, valve_id, setting) return set_valve_setting(name, valve, setting)