From e34e4f117c4fd6a4c3530ddcd78a6e54061e65de Mon Sep 17 00:00:00 2001 From: wuweihua <88888888> Date: Mon, 16 Nov 2026 12:44:10 +0800 Subject: [PATCH] =?UTF-8?q?=E6=9B=B4=E6=96=B0UUID=E5=88=B0=E6=96=B0?= =?UTF-8?q?=E5=90=8C=E6=AD=A5Mapper=EF=BC=8C=E5=88=A0=E9=99=A4=E6=97=A7UUI?= =?UTF-8?q?D=E5=88=97=E5=B9=B6=E4=BC=98=E5=8C=96=E7=9B=B8=E5=85=B3SQL?= =?UTF-8?q?=E9=80=BB=E8=BE=91?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../mapper/price/UuidToNewSyncMapper.xml | 8 ++--- .../20261116_rename_shadow_to_primary.sql | 32 ++++++++----------- 2 files changed, 17 insertions(+), 23 deletions(-) diff --git a/bms-back/bms-system/src/main/resources/mapper/price/UuidToNewSyncMapper.xml b/bms-back/bms-system/src/main/resources/mapper/price/UuidToNewSyncMapper.xml index 74aaee47..c4ef726a 100644 --- a/bms-back/bms-system/src/main/resources/mapper/price/UuidToNewSyncMapper.xml +++ b/bms-back/bms-system/src/main/resources/mapper/price/UuidToNewSyncMapper.xml @@ -257,18 +257,18 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" where prc_income_bill_fee_id = #{oldFeeId} - + update prc_pay_bill set bill_id = #{newBillId} - where bill_id_old = #{oldBillId} + where 1 = 0 update prc_pay_bill_fee set bill_id = #{newBillId} - where bill_id_old = #{oldBillId} + where 1 = 0 @@ -280,7 +280,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" update pay_bill_line set order_bill_id = #{newBillId} - where order_bill_id_old = #{oldBillId} + where 1 = 0 diff --git a/bms-back/sql/uuid_to_bi_shadow/20261116_rename_shadow_to_primary.sql b/bms-back/sql/uuid_to_bi_shadow/20261116_rename_shadow_to_primary.sql index a3d55f63..7495efd6 100644 --- a/bms-back/sql/uuid_to_bi_shadow/20261116_rename_shadow_to_primary.sql +++ b/bms-back/sql/uuid_to_bi_shadow/20261116_rename_shadow_to_primary.sql @@ -1,6 +1,6 @@ -- 切主:1) 阴影表升为正式表名,旧 UUID 表改为 *_old -- 2) prc_billing_task 用 order_id(bigint)替代 bill_id --- 3) 应付关联列升主:order_id -> bill_id/order_bill_id,旧 UUID -> *_old +-- 3) 应付关联列升主:order_id -> bill_id/order_bill_id,并删除旧 UUID 列 -- 执行前必须:停应用、关闭 UuidToNew 连续同步 -- 可重入 @@ -64,7 +64,7 @@ SET @sql := IF(@has_idx = 0, 'SELECT ''idx_billing_task_order_id already exists'''); PREPARE stmt FROM @sql; EXECUTE stmt; DEALLOCATE PREPARE stmt; --- ========== 3. 应付关联列升主:prc_pay_bill / prc_pay_bill_fee / pay_bill_line ========== +-- ========== 3. 应付关联列升主,不保留旧 UUID 列 ========== DROP PROCEDURE IF EXISTS `mig_promote_pay_order_id`; DELIMITER $$ CREATE PROCEDURE `mig_promote_pay_order_id`( @@ -105,9 +105,7 @@ BEGIN LIMIT 1; END IF; - IF v_has_old = 1 AND v_has_order = 0 AND v_has_live = 1 AND v_live_type IN ('bigint','int','mediumint','smallint','tinyint') THEN - SELECT CONCAT('skip ', p_table, ': already promoted') AS msg; - ELSEIF v_has_order = 1 AND v_has_live = 1 AND v_has_old = 0 THEN + IF v_has_order = 1 AND v_has_live = 1 AND v_has_old = 0 THEN SET done = 0; OPEN cur; fk_loop: LOOP @@ -121,11 +119,13 @@ BEGIN CLOSE cur; SET @ddl = CONCAT( 'ALTER TABLE `', p_table, '` ', - 'CHANGE COLUMN `', p_live_col, '` `', p_old_col, '` varchar(36) NULL COMMENT ''旧UUID订单ID'', ', + 'CHANGE COLUMN `', p_live_col, '` `', p_old_col, '` varchar(36) NULL, ', 'CHANGE COLUMN `order_id` `', p_live_col, '` bigint DEFAULT NULL COMMENT ''对应 prc_order_bill.bill_id''' ); PREPARE stmt FROM @ddl; EXECUTE stmt; DEALLOCATE PREPARE stmt; - SELECT CONCAT('promoted ', p_table, ': order_id -> ', p_live_col, ', ', p_live_col, ' -> ', p_old_col) AS msg; + SET @ddl = CONCAT('ALTER TABLE `', p_table, '` DROP COLUMN `', p_old_col, '`'); + PREPARE stmt FROM @ddl; EXECUTE stmt; DEALLOCATE PREPARE stmt; + SELECT CONCAT('promoted+dropped ', p_table, ': order_id -> ', p_live_col, ', dropped ', p_old_col) AS msg; ELSEIF v_has_order = 1 AND v_has_live = 0 THEN SET @ddl = CONCAT( 'ALTER TABLE `', p_table, '` CHANGE COLUMN `order_id` `', p_live_col, @@ -133,8 +133,12 @@ BEGIN ); PREPARE stmt FROM @ddl; EXECUTE stmt; DEALLOCATE PREPARE stmt; SELECT CONCAT('renamed ', p_table, '.order_id -> ', p_live_col) AS msg; + ELSEIF v_has_old = 1 AND v_has_order = 0 AND v_has_live = 1 AND v_live_type IN ('bigint','int','mediumint','smallint','tinyint') THEN + SET @ddl = CONCAT('ALTER TABLE `', p_table, '` DROP COLUMN `', p_old_col, '`'); + PREPARE stmt FROM @ddl; EXECUTE stmt; DEALLOCATE PREPARE stmt; + SELECT CONCAT('dropped leftover ', p_table, '.', p_old_col) AS msg; ELSE - SELECT CONCAT('skip ', p_table, ': unexpected column state') AS msg; + SELECT CONCAT('skip ', p_table, ': already done or unexpected state') AS msg; END IF; END$$ DELIMITER ; @@ -145,17 +149,7 @@ CALL mig_promote_pay_order_id('pay_bill_line', 'order_bill_id', 'order_bill_id_o DROP PROCEDURE IF EXISTS `mig_promote_pay_order_id`; --- 补回 prc_pay_bill.bill_id 唯一约束(旧 uk 若还在 bill_id_old 上则先掉) -SET @uk_on_old := ( - SELECT COUNT(*) FROM information_schema.statistics - WHERE table_schema = DATABASE() AND table_name = 'prc_pay_bill' AND index_name = 'uk_pay_bill_order_bill' - AND column_name = 'bill_id_old' -); -SET @sql := IF(@uk_on_old > 0, - 'ALTER TABLE `prc_pay_bill` DROP INDEX `uk_pay_bill_order_bill`', - 'SELECT ''no uk on bill_id_old'''); -PREPARE stmt FROM @sql; EXECUTE stmt; DEALLOCATE PREPARE stmt; - +-- 补回 prc_pay_bill.bill_id 唯一约束 SET @has_uk := ( SELECT COUNT(*) FROM information_schema.statistics WHERE table_schema = DATABASE() AND table_name = 'prc_pay_bill' AND index_name = 'uk_pay_bill_order_bill'