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

Refine type

Browse Source
This commit is contained in:
WQY\qiong
2023-05-13 10:41:05 +08:00
parent 3114a0a92e
commit d5a2e006a1
6 changed files with 22 additions and 22 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
api/s29_scada_device.py
View File

@@ -23,7 +23,7 @@ def get_scada_device(name: str, id: str) -> dict[str, Any]:
d['id'] = str(sm['id'])
d['name'] = str(sm['name']) if sm['name'] != None else None
d['address'] = str(sm['address']) if sm['address'] != None else None
d['sd_type'] = str(sm['type']) if sm['type'] != None else None
d['sd_type'] = str(sm['sd_type']) if sm['sd_type'] != None else None
return d
@@ -59,8 +59,8 @@ def _set_scada_device(name: str, cs: ChangeSet) -> DbChangeSet:
raw_new[key] = new_dict[key]
new = ScadaDevice(raw_new)
redo_sql = f"update scada_device set name = {new.f_name}, address = {new.f_address}, type = {new.f_sd_type} where id = {new.f_id};"
undo_sql = f"update scada_device set name = {old.f_name}, address = {old.f_address}, type = {old.f_sd_type} where id = {old.f_id};"
redo_sql = f"update scada_device set name = {new.f_name}, address = {new.f_address}, sd_type = {new.f_sd_type} where id = {new.f_id};"
undo_sql = f"update scada_device set name = {old.f_name}, address = {old.f_address}, sd_type = {old.f_sd_type} where id = {old.f_id};"
redo_cs = g_update_prefix | new.as_dict()
undo_cs = g_update_prefix | old.as_dict()
@@ -77,7 +77,7 @@ def set_scada_device(name: str, cs: ChangeSet) -> ChangeSet:
def _add_scada_device(name: str, cs: ChangeSet) -> DbChangeSet:
new = ScadaDevice(cs.operations[0])
redo_sql = f"insert into scada_device (id, name, address, type) values ({new.f_id}, {new.f_name}, {new.f_address}, {new.f_sd_type});"
redo_sql = f"insert into scada_device (id, name, address, sd_type) values ({new.f_id}, {new.f_name}, {new.f_address}, {new.f_sd_type});"
undo_sql = f"delete from scada_device where id = {new.f_id};"
redo_cs = g_add_prefix | new.as_dict()
@@ -96,7 +96,7 @@ def _delete_scada_device(name: str, cs: ChangeSet) -> DbChangeSet:
old = ScadaDevice(get_scada_device(name, cs.operations[0]['id']))
redo_sql = f"delete from scada_device where id = {old.f_id};"
undo_sql = f"insert into scada_device (id, name, address, type) values ({old.f_id}, {old.f_name}, {old.f_address}, {old.f_sd_type});"
undo_sql = f"insert into scada_device (id, name, address, sd_type) values ({old.f_id}, {old.f_name}, {old.f_address}, {old.f_sd_type});"
redo_cs = g_delete_prefix | old.as_id_dict()
undo_cs = g_add_prefix | old.as_dict()