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

Update reservoir api and test

Browse Source
This commit is contained in:
wqy
2022-09-24 23:51:00 +08:00
parent baeef6c859
commit 277f5a3501
5 changed files with 134 additions and 125 deletions
Download Patch File Download Diff File Expand all files Collapse all files

30
tjnetwork.py
View File

@@ -152,47 +152,41 @@ def get_title(name: str) -> str:
# junction 2.[JUNCTIONS]
############################################################
def get_junction_schema(name: str) -> dict[str, str]:
def get_junction_schema(name: str) -> dict[str, dict[str, Any]]:
return api.get_junction_schema(name)
def add_junction(name: str, junction_id: str, x: float, y: float, elevation: float) -> ChangeSet:
return api.add_junction(name, junction_id, x, y, elevation)
def delete_junction(name: str, junction_id: str) -> ChangeSet:
return api.delete_junction(name, junction_id)
def get_junction(name: str, junction_id: str) -> dict[str, Any] | None:
return api.get_junction(name, junction_id)
def set_junction(name: str, junction_id: str, properties: dict[str, Any]) -> ChangeSet:
return api.set_junction(name, junction_id, properties)
def delete_junction(name: str, junction_id: str) -> ChangeSet:
return api.delete_junction(name, junction_id)
############################################################
# reservoir 3.[RESERVOIRS]
############################################################
def get_reservoir_property_names(name: str) -> list[str]:
return api.get_reservoir_property_names(name)
def get_reservoir_schema(name: str) -> dict[str, dict[str, Any]]:
return api.get_reservoir_schema(name)
def add_reservoir(name: str, reservoir_id: str, x: float, y: float, head: float) -> ChangeSet:
return api.add_reservoir(name, reservoir_id, x, y, head)
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 delete_reservoir(name: str, reservoir_id: str) -> ChangeSet:
return api.delete_reservoir(name, reservoir_id)
def set_reservoir_head(name: str, reservoir_id: str, head: float) -> ChangeSet:
return api.set_reservoir_head(name, reservoir_id, head)
def set_reservoir_pattern(name: str, reservoir_id: str, pattern: str) -> ChangeSet:
return api.set_reservoir_pattern(name, reservoir_id, pattern)
def set_reservoir_coord(name: str, reservoir_id: str, x: float, y: float) -> ChangeSet:
return api.set_reservoir_coord(name, reservoir_id, x, y)
def get_reservoir_properties(name: str, reservoir_id: str) -> dict[str, Any] | None:
return api.get_reservoir_properties(name, reservoir_id)
############################################################
# tank 4.[TANKS]