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

Clean code

Browse Source
This commit is contained in:
WQY\qiong
2023-04-29 15:01:11 +08:00
parent a0166193ef
commit 35d2ce08e1
29 changed files with 133 additions and 375 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
api/s7_valves.py
View File

@@ -62,7 +62,7 @@ class Valve(object):
return { 'type': self.type, 'id': self.id }
def set_valve_cmd(name: str, cs: ChangeSet) -> DbChangeSet:
def _set_valve(name: str, cs: ChangeSet) -> DbChangeSet:
old = Valve(get_valve(name, cs.operations[0]['id']))
raw_new = get_valve(name, cs.operations[0]['id'])
@@ -87,10 +87,10 @@ def set_valve(name: str, cs: ChangeSet) -> ChangeSet:
return ChangeSet()
if get_valve(name, cs.operations[0]['id']) == {}:
return ChangeSet()
return execute_command(name, set_valve_cmd(name, cs))
return execute_command(name, _set_valve(name, cs))
def add_valve_cmd(name: str, cs: ChangeSet) -> DbChangeSet:
def _add_valve(name: str, cs: ChangeSet) -> DbChangeSet:
new = Valve(cs.operations[0])
redo_sql = f"insert into _link (id, type) values ({new.f_id}, {new.f_type});"
@@ -110,10 +110,10 @@ def add_valve(name: str, cs: ChangeSet) -> ChangeSet:
return ChangeSet()
if get_valve(name, cs.operations[0]['id']) != {}:
return ChangeSet()
return execute_command(name, add_valve_cmd(name, cs))
return execute_command(name, _add_valve(name, cs))
def delete_valve_cmd(name: str, cs: ChangeSet) -> DbChangeSet:
def _delete_valve(name: str, cs: ChangeSet) -> DbChangeSet:
old = Valve(get_valve(name, cs.operations[0]['id']))
redo_sql = f"delete from valves where id = {old.f_id};"
@@ -133,7 +133,7 @@ def delete_valve(name: str, cs: ChangeSet) -> ChangeSet:
return ChangeSet()
if get_valve(name, cs.operations[0]['id']) == {}:
return ChangeSet()
return execute_command(name, delete_valve_cmd(name, cs))
return execute_command(name, _delete_valve(name, cs))
#--------------------------------------------------------------