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

Refine link getter api

Browse Source
This commit is contained in:
wqy
2022-09-22 22:14:17 +08:00
parent 9905d7f022
commit 6f088bb291
6 changed files with 135 additions and 157 deletions
Download Patch File Download Diff File Expand all files Collapse all files

48
api/s7_valves.py
View File

@@ -1,3 +1,4 @@
from typing import Any
from psycopg.rows import Row
from .s0_base import *
from .change_set import ChangeSet
@@ -47,36 +48,16 @@ def delete_valve(name: str, id: str) -> ChangeSet:
return delete_link(name, VALVE, id, sql, undo_sql)
def get_valve_node1(name: str, id: str) -> str | None:
def _get_valve_node1(name: str, id: str) -> str | None:
row = _get_valve(name, id)
return row['node1'] if row != None else None
def get_valve_node2(name: str, id: str) -> str | None:
def _get_valve_node2(name: str, id: str) -> str | None:
row = _get_valve(name, id)
return row['node2'] if row != None else None
def get_valve_diameter(name: str, id: str) -> float | None:
row = _get_valve(name, id)
return float(row['diameter']) if row != None else None
def get_valve_type(name: str, id: str) -> str | None:
row = _get_valve(name, id)
return row['type'] if row != None else None
def get_valve_setting(name: str, id: str) -> float | None:
row = _get_valve(name, id)
return float(row['setting']) if row != None else None
def get_valve_minor_loss(name: str, id: str) -> float | None:
row = _get_valve(name, id)
return float(row['minor_loss']) if row != None else None
def _set_valve(name: str, id: str, key: str, key_type: str, value: str, optional: bool = False) -> ChangeSet:
if not is_valve(name, id):
return ChangeSet()
@@ -91,7 +72,7 @@ def _set_valve(name: str, id: str, key: str, key_type: str, value: str, optional
def set_valve_node1(name: str, id: str, node1: str) -> ChangeSet:
if not is_node(name, node1):
return ChangeSet()
if get_valve_node2(name, id) == node1:
if _get_valve_node2(name, id) == node1:
return ChangeSet()
return _set_valve(name, id, 'node1', 'str', str(node1))
@@ -100,7 +81,7 @@ def set_valve_node1(name: str, id: str, node1: str) -> ChangeSet:
def set_valve_node2(name: str, id: str, node2: str) -> ChangeSet:
if not is_node(name, node2):
return ChangeSet()
if get_valve_node1(name, id) == node2:
if _get_valve_node1(name, id) == node2:
return ChangeSet()
return _set_valve(name, id, 'node2', 'str', str(node2))
@@ -123,3 +104,22 @@ def set_valve_setting(name: str, id: str, setting: float) -> ChangeSet:
def set_valve_minor_loss(name: str, id: str, minor_loss: float) -> ChangeSet:
return _set_valve(name, id, 'minor_loss', 'float', str(minor_loss))
def get_valve_property_names(name: str) -> list[str]:
return ['node1', 'node2', 'diameter', 'type', 'setting', 'minor_loss']
def get_valve_properties(name: str, id: str) -> dict[str, Any] | None:
row = _get_valve(name, id)
if row == None:
return None
ps: dict[str, str] = {}
ps['node1'] = row['node1'] if row != None else None
ps['node2'] = row['node2'] if row != None else None
ps['diameter'] = float(row['diameter']) if row != None else None
ps['type'] = row['type'] if row != None else None
ps['setting'] = float(row['setting']) if row != None else None
ps['minor_loss'] = float(row['minor_loss']) if row != None else None
return ps