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

14
api/s31_scada_element.py
View File

@@ -114,7 +114,7 @@ class ScadaModel(object):
return { 'type': self.type, 'id': self.id }
def set_scada_element_cmd(name: str, cs: ChangeSet) -> DbChangeSet:
def _set_scada_element(name: str, cs: ChangeSet) -> DbChangeSet:
old = ScadaModel(get_scada_element(name, cs.operations[0]['id']))
raw_new = get_scada_element(name, cs.operations[0]['id'])
@@ -139,10 +139,10 @@ def set_scada_element(name: str, cs: ChangeSet) -> ChangeSet:
return ChangeSet()
if _check_model(name, cs) == False:
return ChangeSet()
return execute_command(name, set_scada_element_cmd(name, cs))
return execute_command(name, _set_scada_element(name, cs))
def add_scada_element_cmd(name: str, cs: ChangeSet) -> DbChangeSet:
def _add_scada_element(name: str, cs: ChangeSet) -> DbChangeSet:
new = ScadaModel(cs.operations[0])
redo_sql = f"insert into scada_element (id, x, y, device_id, model_id, model_type, status) values ({new.f_id}, {new.f_x}, {new.f_y}, {new.f_device_id}, {new.f_model_id}, {new.f_model_type}, {new.f_status});"
@@ -159,10 +159,10 @@ def add_scada_element(name: str, cs: ChangeSet) -> ChangeSet:
return ChangeSet()
if _check_model(name, cs) == False:
return ChangeSet()
return execute_command(name, add_scada_element_cmd(name, cs))
return execute_command(name, _add_scada_element(name, cs))
def delete_scada_element_cmd(name: str, cs: ChangeSet) -> DbChangeSet:
def _delete_scada_element(name: str, cs: ChangeSet) -> DbChangeSet:
old = ScadaModel(get_scada_element(name, cs.operations[0]['id']))
redo_sql = f"delete from scada_element where id = {old.f_id};"
@@ -177,10 +177,10 @@ def delete_scada_element_cmd(name: str, cs: ChangeSet) -> DbChangeSet:
def delete_scada_element(name: str, cs: ChangeSet) -> ChangeSet:
if get_scada_element(name, cs.operations[0]['id']) == {}:
return ChangeSet()
return execute_command(name, delete_scada_element_cmd(name, cs))
return execute_command(name, _delete_scada_element(name, cs))
def clean_scada_element_cmd(name: str) -> ChangeSet:
def clean_scada_element_cs(name: str) -> ChangeSet:
cs = ChangeSet()
rows = read_all(name, 'select id from scada_element acs')