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

Use operation prefix

Browse Source
This commit is contained in:
WQY\qiong
2022-11-17 18:47:14 +08:00
parent b97d795484
commit 7a85867483
19 changed files with 19 additions and 19 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
api/s10_status.py
View File

@@ -99,7 +99,7 @@ def inp_in_status(section: list[str]) -> ChangeSet:
cs = ChangeSet()
for link, values in objs.items():
obj_cs = {'operation': API_UPDATE, 'type': 'status', 'link' : link, 'status': None, 'setting': None}
obj_cs : dict[str, Any] = g_update_prefix | {'type': 'status', 'link' : link, 'status': None, 'setting': None}
for obj in values:
if obj.is_status:
obj_cs['status'] = obj.status

2
api/s11_patterns.py
View File

@@ -115,7 +115,7 @@ def inp_in_pattern(section: list[str]) -> ChangeSet:
cs = ChangeSet()
for id, factors in patterns.items():
cs.append({'operation': API_ADD, 'type': 'pattern', 'id' : id, 'factors' : factors})
cs.append(g_add_prefix | {'type': 'pattern', 'id' : id, 'factors' : factors})
return cs

2
api/s12_curves.py
View File

@@ -148,7 +148,7 @@ def inp_in_curve(section: list[str]) -> ChangeSet:
cs = ChangeSet()
for id, coords in curves.items():
c_type = types[id] if id in types else CURVE_TYPE_PUMP
cs.append({'operation': API_ADD, 'type': 'curve', 'id' : id, 'c_type': c_type, 'coords' : coords})
cs.append(g_add_prefix | {'type': 'curve', 'id' : id, 'c_type': c_type, 'coords' : coords})
return cs

2
api/s13_controls.py
View File

@@ -33,7 +33,7 @@ class InpControl:
def inp_in_control(section: list[str]) -> ChangeSet:
obj = InpControl(section)
cs = ChangeSet({'operation' : API_UPDATE, 'type': 'control', 'control' : obj.control})
cs = ChangeSet(g_update_prefix | {'type': 'control', 'control' : obj.control})
return cs

2
api/s14_rules.py
View File

@@ -33,7 +33,7 @@ class InpRule:
def inp_in_rule(section: list[str]) -> ChangeSet:
obj = InpRule(section)
cs = ChangeSet({'operation' : API_UPDATE, 'type': 'rule', 'rule' : obj.rule})
cs = ChangeSet(g_update_prefix | {'type': 'rule', 'rule' : obj.rule})
return cs

2
api/s16_emitters.py
View File

@@ -78,7 +78,7 @@ def inp_in_emitter(section: list[str]) -> ChangeSet:
if s.startswith(';'):
continue
obj = InpEmitter(s)
cs.append({'operation': API_UPDATE, 'type': 'emitter', 'junction': obj.junction, 'coefficient': obj.coefficient})
cs.append(g_update_prefix | {'type': 'emitter', 'junction': obj.junction, 'coefficient': obj.coefficient})
return cs

2
api/s17_quality.py
View File

@@ -78,7 +78,7 @@ def inp_in_quality(section: list[str]) -> ChangeSet:
if s.startswith(';'):
continue
obj = InpQuality(s)
cs.append({'operation': API_UPDATE, 'type': 'quality', 'node': obj.node, 'quality': obj.quality})
cs.append(g_update_prefix | {'type': 'quality', 'node': obj.node, 'quality': obj.quality})
return cs

2
api/s18_sources.py
View File

@@ -121,7 +121,7 @@ def inp_in_source(section: list[str]) -> ChangeSet:
if s.startswith(';'):
continue
obj = InpSource(s)
cs.append({'operation': API_ADD, 'type': 'source', 'node': obj.node, 's_type': obj.s_type, 'strength': obj.strength, 'pattern': obj.pattern})
cs.append(g_add_prefix | {'type': 'source', 'node': obj.node, 's_type': obj.s_type, 'strength': obj.strength, 'pattern': obj.pattern})
return cs

2
api/s1_title.py
View File

@@ -34,7 +34,7 @@ class InpTitle:
def inp_in_title(section: list[str]) -> ChangeSet:
obj = InpTitle(section)
cs = ChangeSet({'operation' : API_ADD, 'type': 'title', 'value' : obj.value})
cs = ChangeSet(g_update_prefix | {'type': 'title', 'value' : obj.value})
return cs

2
api/s20_mixing.py
View File

@@ -116,7 +116,7 @@ def inp_in_mixing(section: list[str]) -> ChangeSet:
if s.startswith(';'):
continue
obj = InpMixing(s)
cs.append({'operation': API_ADD, 'type': 'mixing', 'tank': obj.tank, 'model': obj.model, 'value': obj.value})
cs.append(g_add_prefix | {'type': 'mixing', 'tank': obj.tank, 'model': obj.model, 'value': obj.value})
return cs

2
api/s26_labels.py
View File

@@ -116,7 +116,7 @@ def inp_in_label(section: list[str]) -> ChangeSet:
if s.startswith(';'):
continue
obj = InpLabel(s)
cs.append({'operation': API_ADD, 'type': 'label', 'x': obj.x, 'y': obj.y, 'label': obj.label, 'node': obj.node})
cs.append(g_add_prefix | {'type': 'label', 'x': obj.x, 'y': obj.y, 'label': obj.label, 'node': obj.node})
return cs

