diff --git a/model/ddl.sql b/model/ddl.sql index 230bdf7..9e13b52 100644 --- a/model/ddl.sql +++ b/model/ddl.sql @@ -31,8 +31,8 @@ CREATE TABLE PUBLIC.COMPONENT_TYPE ( CREATE TABLE PUBLIC.GRID ( ID BIGSERIAL PRIMARY KEY, + TAGNAME VARCHAR(32) NOT NULL DEFAULT '', NAME VARCHAR(64) NOT NULL DEFAULT '', - TAG_NAME VARCHAR(32) NOT NULL DEFAULT '', DESCRIPTION VARCHAR(512) NOT NULL DEFAULT '', OP INTEGER NOT NULL DEFAULT -1, TS TIMESTAMPTZ NOT NULL DEFAULT CURRENT_TIMESTAMP @@ -41,8 +41,8 @@ CREATE TABLE PUBLIC.GRID ( CREATE TABLE PUBLIC.ZONE ( ID BIGSERIAL PRIMARY KEY, GRID_ID BIGINT NOT NULL, + TAGNAME VARCHAR(32) NOT NULL DEFAULT '', NAME VARCHAR(64) NOT NULL DEFAULT '', - TAG_NAME VARCHAR(32) NOT NULL DEFAULT '', DESCRIPTION VARCHAR(512) NOT NULL DEFAULT '', OP INTEGER NOT NULL DEFAULT -1, TS TIMESTAMPTZ NOT NULL DEFAULT CURRENT_TIMESTAMP, @@ -53,8 +53,8 @@ CREATE TABLE PUBLIC.ZONE ( CREATE TABLE PUBLIC.STATION ( ID BIGSERIAL PRIMARY KEY, ZONE_ID BIGINT NOT NULL, + TAGNAME VARCHAR(32) NOT NULL DEFAULT '', NAME VARCHAR(64) NOT NULL DEFAULT '', - TAG_NAME VARCHAR(32) NOT NULL DEFAULT '', DESCRIPTION VARCHAR(512) NOT NULL DEFAULT '', IS_LOCAL BOOLEAN NOT NULL DEFAULT FALSE, OP INTEGER NOT NULL DEFAULT -1, diff --git a/model/dml.sql b/model/dml.sql index f40f0b5..df4e858 100644 --- a/model/dml.sql +++ b/model/dml.sql @@ -2,23 +2,23 @@ -- grid initialization example INSERT INTO - PUBLIC.GRID (NAME, TAG_NAME, DESCRIPTION, OP) + PUBLIC.GRID (TAGNAME, NAME, DESCRIPTION, OP) VALUES - ('电网','grid000','电网的描述',1); + ('grid000','电网','电网的描述',1); -- zone initialization example INSERT INTO - PUBLIC.ZONE (GRID_ID, NAME, TAG_NAME, DESCRIPTION, OP) + PUBLIC.ZONE (GRID_ID, TAGNAME, NAME, DESCRIPTION, OP) VALUES - (1 ,'区域','zone000','区域的描述',1); + (1 ,'zone000','区域','区域的描述',1); -- station initialization example INSERT INTO - PUBLIC.STATION (ZONE_ID, NAME, TAG_NAME, DESCRIPTION, IS_LOCAL, OP) + PUBLIC.STATION (ZONE_ID, TAGNAME, NAME, DESCRIPTION, IS_LOCAL, OP) VALUES - (1 ,'厂站','station000','厂站的描述',TRUE,1); + (1 ,'station000','厂站','厂站的描述',TRUE,1); -- supported standard component type