From f7d612d522963ca737b154fce02590b19888633c Mon Sep 17 00:00:00 2001
From: DingZQ <zqding@hotmail.com>
Date: Wed, 12 Feb 2025 22:56:51 +0800
Subject: [PATCH] Return scada properties from API getelementproperties

---
 main.py      | 3 ++-
 tjnetwork.py | 5 +++--
 2 files changed, 5 insertions(+), 3 deletions(-)

diff --git a/main.py b/main.py
index aca3a75..b6ad39a 100644
--- a/main.py
+++ b/main.py
@@ -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]:
     return get_link_properties(network, link)
 
-# type can be 'node' or 'link'
+# type can be 'node' or 'link' or 'scada'
 @app.get('/getelementpropertieswithtype/')
 async def fast_get_element_properties_with_type(network: str, type: str, element: str) -> dict[str, Any]:
     return get_element_properties(network, type, element)
 
+# type can be 'node' or 'link' or 'scada'
 @app.get('/getelementproperties/')
 async def fast_get_element_properties(network: str, element: str) -> dict[str, Any]:
     return get_element_properties(network, element)
diff --git a/tjnetwork.py b/tjnetwork.py
index a2af5f2..77426a5 100644
--- a/tjnetwork.py
+++ b/tjnetwork.py
@@ -432,14 +432,15 @@ def get_element_properties(name: str, type: str, element_id: str) -> dict[str, A
         return {}
    
 # DingZQ, 2025-02-05
+# element_id can be 'node' 'link' 'scada'
 def get_element_properties(name: str, element_id: str) -> dict[str, Any]:
     if api.is_node(name, element_id):
         return get_node_properties(name, element_id)
     elif api.is_link(name, element_id):
         return get_link_properties(name, element_id)
     else:
-        return {}
-
+        return get_scada_element(name, element_id)
+    
 ############################################################
 # title 1.[TITLE]
 ############################################################