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

Update pipe api and test

Browse Source
This commit is contained in:
wqy
2022-09-25 00:54:11 +08:00
parent 79fa7d3fae
commit 3b20811605
5 changed files with 171 additions and 178 deletions
Download Patch File Download Diff File Expand all files Collapse all files

115
api/s4_tanks.py
View File

@@ -125,118 +125,3 @@ def delete_tank(name: str, id: str) -> ChangeSet:
write(name, sql)
add_operation(name, sql.replace("'", "''"), undo, 'delete_tank', API_DELETE, TANK, id)
return get_current_change_set(name)
'''
def add_tank(name: str, 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:
sql = f"insert into tanks (id, elevation, init_level, min_level, max_level, diameter, min_vol) values ('{id}', {elevation}, {init_level}, {min_level}, {max_level}, {diameter}, {min_vol});"
undo_sql = f'delete from tanks where id = "{id}";'
return add_node(name, TANK, id, x, y, sql, undo_sql)
def _get_tank(name: str, id: str) -> Row | None:
return query(name, f"select elevation, init_level, min_level, max_level, diameter, min_vol, vol_curve, overflow from tanks where id = '{id}'")
def delete_tank(name: str, id: str) -> ChangeSet:
if not is_tank(name, id):
return ChangeSet()
row = _get_tank(name, id)
if row == None:
return ChangeSet()
elevation = row['elevation']
init_level = row['init_level']
min_level = row['min_level']
max_level = row['max_level']
diameter = row['diameter']
min_vol = row['min_vol']
vol_curve = decorate(row['vol_curve'], 'str', True)
overflow = decorate(row['overflow'], 'str', True)
sql = f"delete from tanks where id = '{id}';"
undo_sql = f'insert into tanks (id, elevation, init_level, min_level, max_level, diameter, min_vol, vol_curve, overflow) values ("{id}", {elevation}, {init_level}, {min_level}, {max_level}, {diameter}, {min_vol}, {vol_curve}, {overflow});'
return delete_node(name, TANK, id, sql, undo_sql)
def _set_tank(name: str, id: str, key: str, key_type: str, value: str, optional: bool = False) -> ChangeSet:
if not is_tank(name, id):
return ChangeSet()
row = _get_tank(name, id)
if row == None:
return ChangeSet()
return update(name, TANK, 'tanks', 'id', id, key, key_type, row[key], value, optional)
def set_tank_elevation(name: str, id: str, elevation: float) -> ChangeSet:
return _set_tank(name, id, 'elevation', 'float', elevation)
def set_tank_init_level(name: str, id: str, init_level: float) -> ChangeSet:
return _set_tank(name, id, 'init_level', 'float', init_level)
def set_tank_min_level(name: str, id: str, min_level: float) -> ChangeSet:
return _set_tank(name, id, 'min_level', 'float', min_level)
def set_tank_max_level(name: str, id: str, max_level: float) -> ChangeSet:
return _set_tank(name, id, 'max_level', 'float', max_level)
def set_tank_diameter(name: str, id: str, diameter: float) -> ChangeSet:
return _set_tank(name, id, 'diameter', 'float', diameter)
def set_tank_min_vol(name: str, id: str, min_vol: float) -> ChangeSet:
return _set_tank(name, id, 'min_vol', 'float', min_vol)
def set_tank_vol_curve(name: str, id: str, vol_curve: str) -> ChangeSet:
if not is_curve(name, vol_curve):
return ChangeSet()
return _set_tank(name, id, 'vol_curve', 'str', vol_curve, True)
def set_tank_overflow(name: str, id: str, overflow: str) -> ChangeSet:
if overflow != OVERFLOW_YES and overflow != OVERFLOW_NO:
return ChangeSet()
return _set_tank(name, id, 'overflow', 'str', overflow)
def set_tank_coord(name: str, id: str, x: float, y: float) -> ChangeSet:
if not is_tank(name, id):
return ChangeSet()
return set_node_coord(name, TANK, id, x, y)
def get_tank_property_names(name: str) -> list[str]:
return ['elevation', 'init_level', 'min_level', 'max_level', 'diameter', 'min_vol', 'vol_curve', 'overflow', 'coord', 'links']
def get_tank_properties(name: str, id: str) -> dict[str, Any] | None:
row = _get_tank(name, id)
if row == None:
return None
ps: dict[str, str] = {}
ps['elevation'] = float(row['elevation']) if row != None else None
ps['init_level'] = float(row['init_level']) if row != None else None
ps['min_level'] = float(row['min_level']) if row != None else None
ps['max_level'] = float(row['max_level']) if row != None else None
ps['diameter'] = float(row['diameter']) if row != None else None
ps['min_vol'] = float(row['min_vol']) if row != None else None
ps['vol_curve'] = row['vol_curve'] if row != None and row['vol_curve'] != None else None
ps['overflow'] = row['overflow'] if row != None and row['overflow'] != None else None
ps['coord'] = get_node_coord(name, id)
ps['links'] = get_node_links(name, id)
return ps
'''