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

Update tank api and test

Browse Source
This commit is contained in:
wqy
2022-09-25 00:25:04 +08:00
parent 277f5a3501
commit 79fa7d3fae
6 changed files with 190 additions and 89 deletions
Download Patch File Download Diff File Expand all files Collapse all files

44
tjnetwork.py
View File

@@ -181,8 +181,8 @@ def add_reservoir(name: str, reservoir_id: str, x: float, y: float, head: float)
def get_reservoir(name: str, reservoir_id: str) -> dict[str, Any] | None:
return api.get_reservoir(name, reservoir_id)
def set_reservoir(name: str, junction_id: str, properties: dict[str, Any]) -> ChangeSet:
return api.set_reservoir(name, junction_id, properties)
def set_reservoir(name: str, reservoir_id: str, properties: dict[str, Any]) -> ChangeSet:
return api.set_reservoir(name, reservoir_id, properties)
def delete_reservoir(name: str, reservoir_id: str) -> ChangeSet:
return api.delete_reservoir(name, reservoir_id)
@@ -192,45 +192,21 @@ def delete_reservoir(name: str, reservoir_id: str) -> ChangeSet:
# tank 4.[TANKS]
############################################################
def get_tank_property_names(name: str) -> list[str]:
return api.get_tank_property_names(name)
def get_tank_schema(name: str) -> dict[str, dict[str, Any]]:
return api.get_tank_schema(name)
def 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:
return api.add_tank(name, tank_id, x, y, elevation, init_level, min_level, max_level, diameter, min_vol)
def get_tank(name: str, tank_id: str) -> dict[str, Any] | None:
return api.get_tank(name, tank_id)
def set_tank(name: str, tank_id: str, properties: dict[str, Any]) -> ChangeSet:
return api.set_tank(name, tank_id, properties)
def delete_tank(name: str, tank_id: str) -> ChangeSet:
return api.delete_tank(name, tank_id)
def set_tank_elevation(name: str, tank_id: str, elevation: float) -> ChangeSet:
return api.set_tank_elevation(name, tank_id, elevation)
def set_tank_init_level(name: str, tank_id: str, init_level: float) -> ChangeSet:
return api.set_tank_init_level(name, tank_id, init_level)
def set_tank_min_level(name: str, tank_id: str, min_level: float) -> ChangeSet:
return api.set_tank_min_level(name, tank_id, min_level)
def set_tank_max_level(name: str, tank_id: str, max_level: float) -> ChangeSet:
return api.set_tank_max_level(name, tank_id, max_level)
def set_tank_diameter(name: str, tank_id: str, diameter: float) -> ChangeSet:
return api.set_tank_diameter(name, tank_id, diameter)
def set_tank_min_vol(name: str, tank_id: str, min_vol: float) -> ChangeSet:
return api.set_tank_min_vol(name, tank_id, min_vol)
def set_tank_vol_curve(name: str, tank_id: str, vol_curve: str) -> ChangeSet:
return api.set_tank_vol_curve(name, tank_id, vol_curve)
def set_tank_overflow(name: str, tank_id: str, overflow: str) -> ChangeSet:
return api.set_tank_overflow(name, tank_id, overflow)
def set_tank_coord(name: str, tank_id: str, x: float, y: float) -> ChangeSet:
return api.set_tank_coord(name, tank_id, x, y)
def get_tank_properties(name: str, tank_id: str) -> dict[str, Any] | None:
return api.get_tank_properties(name, tank_id)
############################################################
# pipe 4.[PIPES]