From 41e033dc0166f09e1dfa0cb519df25264177ed6c Mon Sep 17 00:00:00 2001
From: zhuxu <zhuxu@gyyx.com>
Date: Mon, 7 Jul 2025 20:12:31 +0800
Subject: [PATCH] fine-tune

---
 model/ddl.sql               | 7 ++++---
 model/ddl_4_bay.sql         | 4 ++--
 model/ddl_5_measurement.sql | 4 ++--
 3 files changed, 8 insertions(+), 7 deletions(-)

diff --git a/model/ddl.sql b/model/ddl.sql
index 6ae5de0..c8c6924 100644
--- a/model/ddl.sql
+++ b/model/ddl.sql
@@ -104,7 +104,7 @@ CREATE TABLE PUBLIC.TOPOLOGIC (
 );
 
 CREATE TABLE PUBLIC.BAY (
-    ID BIGSERIAL PRIMARY KEY,
+    BAY_UUID UUID PRIMARY KEY DEFAULT GEN_RANDOM_UUID(),
   	NAME VARCHAR(64) NOT NULL DEFAULT '',
   	TYPE VARCHAR(64) NOT NULL DEFAULT '',
     UNOM DOUBLE PRECISION NOT NULL DEFAULT -1,
@@ -125,6 +125,7 @@ CREATE TABLE PUBLIC.BAY (
     DEV_DYN_SENSE JSONB NOT NULL DEFAULT '[]', -- devices
     DEV_INSTRUCT JSONB NOT NULL DEFAULT '[]', -- devices
     DEV_ETC JSONB NOT NULL DEFAULT '[]', -- devices
+    COMPONENTS UUID[] NOT NULL DEFAULT '{}',
     OP INTEGER NOT NULL DEFAULT -1,
     TS TIMESTAMPTZ NOT NULL DEFAULT CURRENT_TIMESTAMP 
 );
@@ -136,11 +137,11 @@ CREATE TABLE PUBLIC.MEASUREMENT (
     TYPE SMALLINT NOT NULL DEFAULT -1,
     DATA_SOURCE JSONB NOT NULL DEFAULT '{}', -- {"type":1,"main_pos":"","sub_pos":""}
     SIZE INTEGER NOT NULL DEFAULT -1,
-    BAY_ID BIGINT NOT NULL,
+    BAY_UUID UUID NOT NULL,
     COMPONENT_UUID UUID NOT NULL,
     OP INTEGER NOT NULL DEFAULT -1,
     TS TIMESTAMPTZ NOT NULL DEFAULT CURRENT_TIMESTAMP,
 
-    FOREIGN KEY (BAY_ID) REFERENCES PUBLIC.BAY (ID),
+    FOREIGN KEY (BAY_UUID) REFERENCES PUBLIC.BAY (BAY_UUID),
     FOREIGN KEY (COMPONENT_UUID) REFERENCES PUBLIC.COMPONENT (GLOBAL_UUID)
 );
diff --git a/model/ddl_4_bay.sql b/model/ddl_4_bay.sql
index ae85d81..a6b0c8e 100644
--- a/model/ddl_4_bay.sql
+++ b/model/ddl_4_bay.sql
@@ -3,10 +3,10 @@
 -- DROP TABLE IF EXISTS PUBLIC.BAY;
 
 CREATE TABLE PUBLIC.BAY (
-    ID SERIAL PRIMARY KEY,
+    BAY_UUID UUID PRIMARY KEY DEFAULT GEN_RANDOM_UUID(),
   	NAME VARCHAR(64) NOT NULL DEFAULT '',
   	TYPE VARCHAR(64) NOT NULL DEFAULT '',
-    NOMINAL_VOLTAGE DOUBLE PRECISION NOT NULL DEFAULT -1,
+    UNOM DOUBLE PRECISION NOT NULL DEFAULT -1,
     FLA DOUBLE PRECISION NOT NULL DEFAULT -1,
     CAPACITY DOUBLE PRECISION NOT NULL DEFAULT -1,
     DESCRIPTION VARCHAR(512) NOT NULL DEFAULT '',
diff --git a/model/ddl_5_measurement.sql b/model/ddl_5_measurement.sql
index 18a9b8f..f20522c 100644
--- a/model/ddl_5_measurement.sql
+++ b/model/ddl_5_measurement.sql
@@ -9,11 +9,11 @@ CREATE TABLE PUBLIC.MEASUREMENT (
     TYPE SMALLINT NOT NULL DEFAULT -1,
     DATA_SOURCE JSONB NOT NULL DEFAULT '{}', -- {"type":1,"main_pos":"","sub_pos":""}
     SIZE INTEGER NOT NULL DEFAULT -1,
-    BAY_ID INTEGER NOT NULL DEFAULT -1,
+    BAY_UUID UUID NOT NULL,
     COMPONENT_UUID UUID NOT NULL,
     OP INTEGER NOT NULL DEFAULT -1,
     TS TIMESTAMPTZ NOT NULL DEFAULT CURRENT_TIMESTAMP,
 
-    FOREIGN KEY (BAY_ID) REFERENCES PUBLIC.BAY (ID),
+    FOREIGN KEY (BAY_UUID) REFERENCES PUBLIC.BAY (BAY_UUID),
     FOREIGN KEY (COMPONENT_UUID) REFERENCES PUBLIC.COMPONENT (GLOBAL_UUID)
 );
\ No newline at end of file