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:42:01 +08:00
parent 35d2ce08e1
commit 4b452c5f0a
12 changed files with 141 additions and 171 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
api/batch_cmds.py
View File

@@ -22,18 +22,14 @@ from .s18_sources import set_source, add_source, delete_source
from .s19_reactions import set_reaction, set_pipe_reaction, set_tank_reaction
from .s20_mixing import set_mixing, add_mixing, delete_mixing
from .s21_times import set_time
#from .s22_report import *
from .s23_options import set_option
from .s23_options_v3 import set_option_v3
#from .s24_coordinates import *
from .s23_options_util import set_option, set_option_v3
from .s25_vertices import set_vertex, add_vertex, delete_vertex
from .s26_labels import set_label, add_label, delete_label
from .s27_backdrop import set_backdrop
# from .s28_end import *
from .s29_scada_device import set_scada_device, add_scada_device, delete_scada_device
from .s30_scada_device_data import set_scada_device_data, add_scada_device_data, delete_scada_device_data
from .s31_scada_element import set_scada_element, add_scada_element, delete_scada_element
from .del_cmd_raw import del_cascade_cmd
from .api_cs import extend
def execute_add_command(name: str, cs: ChangeSet) -> ChangeSet:
@@ -272,7 +268,7 @@ def execute_batch_commands(name: str, cs: ChangeSet) -> ChangeSet:
new_cs = ChangeSet()
for op in cs.operations:
if op['operation'] == API_DELETE:
new_cs.merge(del_cascade_cmd(name, ChangeSet(op)))
new_cs.merge(extend(name, ChangeSet(op)))
else:
new_cs.merge(ChangeSet(op))
@@ -304,7 +300,7 @@ def execute_batch_command(name: str, cs: ChangeSet) -> ChangeSet:
new_cs = ChangeSet()
for op in cs.operations:
if op['operation'] == API_DELETE:
new_cs.merge(del_cascade_cmd(name, ChangeSet(op)))
new_cs.merge(extend(name, ChangeSet(op)))
else:
new_cs.merge(ChangeSet(op))