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

Return scada properties from API getelementproperties

Browse Source
This commit is contained in:
DingZQ
2025-02-12 22:56:51 +08:00
parent 4872772165
commit f7d612d522
2 changed files with 5 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
main.py
View File

@@ -519,11 +519,12 @@ async def fast_get_node_properties(network: str, node: str) -> dict[str, Any]:
async def fast_get_link_properties(network: str, link: str) -> dict[str, Any]: async def fast_get_link_properties(network: str, link: str) -> dict[str, Any]:
return get_link_properties(network, link) return get_link_properties(network, link)
# type can be 'node' or 'link' # 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(network, type, element)
# type can be 'node' or 'link' or 'scada'
@app.get('/getelementproperties/') @app.get('/getelementproperties/')
async def fast_get_element_properties(network: str, element: str) -> dict[str, Any]: async def fast_get_element_properties(network: str, element: str) -> dict[str, Any]:
return get_element_properties(network, element) return get_element_properties(network, element)

3
tjnetwork.py
View File

@@ -432,13 +432,14 @@ def get_element_properties(name: str, type: str, element_id: str) -> dict[str, A
return {} return {}
# DingZQ, 2025-02-05 # DingZQ, 2025-02-05
# element_id can be 'node' 'link' 'scada'
def get_element_properties(name: str, element_id: str) -> dict[str, Any]: def get_element_properties(name: str, element_id: str) -> dict[str, Any]:
if api.is_node(name, element_id): if api.is_node(name, element_id):
return get_node_properties(name, element_id) return get_node_properties(name, element_id)
elif api.is_link(name, element_id): elif api.is_link(name, element_id):
return get_link_properties(name, element_id) return get_link_properties(name, element_id)
else: else:
return {} return get_scada_element(name, element_id)
############################################################ ############################################################
# title 1.[TITLE] # title 1.[TITLE]