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

Add pump api to tjnetwork

Browse Source
This commit is contained in:
wqy
2022-09-17 11:16:45 +08:00
parent 3250d58733
commit 4350b5d19e
3 changed files with 66 additions and 35 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
api/__init__.py
View File

@@ -36,4 +36,9 @@ from .s5_pipes import add_pipe, delete_pipe
from .s5_pipes import get_pipe_node1, get_pipe_node2, get_pipe_length, get_pipe_diameter, get_pipe_roughness, get_pipe_minor_loss, get_pipe_status
from .s5_pipes import set_pipe_node1, set_pipe_node2, set_pipe_length, set_pipe_diameter, set_pipe_roughness, set_pipe_minor_loss, set_pipe_status
from .s6_pumps import add_pump, delete_pump
from .s6_pumps import get_pump_node1, get_pump_node2
from .s6_pumps import set_pump_node1, set_pump_node2
# TODO: more properties...
from .s24_coordinates import get_node_coord, set_node_coord

3
api/s6_pumps.py
View File

@@ -44,11 +44,13 @@ def get_pump_node2(name: str, id: str) -> str | None:
row = _get_pump(name, id)
return float(row['node2']) if row != None else None
def get_pump_power(name: str, id: str) -> str | None: pass
def get_pump_speed(name: str, id: str) -> str | None: pass
def get_pump_head(name: str, id: str) -> str | None: pass
def get_pump_pattern(name: str, id: str) -> str | None: pass
def _set_pump(name: str, id: str, key: str, key_type: str, value: str, optional: bool = False) -> ChangeSet:
if not is_pump(name, id):
return
@@ -73,6 +75,7 @@ def set_pump_node2(name: str, id: str, node2: str) -> ChangeSet:
return _set_pump(name, id, 'node2', 'str', str(node2))
def set_pump_power(name: str, id: str) -> ChangeSet: pass
def set_pump_speed(name: str, id: str) -> ChangeSet: pass
def set_pump_head(name: str, id: str) -> ChangeSet: pass

91
tjnetwork.py
View File

@@ -279,58 +279,81 @@ def set_tank_coord(name: str, tank_id: str, x: float, y: float) -> ChangeSet:
def 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:
return api.add_pipe(name, pipe_id, node1, node2, length, diameter, roughness, minor_loss, status)
def delete_pipe(name: str, id: str) -> ChangeSet:
return api.delete_pipe(name, id)
def delete_pipe(name: str, pipe_id: str) -> ChangeSet:
return api.delete_pipe(name, pipe_id)
def get_pipe_node1(name: str, id: str) -> str | None:
return api.get_pipe_node1(name, id)
def get_pipe_node1(name: str, pipe_id: str) -> str | None:
return api.get_pipe_node1(name, pipe_id)
def get_pipe_node2(name: str, id: str) -> str | None:
return api.get_pipe_node2(name, id)
def get_pipe_node2(name: str, pipe_id: str) -> str | None:
return api.get_pipe_node2(name, pipe_id)
def get_pipe_length(name: str, id: str) -> float | None:
return api.get_pipe_length(name, id)
def get_pipe_length(name: str, pipe_id: str) -> float | None:
return api.get_pipe_length(name, pipe_id)
def get_pipe_diameter(name: str, id: str) -> float | None:
return api.get_pipe_diameter(name, id)
def get_pipe_diameter(name: str, pipe_id: str) -> float | None:
return api.get_pipe_diameter(name, pipe_id)
def get_pipe_roughness(name: str, id: str) -> float | None:
return api.get_pipe_roughness(name, id)
def get_pipe_roughness(name: str, pipe_id: str) -> float | None:
return api.get_pipe_roughness(name, pipe_id)
def get_pipe_minor_loss(name: str, id: str) -> float | None:
return api.get_pipe_minor_loss(name, id)
def get_pipe_minor_loss(name: str, pipe_id: str) -> float | None:
return api.get_pipe_minor_loss(name, pipe_id)
def get_pipe_status(name: str, id: str) -> str | None:
return api.get_pipe_status(name, id)
def get_pipe_status(name: str, pipe_id: str) -> str | None:
return api.get_pipe_status(name, pipe_id)
def set_pipe_node1(name: str, id: str, node1: str) -> ChangeSet:
return api.set_pipe_node1(name, id, node1)
def set_pipe_node1(name: str, pipe_id: str, node1: str) -> ChangeSet:
return api.set_pipe_node1(name, pipe_id, node1)
def set_pipe_node2(name: str, id: str, node2: str) -> ChangeSet:
return api.set_pipe_node2(name, id, node2)
def set_pipe_node2(name: str, pipe_id: str, node2: str) -> ChangeSet:
return api.set_pipe_node2(name, pipe_id, node2)
def set_pipe_length(name: str, id: str, length: float) -> ChangeSet:
return api.set_pipe_length(name, id, length)
def set_pipe_length(name: str, pipe_id: str, length: float) -> ChangeSet:
return api.set_pipe_length(name, pipe_id, length)
def set_pipe_diameter(name: str, id: str, diameter: float) -> ChangeSet:
return api.set_pipe_diameter(name, id, diameter)
def set_pipe_diameter(name: str, pipe_id: str, diameter: float) -> ChangeSet:
return api.set_pipe_diameter(name, pipe_id, diameter)
def set_pipe_roughness(name: str, id: str, roughness: float) -> ChangeSet:
return api.set_pipe_roughness(name, id, roughness)
def set_pipe_roughness(name: str, pipe_id: str, roughness: float) -> ChangeSet:
return api.set_pipe_roughness(name, pipe_id, roughness)
def set_pipe_minor_loss(name: str, id: str, minor_loss: float) -> ChangeSet:
return api.set_pipe_minor_loss(name, id, minor_loss)
def set_pipe_minor_loss(name: str, pipe_id: str, minor_loss: float) -> ChangeSet:
return api.set_pipe_minor_loss(name, pipe_id, minor_loss)
def set_pipe_status(name: str, id: str, status: float) -> ChangeSet:
return api.set_pipe_status(name, id, status)
def set_pipe_status(name: str, pipe_id: str, status: float) -> ChangeSet:
return api.set_pipe_status(name, pipe_id, status)
############################################################
# pump 4.[PUMPS]
############################################################
def add_pump(name: str, pump_id: str, node1: str, node2: str) -> ChangeSet:
return api.add_pump(name, pump_id, node1, node2)
def delete_pump(name: str, pump_id: str) -> ChangeSet:
return api.delete_pump(name, pump_id)
def get_pump_node1(name: str, pump_id: str) -> str | None:
return api.get_pump_node1(name, pump_id)
def get_pump_node2(name: str, pump_id: str) -> str | None:
return api.get_pump_node2(name, pump_id)
def set_pump_node1(name: str, pump_id: str, node1: str) -> ChangeSet:
return api.set_pump_node1(name, pump_id, node1)
def set_pump_node2(name: str, pump_id: str, node2: str) -> ChangeSet:
return api.set_pump_node2(name, pump_id, node2)
############################################################
# coordinates 24.[COORDINATES]
############################################################
def get_node_coord(name: str, tank_id: str) -> dict[str, float] | None:
return api.get_node_coord(name, tank_id)
def get_node_coord(name: str, node_id: str) -> dict[str, float] | None:
return api.get_node_coord(name, node_id)
def set_node_coord(name: str, tank_id: str, x: float, y: float) -> ChangeSet:
return api.set_node_coord(name, tank_id, x, y)
def set_node_coord(name: str, node_id: str, x: float, y: float) -> ChangeSet:
return api.set_node_coord(name, node_id, x, y)