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

Fix api name

Browse Source
This commit is contained in:
WQY\qiong
2022-11-14 20:45:45 +08:00
parent 11e732f9b1
commit 9c0cbc885b
1 changed files with 18 additions and 19 deletions
Download Patch File Download Diff File Expand all files Collapse all files

37
api/command.py
View File

@@ -42,12 +42,12 @@ _s11_pattern = 'patten'
_s12_curve = 'curve' _s12_curve = 'curve'
_s13_control = 'control' _s13_control = 'control'
_s14_rule = 'rule' _s14_rule = 'rule'
_s15_global_energy = 'global_energy' _s15_energy = 'energy'
_s15_pump_energy = 'pump_energy' _s15_pump_energy = 'pump_energy'
_s16_emitter = 'emitter' _s16_emitter = 'emitter'
_s17_quality = 'quality' _s17_quality = 'quality'
_s18_source = 'source' _s18_source = 'source'
_s19_global_reaction = 'global_reaction' _s19_reaction = 'reaction'
_s19_pipe_reaction = 'pipe_reaction' _s19_pipe_reaction = 'pipe_reaction'
_s19_tank_reaction = 'tank_reaction' _s19_tank_reaction = 'tank_reaction'
_s20_mixing = 'mixing' _s20_mixing = 'mixing'
@@ -92,7 +92,7 @@ def execute_add_command(name: str, cs: ChangeSet) -> ChangeSet:
return ChangeSet() return ChangeSet()
elif type == _s14_rule: elif type == _s14_rule:
return ChangeSet() return ChangeSet()
elif type == _s15_global_energy: elif type == _s15_energy:
return ChangeSet() return ChangeSet()
elif type == _s15_pump_energy: elif type == _s15_pump_energy:
return ChangeSet() return ChangeSet()
@@ -102,7 +102,7 @@ def execute_add_command(name: str, cs: ChangeSet) -> ChangeSet:
return ChangeSet() return ChangeSet()
elif type == _s18_source: elif type == _s18_source:
return add_source(name, cs) return add_source(name, cs)
elif type == _s19_global_reaction: elif type == _s19_reaction:
return ChangeSet() return ChangeSet()
elif type == _s19_pipe_reaction: elif type == _s19_pipe_reaction:
return ChangeSet() return ChangeSet()
@@ -161,8 +161,8 @@ def execute_update_command(name: str, cs: ChangeSet) -> ChangeSet:
return set_control(name, cs) return set_control(name, cs)
elif type == _s14_rule: elif type == _s14_rule:
return set_rule(name, cs) return set_rule(name, cs)
elif type == _s15_global_energy: elif type == _s15_energy:
return set_global_energy(name, cs) return set_energy(name, cs)
elif type == _s15_pump_energy: elif type == _s15_pump_energy:
return set_pump_energy(name, cs) return set_pump_energy(name, cs)
elif type == _s16_emitter: elif type == _s16_emitter:
@@ -171,8 +171,8 @@ def execute_update_command(name: str, cs: ChangeSet) -> ChangeSet:
return set_quality(name, cs) return set_quality(name, cs)
elif type == _s18_source: elif type == _s18_source:
return set_source(name, cs) return set_source(name, cs)
elif type == _s19_global_reaction: elif type == _s19_reaction:
return set_global_reaction(name, cs) return set_reaction(name, cs)
elif type == _s19_pipe_reaction: elif type == _s19_pipe_reaction:
return set_pipe_reaction(name, cs) return set_pipe_reaction(name, cs)
elif type == _s19_tank_reaction: elif type == _s19_tank_reaction:
@@ -230,7 +230,7 @@ def execute_delete_command(name: str, cs: ChangeSet) -> ChangeSet:
return ChangeSet() return ChangeSet()
elif type == _s14_rule: elif type == _s14_rule:
return ChangeSet() return ChangeSet()
elif type == _s15_global_energy: elif type == _s15_energy:
return ChangeSet() return ChangeSet()
elif type == _s15_pump_energy: elif type == _s15_pump_energy:
return ChangeSet() return ChangeSet()
@@ -240,7 +240,7 @@ def execute_delete_command(name: str, cs: ChangeSet) -> ChangeSet:
return ChangeSet() return ChangeSet()
elif type == _s18_source: elif type == _s18_source:
return delete_source(name, cs) return delete_source(name, cs)
elif type == _s19_global_reaction: elif type == _s19_reaction:
return ChangeSet() return ChangeSet()
elif type == _s19_pipe_reaction: elif type == _s19_pipe_reaction:
return ChangeSet() return ChangeSet()
@@ -317,7 +317,7 @@ def cache_add_command(name: str, cs: ChangeSet) -> SqlChangeSet | None:
return None return None
elif type == _s14_rule: elif type == _s14_rule:
return None return None
elif type == _s15_global_energy: elif type == _s15_energy:
return None return None
elif type == _s15_pump_energy: elif type == _s15_pump_energy:
return None return None
@@ -327,7 +327,7 @@ def cache_add_command(name: str, cs: ChangeSet) -> SqlChangeSet | None:
return None return None
elif type == _s18_source: elif type == _s18_source:
return add_source_cache(name, cs) return add_source_cache(name, cs)
elif type == _s19_global_reaction: elif type == _s19_reaction:
return None return None
elif type == _s19_pipe_reaction: elif type == _s19_pipe_reaction:
return None return None
@@ -386,8 +386,8 @@ def cache_update_command(name: str, cs: ChangeSet) -> SqlChangeSet | None:
return set_control_cache(name, cs) return set_control_cache(name, cs)
elif type == _s14_rule: elif type == _s14_rule:
return set_rule_cache(name, cs) return set_rule_cache(name, cs)
elif type == _s15_global_energy: elif type == _s15_energy:
return set_global_energy_cache(name, cs) return set_energy_cache(name, cs)
elif type == _s15_pump_energy: elif type == _s15_pump_energy:
return set_pump_energy_cache(name, cs) return set_pump_energy_cache(name, cs)
elif type == _s16_emitter: elif type == _s16_emitter:
@@ -396,8 +396,8 @@ def cache_update_command(name: str, cs: ChangeSet) -> SqlChangeSet | None:
return set_quality_cache(name, cs) return set_quality_cache(name, cs)
elif type == _s18_source: elif type == _s18_source:
return set_source_cache(name, cs) return set_source_cache(name, cs)
elif type == _s19_global_reaction: elif type == _s19_reaction:
return set_global_reaction_cache(name, cs) return set_reaction_cache(name, cs)
elif type == _s19_pipe_reaction: elif type == _s19_pipe_reaction:
return set_pipe_reaction_cache(name, cs) return set_pipe_reaction_cache(name, cs)
elif type == _s19_tank_reaction: elif type == _s19_tank_reaction:
@@ -455,7 +455,7 @@ def cache_delete_command(name: str, cs: ChangeSet) -> SqlChangeSet | None:
return None return None
elif type == _s14_rule: elif type == _s14_rule:
return None return None
elif type == _s15_global_energy: elif type == _s15_energy:
return None return None
elif type == _s15_pump_energy: elif type == _s15_pump_energy:
return None return None
@@ -465,7 +465,7 @@ def cache_delete_command(name: str, cs: ChangeSet) -> SqlChangeSet | None:
return None return None
elif type == _s18_source: elif type == _s18_source:
return delete_source_cache(name, cs) return delete_source_cache(name, cs)
elif type == _s19_global_reaction: elif type == _s19_reaction:
return None return None
elif type == _s19_pipe_reaction: elif type == _s19_pipe_reaction:
return None return None
@@ -504,7 +504,6 @@ def execute_batch_command(name: str, cs: ChangeSet) -> ChangeSet:
operation = op['operation'] operation = op['operation']
r = None r = None
demand = None
if operation == API_ADD: if operation == API_ADD:
r = cache_add_command(name, ChangeSet(op)) r = cache_add_command(name, ChangeSet(op))