2
api/s2_junctions.py
View File

@@ -142,7 +142,7 @@ def inp_in_junction(section: list[str]) -> ChangeSet:
if s.startswith(';'):
continue
obj = InpJunction(s)
cs.append({'operation': API_ADD, 'type': 'junction', 'id': obj.id, 'elevation': obj.elevation, 'demand': obj.demand, 'pattern': obj.pattern})
cs.append(g_add_prefix | {'type': 'junction', 'id': obj.id, 'elevation': obj.elevation, 'demand': obj.demand, 'pattern': obj.pattern})
return cs

2
api/s3_reservoirs.py
View File

@@ -137,7 +137,7 @@ def inp_in_reservoir(section: list[str]) -> ChangeSet:
if s.startswith(';'):
continue
obj = InpReservoir(s)
cs.append({'operation': API_ADD, 'type': 'reservoir', 'id': obj.id, 'head': obj.head, 'pattern': obj.pattern})
cs.append(g_add_prefix | {'type': 'reservoir', 'id': obj.id, 'head': obj.head, 'pattern': obj.pattern})
return cs

2
api/s4_tanks.py
View File

@@ -171,7 +171,7 @@ def inp_in_tank(section: list[str]) -> ChangeSet:
if s.startswith(';'):
continue
obj = InpTank(s)
cs.append({'operation': API_ADD, 'type': 'tank', 'id': obj.id, 'elevation': obj.elevation, 'init_level': obj.init_level, 'min_level': obj.min_level, 'max_level': obj.max_level, 'diameter': obj.diameter, 'min_vol': obj.min_vol, 'vol_curve': obj.vol_curve, 'overflow': obj.overflow})
cs.append(g_add_prefix | {'type': 'tank', 'id': obj.id, 'elevation': obj.elevation, 'init_level': obj.init_level, 'min_level': obj.min_level, 'max_level': obj.max_level, 'diameter': obj.diameter, 'min_vol': obj.min_vol, 'vol_curve': obj.vol_curve, 'overflow': obj.overflow})
return cs

2
api/s5_pipes.py
View File

@@ -150,7 +150,7 @@ def inp_in_pipe(section: list[str]) -> ChangeSet:
if s.startswith(';'):
continue
obj = InpPipe(s)
cs.append({'operation': API_ADD, 'type': 'pipe', 'id': obj.id, 'node1': obj.node1, 'node2': obj.node2, 'length': obj.length, 'diameter': obj.diameter, 'roughness': obj.roughness, 'minor_loss': obj.minor_loss, 'status': obj.status})
cs.append(g_add_prefix | {'type': 'pipe', 'id': obj.id, 'node1': obj.node1, 'node2': obj.node2, 'length': obj.length, 'diameter': obj.diameter, 'roughness': obj.roughness, 'minor_loss': obj.minor_loss, 'status': obj.status})
return cs

2
api/s6_pumps.py
View File

@@ -142,7 +142,7 @@ def inp_in_pump(section: list[str]) -> ChangeSet:
if s.startswith(';'):
continue
obj = InpPump(s)
cs.append({'operation': API_ADD, 'type': 'pump', 'id': obj.id, 'node1': obj.node1, 'node2': obj.node2, 'power': obj.power, 'head': obj.head, 'speed': obj.speed, 'pattern': obj.pattern})
cs.append(g_add_prefix | {'type': 'pump', 'id': obj.id, 'node1': obj.node1, 'node2': obj.node2, 'power': obj.power, 'head': obj.head, 'speed': obj.speed, 'pattern': obj.pattern})
return cs

2
api/s7_valves.py
View File

@@ -147,7 +147,7 @@ def inp_in_valve(section: list[str]) -> ChangeSet:
if s.startswith(';'):
continue
obj = InpValve(s)
cs.append({'operation': API_ADD, 'type': 'valve', 'id': obj.id, 'node1': obj.node1, 'node2': obj.node2, 'diameter': obj.diameter, 'v_type': obj.v_type, 'setting': obj.setting, 'minor_loss': obj.minor_loss})
cs.append(g_add_prefix | {'type': 'valve', 'id': obj.id, 'node1': obj.node1, 'node2': obj.node2, 'diameter': obj.diameter, 'v_type': obj.v_type, 'setting': obj.setting, 'minor_loss': obj.minor_loss})
return cs

2
api/s8_tags.py
View File

@@ -99,7 +99,7 @@ def inp_in_tag(section: list[str]) -> ChangeSet:
if s.startswith(';'):
continue
obj = InpTag(s)
cs.append({'operation': API_UPDATE, 'type': 'tag', 't_type': obj.t_type, 'id': obj.id, 'tag': obj.tag})
cs.append(g_update_prefix | {'type': 'tag', 't_type': obj.t_type, 'id': obj.id, 'tag': obj.tag})
return cs

2
api/s9_demands.py
View File

@@ -113,7 +113,7 @@ def inp_in_demand(section: list[str]) -> ChangeSet:
cs = ChangeSet()
for junction, demands in objs.items():
obj_cs = {'operation': API_UPDATE, 'type': 'demand', 'junction' : junction, 'demands' : []}
obj_cs : dict[str, Any] = g_update_prefix | {'type': 'demand', 'junction' : junction, 'demands' : []}
for obj in demands:
obj_cs['demands'].append({'demand': obj.demand, 'pattern' : obj.pattern, 'category': obj.category})
cs.append(obj_cs)