From 3a38edcb5e9c15a9591e1e913d3583f3d437caf1 Mon Sep 17 00:00:00 2001
From: ZengTao <2773468879@qq.com>
Date: 星期三, 16 十月 2024 10:05:29 +0800
Subject: [PATCH] Merge remote-tracking branch '公司服务器/master'
---
hangzhoumesParent/moduleService/TemperingGlassModule/src/main/resources/changelog/changelog.sql | 95 ++++++++++++++++++++++++++++++++++++++---------
1 files changed, 76 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..5473f61 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,64 @@
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 NULL DEFAULT NULL COMMENT '璁惧id',
+ slot int NULL DEFAULT NULL COMMENT '鏍煎瓙id',
+ pattern_width double(8, 2) NULL DEFAULT NULL COMMENT '鍘熺墖瀹�',
+ pattern_height double(8, 2) NULL DEFAULT NULL COMMENT '鍘熺墖楂�',
+ pattern_thickness double(8, 2) NULL DEFAULT NULL COMMENT '鍘熺墖鍘氬害',
+ films_id varchar(64) NULL DEFAULT NULL COMMENT '鑶滅郴',
+ create_time datetime NOT NULL COMMENT '鍒涘缓鏃堕棿',
+ remain_quantity int NULL DEFAULT NULL COMMENT '鍓╀綑鏁伴噺',
+ state int NULL 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 AUTO_INCREMENT,
+ device_id int NULL DEFAULT NULL COMMENT '璁惧id',
+ slot int NULL DEFAULT NULL COMMENT '鏍呮牸鍙�',
+ enable_state varchar(255) NULL DEFAULT NULL COMMENT '鍚敤鏍囪',
+ PRIMARY KEY (id)
+);
+-- 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 NULL DEFAULT NULL COMMENT '璧峰鏍煎瓙',
+ end_slot int NULL DEFAULT NULL COMMENT '鐩爣鏍煎瓙',
+ pattern_quantity int NULL DEFAULT NULL COMMENT '鍘熺墖鏁伴噺',
+ enable_type int NULL DEFAULT NULL COMMENT '浠诲姟绫诲瀷',
+ enable_state int NULL DEFAULT NULL COMMENT '浠诲姟鐘舵��',
+ create_time datetime NULL DEFAULT NULL 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 varchar(20);
--
Gitblit v1.8.0