diff --git a/api/s38_scada_info.py b/api/s38_scada_info.py index 041fff5..826c88a 100644 --- a/api/s38_scada_info.py +++ b/api/s38_scada_info.py @@ -6,8 +6,8 @@ def get_scada_info_schema(name: str) -> dict[str, dict[str, Any]]: '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 } } + 'query_api_id' : {'type': 'str' , 'optional': False , 'readonly': False}, + 'associated_element_id' : {'type': 'str' , 'optional': False , 'readonly': True } } def get_scada_info(name: str, id: str) -> dict[str, Any]: @@ -16,12 +16,12 @@ def get_scada_info(name: str, id: str) -> dict[str, Any]: return {} d = {} - d['id'] = str(si['id']) - d['type'] = str(si['type']) + d['id'] = si['id'] + d['type'] = si['type'] d['x'] = float(si['x']) d['y'] = float(si['y']) - d['api_query_id'] = str(si['api_query_id']) - d['associated_element_id'] = str(si['associated_element_id']) + d['api_query_id'] = si['api_query_id'] + d['associated_element_id'] = si['associated_element_id'] return d @@ -32,11 +32,11 @@ def get_all_scada_info(name: str) -> list[dict[str, Any]]: d = [] for si in sis: - d.append({ 'id': str(si['id']), - 'type': str(si['type']), + d.append({ 'id': si['id'], + 'type': si['type'], 'x': float(si['x']), 'y': float(si['y']), - 'api_query_id': str(si['api_query_id']), - 'associated_element_id': str(si['associated_element_id']) }) + 'api_query_id': si['api_query_id'], + 'associated_element_id': si['associated_element_id'] }) return d \ No newline at end of file