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

Fix scada device update api

Browse Source
This commit is contained in:
WQY\qiong
2023-02-24 14:43:02 +08:00
parent 6645c7341a
commit aac46ac056
1 changed files with 4 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
api/s30_scada_device_data.py
View File

@@ -38,17 +38,14 @@ def set_scada_device_data_cmd(name: str, cs: ChangeSet) -> DbChangeSet:
f_time, f_value = f"'{time}'", value f_time, f_value = f"'{time}'", value
undo_sql += f"\ninsert into scada_device_data (device_id, time, value) values ({f_device_id}, {f_time}, {f_value});" undo_sql += f"\ninsert into scada_device_data (device_id, time, value) values ({f_device_id}, {f_time}, {f_value});"
redo_cs = { 'type': 'scada_device_data' } | new redo_cs = g_update_prefix | { 'type': 'scada_device_data' } | new
undo_cs = { 'type': 'scada_device_data' } | old undo_cs = g_update_prefix | { 'type': 'scada_device_data' } | old
return DbChangeSet(redo_sql, undo_sql, [redo_cs], [undo_cs]) return DbChangeSet(redo_sql, undo_sql, [redo_cs], [undo_cs])
def set_scada_device_data(name: str, cs: ChangeSet) -> ChangeSet: def set_scada_device_data(name: str, cs: ChangeSet) -> ChangeSet:
result = set_scada_device_data_cmd(name, cs) return execute_command(name, set_scada_device_data_cmd(name, cs))
result.redo_cs[0] |= g_update_prefix
result.undo_cs[0] |= g_update_prefix
return execute_command(name, result)
def add_scada_device_data_cmd(name: str, cs: ChangeSet) -> DbChangeSet: def add_scada_device_data_cmd(name: str, cs: ChangeSet) -> DbChangeSet:
@@ -96,7 +93,7 @@ def delete_scada_device_data(name: str, cs: ChangeSet) -> ChangeSet:
def clean_scada_device_data_cmd(name: str) -> ChangeSet: def clean_scada_device_data_cmd(name: str) -> ChangeSet:
cs = ChangeSet() cs = ChangeSet()
rows = read_all(name, 'select distinct device_id from scada_device_data') rows = read_all(name, 'select distinct device_id from scada_device_data acs')
for row in rows: for row in rows:
cs.update({ 'type': 'scada_device_data', 'device_id': row['device_id'], 'data': [] }) cs.update({ 'type': 'scada_device_data', 'device_id': row['device_id'], 'data': [] })