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/s4_tanks.py
View File

@@ -76,7 +76,7 @@ class Tank(object):
return { 'type': self.type, 'id': self.id }
def set_tank_cmd(name: str, cs: ChangeSet) -> DbChangeSet:
def _set_tank(name: str, cs: ChangeSet) -> DbChangeSet:
old = Tank(get_tank(name, cs.operations[0]['id']))
raw_new = get_tank(name, cs.operations[0]['id'])
@@ -104,10 +104,10 @@ def set_tank(name: str, cs: ChangeSet) -> ChangeSet:
return ChangeSet()
if get_tank(name, cs.operations[0]['id']) == {}:
return ChangeSet()
return execute_command(name, set_tank_cmd(name, cs))
return execute_command(name, _set_tank(name, cs))
def add_tank_cmd(name: str, cs: ChangeSet) -> DbChangeSet:
def _add_tank(name: str, cs: ChangeSet) -> DbChangeSet:
new = Tank(cs.operations[0])
redo_sql = f"insert into _node (id, type) values ({new.f_id}, {new.f_type});"
@@ -129,10 +129,10 @@ def add_tank(name: str, cs: ChangeSet) -> ChangeSet:
return ChangeSet()
if get_tank(name, cs.operations[0]['id']) != {}:
return ChangeSet()
return execute_command(name, add_tank_cmd(name, cs))
return execute_command(name, _add_tank(name, cs))
def delete_tank_cmd(name: str, cs: ChangeSet) -> DbChangeSet:
def _delete_tank(name: str, cs: ChangeSet) -> DbChangeSet:
old = Tank(get_tank(name, cs.operations[0]['id']))
redo_sql = sql_delete_coord(old.id)
@@ -154,7 +154,7 @@ def delete_tank(name: str, cs: ChangeSet) -> ChangeSet:
return ChangeSet()
if get_tank(name, cs.operations[0]['id']) == {}:
return ChangeSet()
return execute_command(name, delete_tank_cmd(name, cs))
return execute_command(name, _delete_tank(name, cs))
#--------------------------------------------------------------