Accept Merge Request #124: (api -> master)

Merge Request: Prevent duplicate cascade

Created By: @王琼钰
Accepted By: @王琼钰
URL: https://tjwater.coding.net/p/tjwatercloud/d/TJWaterServer/git/merge/124
This commit is contained in:
王琼钰
2023-02-04 14:06:26 +08:00

View File

@@ -4,47 +4,47 @@ from .batch_cmd import execute_batch_command
def delete_junction_cascade(name: str, cs: ChangeSet) -> ChangeSet:
cs.operations[0] |= { 'operation' : API_DELETE, 'type' : 'junction' }
raw_cmd = delete_junction_cascade_batch_cmd(name, cs)
return execute_batch_command(name, raw_cmd)
#raw_cmd = delete_junction_cascade_batch_cmd(name, cs)
return execute_batch_command(name, cs)
def delete_reservoir_cascade(name: str, cs: ChangeSet) -> ChangeSet:
cs.operations[0] |= { 'operation' : API_DELETE, 'type' : 'reservoir' }
raw_cmd = delete_reservoir_cascade_batch_cmd(name, cs)
return execute_batch_command(name, raw_cmd)
#raw_cmd = delete_reservoir_cascade_batch_cmd(name, cs)
return execute_batch_command(name, cs)
def delete_tank_cascade(name: str, cs: ChangeSet) -> ChangeSet:
cs.operations[0] |= { 'operation' : API_DELETE, 'type' : 'tank' }
raw_cmd = delete_tank_cascade_batch_cmd(name, cs)
return execute_batch_command(name, raw_cmd)
#raw_cmd = delete_tank_cascade_batch_cmd(name, cs)
return execute_batch_command(name, cs)
def delete_pipe_cascade(name: str, cs: ChangeSet) -> ChangeSet:
cs.operations[0] |= { 'operation' : API_DELETE, 'type' : 'pipe' }
raw_cmd = delete_pipe_cascade_batch_cmd(name, cs)
return execute_batch_command(name, raw_cmd)
#raw_cmd = delete_pipe_cascade_batch_cmd(name, cs)
return execute_batch_command(name, cs)
def delete_pump_cascade(name: str, cs: ChangeSet) -> ChangeSet:
cs.operations[0] |= { 'operation' : API_DELETE, 'type' : 'pump' }
raw_cmd = delete_pump_cascade_batch_cmd(name, cs)
return execute_batch_command(name, raw_cmd)
#raw_cmd = delete_pump_cascade_batch_cmd(name, cs)
return execute_batch_command(name, cs)
def delete_valve_cascade(name: str, cs: ChangeSet) -> ChangeSet:
cs.operations[0] |= { 'operation' : API_DELETE, 'type' : 'valve' }
raw_cmd = delete_valve_cascade_batch_cmd(name, cs)
return execute_batch_command(name, raw_cmd)
#raw_cmd = delete_valve_cascade_batch_cmd(name, cs)
return execute_batch_command(name, cs)
def delete_pattern_cascade(name: str, cs: ChangeSet) -> ChangeSet:
cs.operations[0] |= { 'operation' : API_DELETE, 'type' : 'pattern' }
raw_cmd = delete_pattern_cascade_batch_cmd(name, cs)
return execute_batch_command(name, raw_cmd)
#raw_cmd = delete_pattern_cascade_batch_cmd(name, cs)
return execute_batch_command(name, cs)
def delete_curve_cascade(name: str, cs: ChangeSet) -> ChangeSet:
cs.operations[0] |= { 'operation' : API_DELETE, 'type' : 'curve' }
raw_cmd = delete_curve_cascade_batch_cmd(name, cs)
return execute_batch_command(name, raw_cmd)
#raw_cmd = delete_curve_cascade_batch_cmd(name, cs)
return execute_batch_command(name, cs)