From e3307d42a20a6f6305cb55b559a0065db3cebc75 Mon Sep 17 00:00:00 2001 From: zhoushihao <zsh19950802@163.com> Date: 星期三, 20 十一月 2024 08:41:14 +0800 Subject: [PATCH] 1、大理片笼历史任务功能开发 2、大理片笼任务表4张、历史任务表一张脚本 3、大理片笼进片任务功能开发 4、解决卧理生产中遇到的bug --- hangzhoumesParent/moduleService/TemperingGlassModule/src/main/resources/changelog/ywChangelog.sql | 151 ++++++++++++++++++++++++++++++++++---------------- 1 files changed, 103 insertions(+), 48 deletions(-) diff --git a/hangzhoumesParent/moduleService/TemperingGlassModule/src/main/resources/changelog/ywChangelog.sql b/hangzhoumesParent/moduleService/TemperingGlassModule/src/main/resources/changelog/ywChangelog.sql index 03146ea..9832dd6 100644 --- a/hangzhoumesParent/moduleService/TemperingGlassModule/src/main/resources/changelog/ywChangelog.sql +++ b/hangzhoumesParent/moduleService/TemperingGlassModule/src/main/resources/changelog/ywChangelog.sql @@ -174,50 +174,49 @@ -- changeset zsh:20241112001 -- preconditions onFail:CONTINUE onError:CONTINUE --- precondition-sql-check expectedResult:0 SELECT COUNT(*) FROM INFORMATION_SCHEMA.TABLES WHERE TABLE_NAME = 'big_storage_cage_in_history_task' and table_schema = 'hangzhoumes'; -CREATE TABLE big_storage_cage_in_history_task +-- precondition-sql-check expectedResult:0 SELECT COUNT(*) FROM INFORMATION_SCHEMA.TABLES WHERE TABLE_NAME = 'big_storage_cage_history_task' and table_schema = 'hangzhoumes'; +CREATE TABLE big_storage_cage_history_task ( - id BIGINT NOT NULL AUTO_INCREMENT COMMENT '鍘嗗彶浠诲姟id', - task_running INT DEFAULT '0' COMMENT '浠诲姟璇锋眰 0鏃犱换鍔� 1鍚姩浠诲姟 2 纭瀹屾垚', - glass_id VARCHAR(32) COMMENT '鐜荤拑id', - start_slot INT DEFAULT '0' COMMENT '璧峰鏍煎瓙', - target_slot INT DEFAULT '0' COMMENT '鐩爣鏍煎瓙', - task_state INT DEFAULT NULL COMMENT '浠诲姟鐘舵�� ', - create_time TIMESTAMP NULL DEFAULT CURRENT_TIMESTAMP COMMENT '鍒涘缓鏃堕棿', - task_type TIMESTAMP NULL DEFAULT CURRENT_TIMESTAMP COMMENT '鍒涘缓鏃堕棿', - update_time TIMESTAMP NOT NULL DEFAULT CURRENT_TIMESTAMP ON UPDATE CURRENT_TIMESTAMP COMMENT '鏇存柊鏃堕棿', - PRIMARY KEY (id) USING BTREE + id int NOT NULL AUTO_INCREMENT, + glass_id varchar(32) DEFAULT NULL COMMENT '鐜荤拑id', + start_slot int DEFAULT '0' COMMENT '璧峰鏍煎瓙', + target_slot int DEFAULT '0' COMMENT '鐩爣鏍煎瓙', + task_state int DEFAULT NULL COMMENT '浠诲姟鐘舵�� ', + glass_count int DEFAULT NULL COMMENT '鐜荤拑鏁伴噺', + task_type int DEFAULT NULL COMMENT '浠诲姟绫诲瀷', + create_time timestamp NULL DEFAULT CURRENT_TIMESTAMP COMMENT '鍒涘缓鏃堕棿', + update_time timestamp NOT NULL DEFAULT CURRENT_TIMESTAMP ON UPDATE CURRENT_TIMESTAMP COMMENT '鏇存柊鏃堕棿', + PRIMARY KEY (id) ); --- rollback DROP TABLE big_storage_cage_in_history_task; +-- rollback DROP TABLE big_storage_cage_history_task; -- changeset zsh:20241112002 -- preconditions onFail:CONTINUE onError:CONTINUE -- precondition-sql-check expectedResult:0 SELECT COUNT(*) FROM INFORMATION_SCHEMA.TABLES WHERE TABLE_NAME = 'big_storage_cage_in_one_task' and table_schema = 'hangzhoumes'; CREATE TABLE big_storage_cage_in_one_task ( - task_running INT DEFAULT '0' COMMENT '浠诲姟璇锋眰 0鏃犱换鍔� 1鍚姩浠诲姟 2 纭瀹屾垚', - glass_id VARCHAR(32) COMMENT '鐜荤拑id', - start_slot INT DEFAULT '0' COMMENT '璧峰鏍煎瓙', - target_slot INT DEFAULT '0' COMMENT '鐩爣鏍煎瓙', - task_state INT DEFAULT NULL COMMENT '浠诲姟鐘舵�� ' -); + glass_id varchar(32) DEFAULT NULL COMMENT '鐜荤拑id', + start_slot int DEFAULT '0' COMMENT '璧峰鏍煎瓙', + target_slot int DEFAULT '0' COMMENT '鐩爣鏍煎瓙', + task_state int DEFAULT NULL COMMENT '浠诲姟鐘舵�� ' +) -- rollback DROP TABLE big_storage_cage_in_one_task; -- changeset zsh:20241112003 -- preconditions onFail:CONTINUE onError:CONTINUE -- precondition-sql-check expectedResult:0 SELECT COUNT(*) FROM big_storage_cage_in_one_task; -INSERT INTO big_storage_cage_in_one_task(task_running, glass_id, start_slot, target_slot, task_state) -VALUES (0, NULL, 0, 0, 0); -INSERT INTO big_storage_cage_in_one_task(task_running, glass_id, start_slot, target_slot, task_state) -VALUES (0, NULL, 0, 0, 0); -INSERT INTO big_storage_cage_in_one_task(task_running, glass_id, start_slot, target_slot, task_state) -VALUES (0, NULL, 0, 0, 0); -INSERT INTO big_storage_cage_in_one_task(task_running, glass_id, start_slot, target_slot, task_state) -VALUES (0, NULL, 0, 0, 0); -INSERT INTO big_storage_cage_in_one_task(task_running, glass_id, start_slot, target_slot, task_state) -VALUES (0, NULL, 0, 0, 0); -INSERT INTO big_storage_cage_in_one_task(task_running, glass_id, start_slot, target_slot, task_state) -VALUES (0, NULL, 0, 0, 0); +INSERT INTO big_storage_cage_in_one_task(glass_id, start_slot, target_slot, task_state) +VALUES (NULL, 0, 0, 0); +INSERT INTO big_storage_cage_in_one_task(glass_id, start_slot, target_slot, task_state) +VALUES (NULL, 0, 0, 0); +INSERT INTO big_storage_cage_in_one_task(glass_id, start_slot, target_slot, task_state) +VALUES (NULL, 0, 0, 0); +INSERT INTO big_storage_cage_in_one_task(glass_id, start_slot, target_slot, task_state) +VALUES (NULL, 0, 0, 0); +INSERT INTO big_storage_cage_in_one_task(glass_id, start_slot, target_slot, task_state) +VALUES (NULL, 0, 0, 0); +INSERT INTO big_storage_cage_in_one_task(glass_id, start_slot, target_slot, task_state) +VALUES (NULL, 0, 0, 0); -- changeset zsh:20241112004 @@ -225,26 +224,82 @@ -- precondition-sql-check expectedResult:0 SELECT COUNT(*) FROM INFORMATION_SCHEMA.TABLES WHERE TABLE_NAME = 'big_storage_cage_in_two_task' and table_schema = 'hangzhoumes'; CREATE TABLE big_storage_cage_in_two_task ( - task_running INT DEFAULT '0' COMMENT '浠诲姟璇锋眰 0鏃犱换鍔� 1鍚姩浠诲姟 2 纭瀹屾垚', - glass_id VARCHAR(32) COMMENT '鐜荤拑id', - start_slot INT DEFAULT '0' COMMENT '璧峰鏍煎瓙', - target_slot INT DEFAULT '0' COMMENT '鐩爣鏍煎瓙', - task_state INT DEFAULT NULL COMMENT '浠诲姟鐘舵�� ' + glass_id VARCHAR(32) COMMENT '鐜荤拑id', + start_slot INT DEFAULT '0' COMMENT '璧峰鏍煎瓙', + target_slot INT DEFAULT '0' COMMENT '鐩爣鏍煎瓙', + task_state INT DEFAULT NULL COMMENT '浠诲姟鐘舵�� ' ); -- rollback DROP TABLE big_storage_cage_in_two_task; + -- changeset zsh:20241112005 -- preconditions onFail:CONTINUE onError:CONTINUE -- precondition-sql-check expectedResult:0 SELECT COUNT(*) FROM big_storage_cage_in_two_task; -INSERT INTO big_storage_cage_in_two_task(task_running, glass_id, start_slot, target_slot, task_state) -VALUES (0, NULL, 0, 0, 0); -INSERT INTO big_storage_cage_in_two_task(task_running, glass_id, start_slot, target_slot, task_state) -VALUES (0, NULL, 0, 0, 0); -INSERT INTO big_storage_cage_in_two_task(task_running, glass_id, start_slot, target_slot, task_state) -VALUES (0, NULL, 0, 0, 0); -INSERT INTO big_storage_cage_in_two_task(task_running, glass_id, start_slot, target_slot, task_state) -VALUES (0, NULL, 0, 0, 0); -INSERT INTO big_storage_cage_in_two_task(task_running, glass_id, start_slot, target_slot, task_state) -VALUES (0, NULL, 0, 0, 0); -INSERT INTO big_storage_cage_in_two_task(task_running, glass_id, start_slot, target_slot, task_state) -VALUES (0, NULL, 0, 0, 0); +INSERT INTO big_storage_cage_in_two_task(glass_id, start_slot, target_slot, task_state) +VALUES (NULL, 0, 0, 0); +INSERT INTO big_storage_cage_in_two_task(glass_id, start_slot, target_slot, task_state) +VALUES (NULL, 0, 0, 0); +INSERT INTO big_storage_cage_in_two_task(glass_id, start_slot, target_slot, task_state) +VALUES (NULL, 0, 0, 0); +INSERT INTO big_storage_cage_in_two_task(glass_id, start_slot, target_slot, task_state) +VALUES (NULL, 0, 0, 0); +INSERT INTO big_storage_cage_in_two_task(glass_id, start_slot, target_slot, task_state) +VALUES (NULL, 0, 0, 0); +INSERT INTO big_storage_cage_in_two_task(glass_id, start_slot, target_slot, task_state) +VALUES (NULL, 0, 0, 0); + +-- changeset zsh:20241113001 +-- preconditions onFail:CONTINUE onError:CONTINUE +-- precondition-sql-check expectedResult:0 SELECT COUNT(*) FROM INFORMATION_SCHEMA.TABLES WHERE TABLE_NAME = 'big_storage_cage_out_one_task' and table_schema = 'hangzhoumes'; +CREATE TABLE big_storage_cage_out_one_task +( + glass_id varchar(32) DEFAULT NULL COMMENT '鐜荤拑id', + start_slot int DEFAULT '0' COMMENT '璧峰鏍煎瓙', + target_slot int DEFAULT '0' COMMENT '鐩爣鏍煎瓙', + task_state int DEFAULT NULL COMMENT '浠诲姟鐘舵�� ' +) +-- rollback DROP TABLE big_storage_cage_out_one_task; + +-- changeset zsh:20241113002 +-- preconditions onFail:CONTINUE onError:CONTINUE +-- precondition-sql-check expectedResult:0 SELECT COUNT(*) FROM big_storage_cage_out_one_task; +INSERT INTO big_storage_cage_out_one_task(glass_id, start_slot, target_slot, task_state) +VALUES (NULL, 0, 0, 0); +INSERT INTO big_storage_cage_out_one_task(glass_id, start_slot, target_slot, task_state) +VALUES (NULL, 0, 0, 0); +INSERT INTO big_storage_cage_out_one_task(glass_id, start_slot, target_slot, task_state) +VALUES (NULL, 0, 0, 0); +INSERT INTO big_storage_cage_out_one_task(glass_id, start_slot, target_slot, task_state) +VALUES (NULL, 0, 0, 0); +INSERT INTO big_storage_cage_out_one_task(glass_id, start_slot, target_slot, task_state) +VALUES (NULL, 0, 0, 0); +INSERT INTO big_storage_cage_out_one_task(glass_id, start_slot, target_slot, task_state) +VALUES (NULL, 0, 0, 0); + + +-- changeset zsh:20241113003 +-- preconditions onFail:CONTINUE onError:CONTINUE +-- precondition-sql-check expectedResult:0 SELECT COUNT(*) FROM INFORMATION_SCHEMA.TABLES WHERE TABLE_NAME = 'big_storage_cage_out_two_task' and table_schema = 'hangzhoumes'; +CREATE TABLE big_storage_cage_out_two_task +( + glass_id VARCHAR(32) COMMENT '鐜荤拑id', + start_slot INT DEFAULT '0' COMMENT '璧峰鏍煎瓙', + target_slot INT DEFAULT '0' COMMENT '鐩爣鏍煎瓙', + task_state INT DEFAULT NULL COMMENT '浠诲姟鐘舵�� ' +); +-- rollback DROP TABLE big_storage_cage_out_two_task; +-- changeset zsh:20241113004 +-- preconditions onFail:CONTINUE onError:CONTINUE +-- precondition-sql-check expectedResult:0 SELECT COUNT(*) FROM big_storage_cage_out_two_task; +INSERT INTO big_storage_cage_out_two_task(glass_id, start_slot, target_slot, task_state) +VALUES (NULL, 0, 0, 0); +INSERT INTO big_storage_cage_out_two_task(glass_id, start_slot, target_slot, task_state) +VALUES (NULL, 0, 0, 0); +INSERT INTO big_storage_cage_out_two_task(glass_id, start_slot, target_slot, task_state) +VALUES (NULL, 0, 0, 0); +INSERT INTO big_storage_cage_out_two_task(glass_id, start_slot, target_slot, task_state) +VALUES (NULL, 0, 0, 0); +INSERT INTO big_storage_cage_out_two_task(glass_id, start_slot, target_slot, task_state) +VALUES (NULL, 0, 0, 0); +INSERT INTO big_storage_cage_out_two_task(glass_id, start_slot, target_slot, task_state) +VALUES (NULL, 0, 0, 0); -- Gitblit v1.8.0