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

Remove redundant code

Browse Source
This commit is contained in:
WQY\qiong
2022-10-09 10:21:46 +08:00
parent 507783b1bc
commit d99c0eacbf
1 changed files with 1 additions and 114 deletions
Download Patch File Download Diff File Expand all files Collapse all files

115
api/s7_valves.py
View File

@@ -21,7 +21,7 @@ schema: dict[str, dict[str, Any]] = { \
'node2' : define_property(str_type), \
'diameter' : define_property(float_type), \
'type' : define_property(str_type), \
'setting' : define_property(float_type), \
'setting' : define_property(float_type), \
'minor_loss': define_property(float_type)}
@@ -136,116 +136,3 @@ def delete_valve(name: str, id: str) -> ChangeSet:
write(name, sql)
add_operation(name, sql.replace("'", "''"), undo, 'delete_valve', API_DELETE, VALVE, id)
return get_current_change_set(name)
'''
def add_valve(name: str, id: str, node1: str, node2: str, diameter: float = 0, type: str = VALVES_TYPE_PRV, setting: float = 0, minor_loss: float = 0) -> ChangeSet:
if not is_node(name, node1):
return ChangeSet()
if not is_node(name, node2):
return ChangeSet()
if node1 == node2:
return ChangeSet()
if type != VALVES_TYPE_PRV and type != VALVES_TYPE_PSV and type != VALVES_TYPE_PBV and type != VALVES_TYPE_FCV and type != VALVES_TYPE_TCV and type != VALVES_TYPE_GPV:
return ChangeSet()
sql = f"insert into valves (id, node1, node2, diameter, type, setting, minor_loss) values ('{id}', '{node1}', '{node2}', {diameter}, '{type}', {setting}, {minor_loss});"
undo_sql = f'delete from valves where id = "{id}";'
return add_link(name, VALVE, id, sql, undo_sql)
def _get_valve(name: str, id: str) -> Row | None:
return query(name, f"select node1, node2, diameter, type, setting, minor_loss from valves where id = '{id}'")
def delete_valve(name: str, id: str) -> ChangeSet:
if not is_valve(name, id):
return ChangeSet()
row = _get_valve(name, id)
if row == None:
return ChangeSet()
node1, node2, diameter, type, setting, minor_loss = row['node1'], row['node2'], row['diameter'], row['type'], row['setting'], row['minor_loss']
sql = f"delete from valves where id = '{id}';"
undo_sql = f'insert into valves (id, node1, node2, diameter, type, setting, minor_loss) values ("{id}", "{node1}", "{node2}", {diameter}, "{type}", {setting}, {minor_loss});'
return delete_link(name, VALVE, id, sql, undo_sql)
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:
row = _get_valve(name, id)
return row['node2'] 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()
row = _get_valve(name, id)
if row == None:
return ChangeSet()
return update(name, VALVE, 'valves', 'id', id, key, key_type, row[key], value, 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:
return ChangeSet()
return _set_valve(name, id, 'node1', 'str', str(node1))
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:
return ChangeSet()
return _set_valve(name, id, 'node2', 'str', str(node2))
def set_valve_diameter(name: str, id: str, diameter: float) -> ChangeSet:
return _set_valve(name, id, 'diameter', 'float', str(diameter))
def set_valve_type(name: str, id: str, type: str) -> ChangeSet:
if type != VALVES_TYPE_PRV and type != VALVES_TYPE_PSV and type != VALVES_TYPE_PBV and type != VALVES_TYPE_FCV and type != VALVES_TYPE_TCV and type != VALVES_TYPE_GPV:
return ChangeSet()
return _set_valve(name, id, 'type', 'str', type)
def set_valve_setting(name: str, id: str, setting: float) -> ChangeSet:
return _set_valve(name, id, 'setting', 'float', str(setting))
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
'''