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

@@ -16,7 +16,7 @@ def get_scada_device_data(name: str, device_id: str) -> dict[str, Any]:
return { 'device_id': device_id, 'data': ds }
def set_scada_device_data_cmd(name: str, cs: ChangeSet) -> DbChangeSet:
def _set_scada_device_data(name: str, cs: ChangeSet) -> DbChangeSet:
device_id = cs.operations[0]['device_id']
old = get_scada_device_data(name, device_id)
@@ -45,10 +45,10 @@ def set_scada_device_data_cmd(name: str, cs: ChangeSet) -> DbChangeSet:
def set_scada_device_data(name: str, cs: ChangeSet) -> ChangeSet:
return execute_command(name, set_scada_device_data_cmd(name, cs))
return execute_command(name, _set_scada_device_data(name, cs))
def add_scada_device_data_cmd(name: str, cs: ChangeSet) -> DbChangeSet:
def _add_scada_device_data(name: str, cs: ChangeSet) -> DbChangeSet:
values = cs.operations[0]
device_id = values['device_id']
time = values['time']
@@ -66,10 +66,10 @@ def add_scada_device_data(name: str, cs: ChangeSet) -> ChangeSet:
row = try_read(name, f"select * from scada_device_data where device_id = '{cs.operations[0]['device_id']}' and time = '{cs.operations[0]['time']}'")
if row != None:
return ChangeSet()
return execute_command(name, add_scada_device_data_cmd(name, cs))
return execute_command(name, _add_scada_device_data(name, cs))
def delete_scada_device_data_cmd(name: str, cs: ChangeSet) -> DbChangeSet:
def _delete_scada_device_data(name: str, cs: ChangeSet) -> DbChangeSet:
values = cs.operations[0]
device_id = values['device_id']
time = values['time']
@@ -87,10 +87,10 @@ def delete_scada_device_data(name: str, cs: ChangeSet) -> ChangeSet:
row = try_read(name, f"select * from scada_device_data where device_id = '{cs.operations[0]['device_id']}' and time = '{cs.operations[0]['time']}'")
if row == None:
return ChangeSet()
return execute_command(name, delete_scada_device_data_cmd(name, cs))
return execute_command(name, _delete_scada_device_data(name, cs))
def clean_scada_device_data_cmd(name: str) -> ChangeSet:
def clean_scada_device_data_cs(name: str) -> ChangeSet:
cs = ChangeSet()
rows = read_all(name, 'select distinct device_id from scada_device_data acs')