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

Update valve api and test

Browse Source
This commit is contained in:
wqy
2022-09-25 01:27:35 +08:00
parent dce54171fb
commit 3de39975ca
5 changed files with 176 additions and 161 deletions
Download Patch File Download Diff File Expand all files Collapse all files

33
tjnetwork.py
View File

@@ -232,7 +232,7 @@ def delete_pipe(name: str, pipe_id: str) -> ChangeSet:
# pump 4.[PUMPS]
############################################################
def get_pump_schema(name: str) -> list[str]:
def get_pump_schema(name: str) -> dict[str, dict[str, Any]]:
return api.get_pump_schema(name)
def add_pump(name: str, pump_id: str, node1: str, node2: str) -> ChangeSet:
@@ -252,32 +252,17 @@ def delete_pump(name: str, pump_id: str) -> ChangeSet:
# valve 4.[VALVES]
############################################################
def get_valve_property_names(name: str) -> list[str]:
return api.get_valve_property_names(name)
def get_valve_schema(name: str) -> dict[str, dict[str, Any]]:
return api.get_valve_schema(name)
def 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:
return api.add_valve(name, valve_id, node1, node2, diameter, type, setting, minor_loss)
def get_valve(name: str, valve_id: str) -> dict[str, Any] | None:
return api.get_valve(name, valve_id)
def set_valve(name: str, valve_id: str, properties: dict[str, Any]) -> ChangeSet:
return api.set_valve(name, valve_id, properties)
def delete_valve(name: str, valve_id: str) -> ChangeSet:
return api.delete_valve(name, valve_id)
def set_valve_node1(name: str, valve_id: str, node1: str) -> ChangeSet:
return api.set_valve_node1(name, valve_id, node1)
def set_valve_node2(name: str, valve_id: str, node2: str) -> ChangeSet:
return api.set_valve_node2(name, valve_id, node2)
def set_valve_diameter(name: str, valve_id: str, diameter: float) -> ChangeSet:
return api.set_valve_diameter(name, valve_id, diameter)
def set_valve_type(name: str, valve_id: str, type: str) -> ChangeSet:
return api.set_valve_type(name, valve_id, type)
def set_valve_setting(name: str, valve_id: str, setting: float) -> ChangeSet:
return api.set_valve_setting(name, valve_id, setting)
def set_valve_minor_loss(name: str, valve_id: str, minor_loss: float) -> ChangeSet:
return api.set_valve_minor_loss(name, valve_id, minor_loss)
def get_valve_properties(name: str, pump_id: str) -> dict[str, Any] | None:
return api.get_valve_properties(name, pump_id)