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

Support unknown device type

Browse Source
This commit is contained in:
wqy
2023-10-14 15:35:16 +08:00
parent 0457492b21
commit 6c345a29dc
4 changed files with 4 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
api/__init__.py
View File

@@ -124,7 +124,7 @@ 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 .s27_backdrop import get_backdrop_schema, get_backdrop, set_backdrop
from .s29_scada_device import SCADA_DEVICE_TYPE_PRESSURE, SCADA_DEVICE_TYPE_DEMAND, SCADA_DEVICE_TYPE_QUALITY, SCADA_DEVICE_TYPE_LEVEL, SCADA_DEVICE_TYPE_FLOW from .s29_scada_device import SCADA_DEVICE_TYPE_PRESSURE, SCADA_DEVICE_TYPE_DEMAND, SCADA_DEVICE_TYPE_QUALITY, SCADA_DEVICE_TYPE_LEVEL, SCADA_DEVICE_TYPE_FLOW, SCADA_DEVICE_TYPE_UNKNOWN
from .s29_scada_device import get_scada_device_schema, get_scada_device, set_scada_device, add_scada_device, delete_scada_device from .s29_scada_device import get_scada_device_schema, get_scada_device, set_scada_device, add_scada_device, delete_scada_device
from .s29_scada_device import get_all_scada_device_ids, get_all_scada_devices from .s29_scada_device import get_all_scada_device_ids, get_all_scada_devices
from .clean_api import clean_scada_device from .clean_api import clean_scada_device

1
api/s29_scada_device.py
View File

@@ -6,6 +6,7 @@ SCADA_DEVICE_TYPE_DEMAND = 'DEMAND'
SCADA_DEVICE_TYPE_QUALITY = 'QUALITY' SCADA_DEVICE_TYPE_QUALITY = 'QUALITY'
SCADA_DEVICE_TYPE_LEVEL = 'LEVEL' SCADA_DEVICE_TYPE_LEVEL = 'LEVEL'
SCADA_DEVICE_TYPE_FLOW = 'FLOW' SCADA_DEVICE_TYPE_FLOW = 'FLOW'
SCADA_DEVICE_TYPE_UNKNOWN = 'UNKNOWN'
def get_scada_device_schema(name: str) -> dict[str, dict[str, Any]]: def get_scada_device_schema(name: str) -> dict[str, dict[str, Any]]:

2
script/sql/create/29.scada_device.sql
View File

@@ -1,4 +1,4 @@
create type scada_device_type as enum ('PRESSURE', 'DEMAND', 'QUALITY', 'LEVEL', 'FLOW'); create type scada_device_type as enum ('PRESSURE', 'DEMAND', 'QUALITY', 'LEVEL', 'FLOW', 'UNKNOWN');
create table scada_device create table scada_device
( (

1
tjnetwork.py
View File

@@ -149,6 +149,7 @@ SCADA_DEVICE_TYPE_DEMAND = api.SCADA_DEVICE_TYPE_DEMAND
SCADA_DEVICE_TYPE_QUALITY = api.SCADA_DEVICE_TYPE_QUALITY SCADA_DEVICE_TYPE_QUALITY = api.SCADA_DEVICE_TYPE_QUALITY
SCADA_DEVICE_TYPE_LEVEL = api.SCADA_DEVICE_TYPE_LEVEL SCADA_DEVICE_TYPE_LEVEL = api.SCADA_DEVICE_TYPE_LEVEL
SCADA_DEVICE_TYPE_FLOW = api.SCADA_DEVICE_TYPE_FLOW SCADA_DEVICE_TYPE_FLOW = api.SCADA_DEVICE_TYPE_FLOW
SCADA_DEVICE_TYPE_UNKNOWN = api.SCADA_DEVICE_TYPE_UNKNOWN
SCADA_MODEL_TYPE_JUNCTION = api.SCADA_MODEL_TYPE_JUNCTION SCADA_MODEL_TYPE_JUNCTION = api.SCADA_MODEL_TYPE_JUNCTION