From c377d90fe2a01c2118f6c69c3c177f75be7c318b Mon Sep 17 00:00:00 2001
From: wangfei <3597712270@qq.com>
Date: 星期五, 29 十一月 2024 15:20:51 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
hangzhoumesParent/moduleService/TemperingGlassModule/src/main/resources/changelog/changelog.sql | 137 +++++++++++++++++++++++++++++++++++++++------
1 files changed, 118 insertions(+), 19 deletions(-)
diff --git a/hangzhoumesParent/moduleService/TemperingGlassModule/src/main/resources/changelog/changelog.sql b/hangzhoumesParent/moduleService/TemperingGlassModule/src/main/resources/changelog/changelog.sql
index 68e1a70..2b854f2 100644
--- a/hangzhoumesParent/moduleService/TemperingGlassModule/src/main/resources/changelog/changelog.sql
+++ b/hangzhoumesParent/moduleService/TemperingGlassModule/src/main/resources/changelog/changelog.sql
@@ -1,11 +1,11 @@
---liquibase formatted sql
+-- liquibase formatted sql
---changeset zsh:20240904001
---preconditions onFail:CONTINUE onError:CONTINUE
---precondition-sql-check expectedResult:0 SELECT COUNT(*) FROM INFORMATION_SCHEMA.TABLES WHERE TABLE_NAME = 'sys_dict_type';
+-- changeset zsh:20240904001
+-- preconditions onFail:CONTINUE onError:CONTINUE
+-- precondition-sql-check expectedResult:0 SELECT COUNT(*) FROM INFORMATION_SCHEMA.TABLES WHERE TABLE_NAME = 'sys_dict_type' and table_schema = 'hangzhoumes';
CREATE TABLE sys_dict_type
(
- dict_id BIGINT AUTO_INCREMENT PRIMARY KEY,
+ dict_id INT AUTO_INCREMENT PRIMARY KEY,
dict_name VARCHAR(32) NOT NULL,
dict_type VARCHAR(32) NOT NULL,
state CHAR(1) NOT NULL DEFAULT TRUE,
@@ -13,14 +13,14 @@
create_time TIMESTAMP NOT NULL DEFAULT CURRENT_TIMESTAMP,
deleted char(1) DEFAULT 0
);
---rollback DROP TABLE sys_dict_type;
+-- rollback DROP TABLE sys_dict_type;
---changeset zsh:20240904002
---preconditions onFail:CONTINUE onError:CONTINUE
---precondition-sql-check expectedResult:0 SELECT COUNT(*) FROM INFORMATION_SCHEMA.TABLES WHERE TABLE_NAME = 'sys_dict_data';
+-- changeset zsh:20240904002
+-- preconditions onFail:CONTINUE onError:CONTINUE
+-- precondition-sql-check expectedResult:0 SELECT COUNT(*) FROM INFORMATION_SCHEMA.TABLES WHERE TABLE_NAME = 'sys_dict_data' and table_schema = 'hangzhoumes';
CREATE TABLE sys_dict_data
(
- dict_id BIGINT AUTO_INCREMENT PRIMARY KEY,
+ dict_id INT AUTO_INCREMENT PRIMARY KEY,
dict_sort INT NOT NULL,
dict_label VARCHAR(32) NOT NULL,
dict_value VARCHAR(32) NOT NULL,
@@ -31,12 +31,12 @@
create_time TIMESTAMP NOT NULL DEFAULT CURRENT_TIMESTAMP,
deleted char(1) DEFAULT 0
);
---rollback DROP TABLE sys_dict_data;
+-- rollback DROP TABLE sys_dict_data;
---changeset zsh:20240904003
---preconditions onFail:CONTINUE onError:CONTINUE
---precondition-sql-check expectedResult:0 SELECT COUNT(*) FROM sys_dict_type WHERE dict_type in ('clearGlass', 'silver', 'doubleSilver', 'thirdSilver', 'ultraClear', 'heatReflect');
+-- changeset zsh:20240904003
+-- preconditions onFail:CONTINUE onError:CONTINUE
+-- precondition-sql-check expectedResult:0 SELECT COUNT(*) FROM sys_dict_type WHERE dict_type in ('clearGlass', 'silver', 'doubleSilver', 'thirdSilver', 'ultraClear', 'heatReflect');
INSERT INTO sys_dict_type (dict_name, dict_type, state, description, deleted)
VALUES ('鐧界幓', 'clearGlass', '1', '0', '0');
INSERT INTO sys_dict_type (dict_name, dict_type, state, description, deleted)
@@ -49,11 +49,11 @@
VALUES ('瓒呯櫧', 'ultraClear', '1', '4', '0');
INSERT INTO sys_dict_type (dict_name, dict_type, state, description, deleted)
VALUES ('鐑弽灏�', 'heatReflect', '1', '5', '0');
---rollback DELETE FROM sys_dict_type WHERE dict_type in ('clearGlass', 'silver', 'doubleSilver', 'thirdSilver', 'ultraClear', 'heatReflect');
+-- rollback DELETE FROM sys_dict_type WHERE dict_type in ('clearGlass', 'silver', 'doubleSilver', 'thirdSilver', 'ultraClear', 'heatReflect');
---changeset zsh:20240904004
---preconditions onFail:CONTINUE onError:CONTINUE
---precondition-sql-check expectedResult:0 SELECT COUNT(*) FROM sys_dict_data WHERE dict_type in ('clearGlass', 'silver', 'doubleSilver', 'thirdSilver', 'ultraClear', 'heatReflect');
+-- changeset zsh:20240904004
+-- preconditions onFail:CONTINUE onError:CONTINUE
+-- precondition-sql-check expectedResult:0 SELECT COUNT(*) FROM sys_dict_data WHERE dict_type in ('鐧界幓', '鍗曢摱', '鍙岄摱');
INSERT INTO sys_dict_data(dict_sort, dict_label, dict_value, dict_type, dict_type_value, state, description, deleted)
VALUES (1, '鐧界幓', 'clearGlass', '鐧界幓', '0', '1', '1', '0');
INSERT INTO sys_dict_data(dict_sort, dict_label, dict_value, dict_type, dict_type_value, state, description, deleted)
@@ -150,7 +150,106 @@
VALUES (1, '鍙岄摱lowe', 'doubleSilverLowe', '鍙岄摱', '2', '1', '1', '0');
INSERT INTO sys_dict_data(dict_sort, dict_label, dict_value, dict_type, dict_type_value, state, description, deleted)
VALUES (2, '瓒呯櫧鍙岄摱Lowe', 'ultraDoubleSilverLowe', '鍙岄摱', '2', '1', '1', '0');
---rollback DELETE FROM sys_dict_data WHERE dict_type in ('clearGlass', 'silver', 'doubleSilver', 'thirdSilver', 'ultraClear', 'heatReflect');
+-- rollback DELETE FROM sys_dict_data WHERE dict_type in ('鐧界幓', '鍗曢摱', '鍙岄摱');
+
+
+-- changeset zsh:20240918001
+-- preconditions onFail:CONTINUE onError:CONTINUE
+-- precondition-sql-check expectedResult:0 SELECT COUNT(*) FROM INFORMATION_SCHEMA.TABLES WHERE TABLE_NAME = 'raw_glass_storage_details' and table_schema = 'hangzhoumes';
+CREATE TABLE raw_glass_storage_details
+(
+ id bigint NOT NULL AUTO_INCREMENT,
+ device_id int DEFAULT NULL COMMENT '璁惧id',
+ slot int DEFAULT NULL COMMENT '鏍煎瓙id',
+ pattern_width double(8, 2) DEFAULT NULL COMMENT '鍘熺墖瀹�',
+ pattern_height double(8, 2) DEFAULT NULL COMMENT '鍘熺墖楂�',
+ pattern_thickness double(8, 2) DEFAULT NULL COMMENT '鍘熺墖鍘氬害',
+ films_id varchar(64) DEFAULT NULL COMMENT '鑶滅郴',
+ create_time TIMESTAMP NOT NULL DEFAULT CURRENT_TIMESTAMP COMMENT '鍒涘缓鏃堕棿',
+ update_time TIMESTAMP NOT NULL DEFAULT CURRENT_TIMESTAMP ON UPDATE CURRENT_TIMESTAMP COMMENT '鏇存柊鏃堕棿',
+ remain_quantity int DEFAULT NULL COMMENT '鍓╀綑鏁伴噺',
+ state int DEFAULT NULL COMMENT '鐘舵��',
+ shelf int DEFAULT NULL COMMENT '鏋跺瓙鍙�',
+ PRIMARY KEY (id) USING BTREE
+);
+-- rollback DROP TABLE raw_glass_storage_details;
+
+-- changeset zsh:20240918002
+-- preconditions onFail:CONTINUE onError:CONTINUE
+-- precondition-sql-check expectedResult:0 SELECT COUNT(*) FROM INFORMATION_SCHEMA.TABLES WHERE TABLE_NAME = 'raw_glass_storage_station' and table_schema = 'hangzhoumes';
+CREATE TABLE raw_glass_storage_station
+(
+ id bigint NOT NULL,
+ device_id int DEFAULT NULL COMMENT '璁惧id',
+ slot int DEFAULT NULL COMMENT '鏍呮牸鍙�',
+ enable_state int DEFAULT NULL COMMENT '鍚敤鏍囪',
+ shelf int DEFAULT NULL COMMENT '鏋跺瓙鍙�'
+);
+-- rollback DROP TABLE raw_glass_storage_station;
+
+
+-- changeset zsh:20240918003
+-- preconditions onFail:CONTINUE onError:CONTINUE
+-- precondition-sql-check expectedResult:0 SELECT COUNT(*) FROM INFORMATION_SCHEMA.TABLES WHERE TABLE_NAME = 'raw_glass_storage_task' and table_schema = 'hangzhoumes';
+CREATE TABLE raw_glass_storage_task
+(
+ id bigint NOT NULL AUTO_INCREMENT,
+ start_slot int DEFAULT NULL COMMENT '璧峰鏍煎瓙',
+ end_slot int DEFAULT NULL COMMENT '鐩爣鏍煎瓙',
+ pattern_quantity int DEFAULT NULL COMMENT '鍘熺墖鏁伴噺',
+ task_type int DEFAULT NULL COMMENT '浠诲姟绫诲瀷',
+ task_state int DEFAULT NULL COMMENT '浠诲姟鐘舵��',
+ shelf int DEFAULT NULL COMMENT '鏋跺瓙鍙�',
+ create_time TIMESTAMP DEFAULT CURRENT_TIMESTAMP COMMENT '鍒涘缓鏃堕棿',
+ update_time TIMESTAMP NOT NULL DEFAULT CURRENT_TIMESTAMP ON UPDATE CURRENT_TIMESTAMP COMMENT '鏇存柊鏃堕棿',
+ PRIMARY KEY (id) USING BTREE
+);
+-- rollback DROP TABLE raw_glass_storage_task;
+
+
+-- changeset zsh:20241015001
+-- preconditions onFail:CONTINUE onError:CONTINUE
+-- precondition-sql-check expectedResult:0 SELECT count(0) FROM information_schema.columns WHERE table_schema = 'hangzhoumes' AND table_name = 'engineering' AND column_name = 'station_cell';
+ALTER TABLE engineering
+ ADD COLUMN station_cell int;
+
+-- changeset zsh:20241017001
+-- preconditions onFail:CONTINUE onError:CONTINUE
+-- precondition-sql-check expectedResult:0 select count(1) from raw_glass_storage_station;
+INSERT INTO raw_glass_storage_station (id, device_id, slot, enable_state, shelf)
+VALUES (1, 1, 1, 1, 1),
+ (2, 1, 2, 1, 2),
+ (3, 1, 3, 1, 3),
+ (4, 2, 4, 1, 4),
+ (5, 2, 5, 1, 5),
+ (6, 2, 6, 1, 6),
+ (7, 2, 7, 1, 7),
+ (8, 2, 8, 1, 8),
+ (9, 2, 9, 1, 9),
+ (10, 2, 10, 1, 10),
+ (11, 2, 11, 1, 11),
+ (12, 3, 12, 1, 12),
+ (13, 3, 13, 1, 13),
+ (14, 3, 14, 1, 14),
+ (15, 3, 15, 1, 15),
+ (16, 3, 16, 1, 16),
+ (17, 3, 17, 1, 17),
+ (18, 3, 18, 1, 18),
+ (19, 3, 19, 1, 19),
+ (20, 3, 20, 1, 20),
+ (21, 3, 21, 1, 21),
+ (22, 3, 22, 1, 22),
+ (23, 3, 23, 1, 23),
+ (24, 3, 24, 1, 24),
+ (25, 3, 25, 1, 25),
+ (26, 4, 98, 1, NULL),
+ (27, 4, 99, 1, NULL),
+ (28, 5, 101, 1, NULL),
+ (29, 5, 102, 1, NULL),
+ (30, 6, 103, 1, NULL),
+ (31, 6, 104, 1, NULL);
+
+
--
Gitblit v1.8.0