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

重构SCADA信息获取，移除旧的数据库接口

Browse Source
This commit is contained in:
Jiang
2026-03-13 11:25:48 +08:00
parent 9aa0646bc6
commit 83a6143146
4 changed files with 51 additions and 63 deletions
Download Patch File Download Diff File Expand all files Collapse all files
app/native/wndb/s38_scada_info.py
+36 -20
View File
@@ -2,12 +2,17 @@ from .database import *
def get_scada_info_schema(name: str) -> dict[str, dict[str, Any]]:
return { 'id' : {'type': 'str' , 'optional': False , 'readonly': True },
'type' : {'type': 'str' , 'optional': False , 'readonly': True },
'x' : {'type': 'float' , 'optional': False , 'readonly': False},
'y' : {'type': 'float' , 'optional': False , 'readonly': False},
'query_api_id' : {'type': 'str' , 'optional': False , 'readonly': False},
'associated_element_id' : {'type': 'str' , 'optional': False , 'readonly': True } }
return {
"id": {"type": "str", "optional": False, "readonly": True},
"type": {"type": "str", "optional": False, "readonly": True},
"x": {"type": "float", "optional": False, "readonly": False},
"y": {"type": "float", "optional": False, "readonly": False},
"query_api_id": {"type": "str", "optional": False, "readonly": False},
"transmission_mode": {"type": "str", "optional": True, "readonly": True},
"transmission_frequency": {"type": "float", "optional": True, "readonly": True},
"reliability": {"type": "float", "optional": True, "readonly": True},
"associated_element_id": {"type": "str", "optional": False, "readonly": True},
}
def get_scada_info(name: str, id: str) -> dict[str, Any]:
@@ -16,15 +21,19 @@ def get_scada_info(name: str, id: str) -> dict[str, Any]:
return {}
d = {}
d['id'] = si['id']
d['type'] = si['type']
d['x'] = float(si['x_coor'])
d['y'] = float(si['y_coor'])
d['api_query_id'] = si['api_query_id']
d['associated_element_id'] = si['associated_element_id']
d["id"] = si["id"]
d["type"] = si["type"]
d["x"] = float(si["x_coor"])
d["y"] = float(si["y_coor"])
d["api_query_id"] = si["api_query_id"]
d["transmission_mode"] = si.get("transmission_mode")
d["transmission_frequency"] = si.get("transmission_frequency")
d["reliability"] = si.get("reliability")
d["associated_element_id"] = si["associated_element_id"]
return d
def get_all_scada_info(name: str) -> list[dict[str, Any]]:
sis = read_all(name, f"select * from scada_info")
if sis is None:
@@ -32,11 +41,18 @@ def get_all_scada_info(name: str) -> list[dict[str, Any]]:
d = []
for si in sis:
d.append({ 'id': si['id'],
'type': si['type'],
'x': float(si['x_coor']),
'y': float(si['y_coor']),
'api_query_id': si['api_query_id'],
'associated_element_id': si['associated_element_id'] })
return d
d.append(
{
"id": si["id"],
"type": si["type"],
"x": float(si["x_coor"]),
"y": float(si["y_coor"]),
"api_query_id": si["api_query_id"],
"transmission_mode": si.get("transmission_mode"),
"transmission_frequency": si.get("transmission_frequency"),
"reliability": si.get("reliability"),
"associated_element_id": si["associated_element_id"],
}
)
return d