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

Fixed the getelementpropertieswithtype

Browse Source
This commit is contained in:
DingZQ
2025-03-02 10:59:21 +08:00
parent d14666fcff
commit 36e1692ccf
2 changed files with 4 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
main.py
View File

@@ -522,7 +522,7 @@ async def fast_get_link_properties(network: str, link: str) -> dict[str, Any]:
# type can be 'node' or 'link' or 'scada' # type can be 'node' or 'link' or 'scada'
@app.get('/getelementpropertieswithtype/') @app.get('/getelementpropertieswithtype/')
async def fast_get_element_properties_with_type(network: str, type: str, element: str) -> dict[str, Any]: async def fast_get_element_properties_with_type(network: str, type: str, element: str) -> dict[str, Any]:
return get_element_properties(network, type, element) return get_element_properties_with_type(network, type, element)
# type can be 'node' or 'link' or 'scada' # type can be 'node' or 'link' or 'scada'
@app.get('/getelementproperties/') @app.get('/getelementproperties/')

4
tjnetwork.py
View File

@@ -423,11 +423,13 @@ def get_link_properties(name: str, link_id: str) -> dict[str, Any]:
return api.get_valve(name, link_id) return api.get_valve(name, link_id)
# type can be 'node' or 'link' # type can be 'node' or 'link'
def get_element_properties(name: str, type: str, element_id: str) -> dict[str, Any]: def get_element_properties_with_type(name: str, type: str, element_id: str) -> dict[str, Any]:
if type == 'node': if type == 'node':
return get_node_properties(name, element_id) return get_node_properties(name, element_id)
elif type == 'link': elif type == 'link':
return get_link_properties(name, element_id) return get_link_properties(name, element_id)
elif type == 'scada':
return get_scada_info(name, element_id)
else: else:
return {} return {}