diff --git a/api/__init__.py b/api/__init__.py index cb32a38..7c33afd 100644 --- a/api/__init__.py +++ b/api/__init__.py @@ -100,4 +100,6 @@ from .s26_labels import get_label_schema, get_label, set_label, add_label, delet from .s27_backdrop import get_backdrop_schema, get_backdrop, set_backdrop from .s29_scada_model import SCADA_TYPE_PRESSURE, SCADA_TYPE_DEMAND, SCADA_TYPE_QUALITY, SCADA_TYPE_LEVEL, SCADA_TYPE_FLOW -from .s29_scada_model import get_scada_model_schema, get_scada_model, set_scada_model, add_scada_model, delete_scada_model \ No newline at end of file +from .s29_scada_model import get_scada_model_schema, get_scada_model, set_scada_model, add_scada_model, delete_scada_model + +from .s30_scada_data import get_scada_data_schema, get_scada_data, set_scada_data diff --git a/api/s30_scada_data.py b/api/s30_scada_data.py new file mode 100644 index 0000000..e222131 --- /dev/null +++ b/api/s30_scada_data.py @@ -0,0 +1,51 @@ +from .database import * + + +def get_scada_data_schema(name: str) -> dict[str, dict[str, Any]]: + return { 'device_id' : {'type': 'str' , 'optional': False , 'readonly': True }, + 'data' : {'type': 'list' , 'optional': False , 'readonly': False, + 'element': { 'time' : {'type': 'str' , 'optional': False , 'readonly': False }, + 'value' : {'type': 'float' , 'optional': False , 'readonly': False } }}} + + +def get_scada_data(name: str, device_id: str) -> dict[str, Any]: + sds = read_all(name, f"select * from scada_data where device_id = '{device_id}' order by time") + ds = [] + for r in sds: + ds.append({ 'time': str(r['time']), 'value': float(r['value']) }) + return { 'device_id': device_id, 'data': ds } + + +def set_scada_data_cmd(name: str, cs: ChangeSet) -> DbChangeSet: + device_id = cs.operations[0]['device_id'] + + old = get_scada_data(name, device_id) + new = { 'device_id': device_id, 'data': [] } + + f_device_id = f"'{device_id}'" + + # TODO: transaction ? + redo_sql = f"delete from scada_data where device_id = {f_device_id};" + for tv in cs.operations[0]['data']: + time, value = str(tv['time']), float(tv['value']) + f_time, f_value = f"'{time}'", value + redo_sql += f"\ninsert into scada_data (device_id, time, value) values ({f_device_id}, {f_time}, {f_value});" + new['data'].append({ 'time': time, 'value': value }) + + undo_sql = f"delete from scada_data where device_id = {f_device_id};" + for tv in old['data']: + time, value = str(tv['time']), float(tv['value']) + f_time, f_value = f"'{time}'", value + undo_sql += f"\ninsert into scada_data (device_id, time, value) values ({f_device_id}, {f_time}, {f_value});" + + redo_cs = { 'type': 'scada_data' } | new + undo_cs = { 'type': 'scada_data' } | old + + return DbChangeSet(redo_sql, undo_sql, [redo_cs], [undo_cs]) + + +def set_scada_data(name: str, cs: ChangeSet) -> ChangeSet: + result = set_scada_data_cmd(name, cs) + result.redo_cs[0] |= g_update_prefix + result.undo_cs[0] |= g_update_prefix + return execute_command(name, result) diff --git a/tjnetwork.py b/tjnetwork.py index 161ab8c..00c9abb 100644 --- a/tjnetwork.py +++ b/tjnetwork.py @@ -748,3 +748,18 @@ def add_scada_model(name: str, cs: ChangeSet) -> ChangeSet: def delete_scada_model(name: str, cs: ChangeSet) -> ChangeSet: return api.delete_scada_model(name, cs) + + +############################################################ +# scada_data 29 +############################################################ + +def get_scada_data_schema(name: str) -> dict[str, dict[str, Any]]: + return api.get_scada_data_schema(name) + +def get_scada_data(name: str, device_id: str) -> dict[str, Any]: + return api.get_scada_data(name, device_id) + +# example: set_scada_data(p, ChangeSet({'device_id': 'sm_device', 'data': [{ 'time': '2023-02-10 00:02:22', 'value': 100.0 }, { 'time': '2023-02-10 00:03:22', 'value': 200.0 }]})) +def set_scada_data(name: str, cs: ChangeSet) -> ChangeSet: + return api.set_scada_data(name, cs)