数据迁移的存储过程[16]

TRS.WCM.Developer/贵州项目/1_data_migration_logger.sql

@@ -23,9 +23,6 @@ CREATE FUNCTION build_migration_log_sql(table_name VARCHAR(100), id BIGINT(20))
   BEGIN
     DECLARE x VARCHAR(255) DEFAULT '';
 
-    IF (id < 0)
-      THEN SET id = 1000000000;
-    END IF ;
 
     SET x =  concat('insert into ',
                     'trs_data_migration.data_migration_log (',

TRS.WCM.Developer/贵州项目/3_sp_data_migration_masid.sql

@@ -9,15 +9,19 @@ CREATE PROCEDURE sp_data_migration_masid(IN prevMasId BIGINT(20),
 	
     DECLARE isover INT DEFAULT 0;
 
-      DECLARE  f_ID int(11) DEFAULT NULL;
-      DECLARE  f_CREATEDTIME BIGINT(20) DEFAULT NULL;
-      DECLARE  f_CREATEDUSER varchar(255) DEFAULT NULL;
-      DECLARE  f_CREATEDUSERID int(11) DEFAULT NULL;
-      DECLARE  f_CREATEDUSERNICKNAME varchar(255) DEFAULT NULL;
-      DECLARE  f_LASTMODIFIEDTIME datetime DEFAULT NULL;
-      DECLARE  f_LASTMODIFIEDUSER varchar(255) DEFAULT NULL;
-      DECLARE  f_LASTMODIFIEDUSERID int(11) DEFAULT NULL;
-      DECLARE  f_srcObjType varchar(255) DEFAULT NULL;
+    DECLARE migr_table_name varchar(255) DEFAULT 'mas_masid';
+
+    DECLARE  f_ID int(11) DEFAULT NULL;
+    DECLARE  f_CREATEDTIME BIGINT(20) DEFAULT NULL;
+    DECLARE  f_CREATEDUSER varchar(255) DEFAULT NULL;
+    DECLARE  f_CREATEDUSERID int(11) DEFAULT NULL;
+    DECLARE  f_CREATEDUSERNICKNAME varchar(255) DEFAULT NULL;
+    DECLARE  f_LASTMODIFIEDTIME datetime DEFAULT NULL;
+    DECLARE  f_LASTMODIFIEDUSER varchar(255) DEFAULT NULL;
+    DECLARE  f_LASTMODIFIEDUSERID int(11) DEFAULT NULL;
+    DECLARE  f_srcObjType varchar(255) DEFAULT NULL;
+
+
 
 
     DECLARE cur CURSOR FOR
@@ -50,6 +54,12 @@ CREATE PROCEDURE sp_data_migration_masid(IN prevMasId BIGINT(20),
       f_srcObjType
       ;
 
+    select concat('开始迁移 ', migr_table_name) info;
+
+    SET @log_sql = trs_data_migration.build_migration_log_sql(migr_table_name, 0);
+    prepare stmt from @log_sql;
+    EXECUTE stmt;
+    deallocate prepare stmt;
 
 
       WHILE isover= 0 DO
@@ -87,9 +97,8 @@ CREATE PROCEDURE sp_data_migration_masid(IN prevMasId BIGINT(20),
                     f_srcObjType
                   );
 
-            SET @sql = trs_data_migration.build_migration_log_sql('mas_masid', @ID);
-
-            prepare stmt from @sql;
+            SET @log_sql = trs_data_migration.build_migration_log_sql(migr_table_name, @ID);
+            prepare stmt from @log_sql;
             EXECUTE stmt;
             deallocate prepare stmt;
 
@@ -111,11 +120,7 @@ CREATE PROCEDURE sp_data_migration_masid(IN prevMasId BIGINT(20),
 
     CLOSE cur;
 
-    SET @sql = trs_data_migration.build_migration_log_sql('mas_masid', -1);
-
-    prepare stmt from @sql;
-    EXECUTE stmt;
-    deallocate prepare stmt;
+    select concat('完成迁移 ', migr_table_name) info;
 
 	END $$
 DELIMITER ;

TRS.WCM.Developer/贵州项目/3_sp_data_migration_masvideo.sql

@@ -7,7 +7,9 @@ CREATE PROCEDURE sp_data_migration_masvideo(IN prevMasVideoId BIGINT(20),
                                               IN masVideoIdOffset BIGINT(20))
 	BEGIN 
 	
-	DECLARE isover INT DEFAULT 0;
+	  DECLARE isover INT DEFAULT 0;
+
+    DECLARE migr_table_name varchar(255) DEFAULT 'mas_masvideo';
 
     DECLARE  f_ID int(11) DEFAULT NULL;
     DECLARE  f_CREATEDTIME bigint(20) DEFAULT NULL;
@@ -111,7 +113,10 @@ CREATE PROCEDURE sp_data_migration_masvideo(IN prevMasVideoId BIGINT(20),
     DECLARE  f_YEAR varchar(255) DEFAULT NULL;
 
 
-  DECLARE cur CURSOR FOR
+
+
+
+    DECLARE cur CURSOR FOR
 		SELECT
       ID,
       CREATEDTIME,
@@ -324,6 +329,12 @@ CREATE PROCEDURE sp_data_migration_masvideo(IN prevMasVideoId BIGINT(20),
     ;
 
 
+    select concat('开始迁移 ', migr_table_name) info;
+
+    SET @log_sql = trs_data_migration.build_migration_log_sql(migr_table_name, 0);
+    prepare stmt from @log_sql;
+    EXECUTE stmt;
+    deallocate prepare stmt;
 
     WHILE isover= 0 DO
 
@@ -542,9 +553,9 @@ CREATE PROCEDURE sp_data_migration_masvideo(IN prevMasVideoId BIGINT(20),
                   f_YEAR
                 );
 
-          SET @sql = trs_data_migration.build_migration_log_sql('mas_masvideo', @ID);
+          SET @log_sql = trs_data_migration.build_migration_log_sql(migr_table_name, @ID);
 
-          prepare stmt from @sql;
+          prepare stmt from @log_sql;
           EXECUTE stmt;
           deallocate prepare stmt;
 
@@ -657,11 +668,7 @@ CREATE PROCEDURE sp_data_migration_masvideo(IN prevMasVideoId BIGINT(20),
 	
 	CLOSE cur;
 
-    SET @sql = trs_data_migration.build_migration_log_sql('mas_masvideo', -1);
+    select concat('完成迁移 ', migr_table_name) info;
 
-    prepare stmt from @sql;
-    EXECUTE stmt;
-    deallocate prepare stmt;
-		
 	END $$
 DELIMITER ;

TRS.WCM.Developer/贵州项目/3_sp_data_migration_wcmappendix.sql

@@ -8,7 +8,9 @@ CREATE PROCEDURE sp_data_migration_wcmappendix(IN prevAppendixId BIGINT(20),
                                               IN docIdOffset BIGINT(20))
 	BEGIN
 	
-	DECLARE isover INT DEFAULT 0;
+	  DECLARE isover INT DEFAULT 0;
+
+    DECLARE migr_table_name varchar(255) DEFAULT 'wcmappendix';
 
     DECLARE f_APPENDIXID int(11) DEFAULT 0;
     DECLARE f_APPDOCID int(11) DEFAULT 0;
@@ -38,6 +40,7 @@ CREATE PROCEDURE sp_data_migration_wcmappendix(IN prevAppendixId BIGINT(20),
 
 
 
+
   DECLARE cur CURSOR FOR
 		SELECT
       APPENDIXID,
@@ -101,6 +104,13 @@ CREATE PROCEDURE sp_data_migration_wcmappendix(IN prevAppendixId BIGINT(20),
     ;
 
 
+    select concat('开始迁移 ', migr_table_name) info;
+
+    SET @log_sql = trs_data_migration.build_migration_log_sql(migr_table_name, 0);
+    prepare stmt from @log_sql;
+    EXECUTE stmt;
+    deallocate prepare stmt;
+
 
     WHILE isover = 0 DO
 
@@ -170,9 +180,9 @@ CREATE PROCEDURE sp_data_migration_wcmappendix(IN prevAppendixId BIGINT(20),
                   f_AppFromId
                 );
 
-          SET @sql = trs_data_migration.build_migration_log_sql('wcmappendix', @APPENDIXID);
+          SET @log_sql = trs_data_migration.build_migration_log_sql(migr_table_name, @APPENDIXID);
 
-          prepare stmt from @sql;
+          prepare stmt from @log_sql;
           EXECUTE stmt;
           deallocate prepare stmt;
     END IF ;
@@ -209,11 +219,7 @@ CREATE PROCEDURE sp_data_migration_wcmappendix(IN prevAppendixId BIGINT(20),
 	
 	CLOSE cur;
 
-    SET @sql = trs_data_migration.build_migration_log_sql('wcmappendix', -1);
-
-    prepare stmt from @sql;
-    EXECUTE stmt;
-    deallocate prepare stmt;
+    select concat('完成迁移 ', migr_table_name) info;
 		
 	END $$
 DELIMITER ;

TRS.WCM.Developer/贵州项目/3_sp_data_migration_wcmchannel.sql

@@ -8,59 +8,60 @@ CREATE PROCEDURE sp_data_migration_wcmchannel(IN prevChnlId BIGINT(20),
                                               IN channelIdOffset BIGINT(20))
 	BEGIN 
 	
-	DECLARE isover INT DEFAULT 0;
+    DECLARE isover INT DEFAULT 0;
 
-  DECLARE f_CHANNELID int DEFAULT 0;
-  DECLARE f_SITEID int DEFAULT 0;
-  DECLARE f_CHNLNAME varchar(200) DEFAULT 0;
-  DECLARE f_CHNLDESC varchar(200) DEFAULT NULL;
-  DECLARE f_CHNLTABLE varchar(200) DEFAULT NULL;
-  DECLARE f_CHNLQUERY varchar(500) DEFAULT NULL;
-  DECLARE f_CHNLPROP int DEFAULT NULL;
-  DECLARE f_PARENTID int DEFAULT 0;
-  DECLARE f_CHNLORDER int DEFAULT 0;
-  DECLARE f_SCHEDULE int DEFAULT NULL;
-  DECLARE f_CHNLDATAPATH varchar(200) DEFAULT NULL;
-  DECLARE f_CHNLORDERBY varchar(200) DEFAULT NULL;
-  DECLARE f_ATTRIBUTE varchar(500) DEFAULT NULL;
-  DECLARE f_CRUSER varchar(50) DEFAULT NULL;
-  DECLARE f_CRTIME datetime DEFAULT NULL;
-  DECLARE f_STATUS int DEFAULT 0;
-  DECLARE f_CHNLTYPE int DEFAULT 0;
-  DECLARE f_CHNLOUTLINETEMP int DEFAULT 0;
-  DECLARE f_CHNLDETAILTEMP int DEFAULT 0;
-  DECLARE f_PUBLISHPRO smallint(6) DEFAULT 1;
-  DECLARE f_OPERUSER varchar(50) DEFAULT NULL;
-  DECLARE f_OPERTIME datetime DEFAULT NULL;
-  DECLARE f_LINKURL varchar(200) DEFAULT NULL;
-  DECLARE f_CONTENTADDEDITPAGE varchar(200) DEFAULT NULL;
-  DECLARE f_CONTENTLISTPAGE varchar(200) DEFAULT NULL;
-  DECLARE f_CONTENTSHOWPAGE varchar(200) DEFAULT NULL;
-  DECLARE f_OUTLINEFILEDS varchar(1000) DEFAULT NULL;
-  DECLARE f_OUTLINEDBFIELDS varchar(1000) DEFAULT NULL;
-  DECLARE f_ISCLUSTER smallint(6) DEFAULT 0;
-  DECLARE f_SHOWFIELDS varchar(300) DEFAULT NULL;
-  DECLARE f_FIELDSWIDTH varchar(200) DEFAULT NULL;
-  DECLARE f_BASEPROPS varchar(200) DEFAULT NULL;
-  DECLARE f_OTHERPROPS varchar(200) DEFAULT NULL;
-  DECLARE f_ADVANCEPROPS varchar(200) DEFAULT NULL;
-  DECLARE f_TOOLBAR longtext;
-  DECLARE f_ADVTOOLBAR longtext;
-  DECLARE f_ISCONTAINSCHILDREN int DEFAULT 0;
-  DECLARE f_METASYNFIELDS varchar(500) DEFAULT NULL;
-  DECLARE f_FLUENCEXML longtext;
-  DECLARE f_USEDOCLEVEL smallint(6) DEFAULT NULL;
-  DECLARE f_lastmodifytime datetime DEFAULT NULL;
-  DECLARE f_VIEWPROPS varchar(300) DEFAULT NULL;
-  DECLARE f_NEEDEDPROPS varchar(300) DEFAULT NULL;
-  DECLARE f_INHERIT int DEFAULT 0;
-  DECLARE f_IsSubscribe smallint(6) DEFAULT 0;
-  DECLARE f_ISPUSHABLE tinyint(4) DEFAULT 0 ;
-  DECLARE f_ISDISTRIBUTABLE tinyint(4) DEFAULT 0 ;
-  DECLARE f_CHANNELLOGO varchar(200) DEFAULT NULL;
-  DECLARE f_SEARCHWORDVALUE varchar(40) DEFAULT NULL;
-  DECLARE f_CHNLDESCPINYIN varchar(254) DEFAULT NULL;
+    DECLARE migr_table_name varchar(255) DEFAULT 'wcmchannel';
 
+    DECLARE f_CHANNELID int DEFAULT 0;
+    DECLARE f_SITEID int DEFAULT 0;
+    DECLARE f_CHNLNAME varchar(200) DEFAULT 0;
+    DECLARE f_CHNLDESC varchar(200) DEFAULT NULL;
+    DECLARE f_CHNLTABLE varchar(200) DEFAULT NULL;
+    DECLARE f_CHNLQUERY varchar(500) DEFAULT NULL;
+    DECLARE f_CHNLPROP int DEFAULT NULL;
+    DECLARE f_PARENTID int DEFAULT 0;
+    DECLARE f_CHNLORDER int DEFAULT 0;
+    DECLARE f_SCHEDULE int DEFAULT NULL;
+    DECLARE f_CHNLDATAPATH varchar(200) DEFAULT NULL;
+    DECLARE f_CHNLORDERBY varchar(200) DEFAULT NULL;
+    DECLARE f_ATTRIBUTE varchar(500) DEFAULT NULL;
+    DECLARE f_CRUSER varchar(50) DEFAULT NULL;
+    DECLARE f_CRTIME datetime DEFAULT NULL;
+    DECLARE f_STATUS int DEFAULT 0;
+    DECLARE f_CHNLTYPE int DEFAULT 0;
+    DECLARE f_CHNLOUTLINETEMP int DEFAULT 0;
+    DECLARE f_CHNLDETAILTEMP int DEFAULT 0;
+    DECLARE f_PUBLISHPRO smallint(6) DEFAULT 1;
+    DECLARE f_OPERUSER varchar(50) DEFAULT NULL;
+    DECLARE f_OPERTIME datetime DEFAULT NULL;
+    DECLARE f_LINKURL varchar(200) DEFAULT NULL;
+    DECLARE f_CONTENTADDEDITPAGE varchar(200) DEFAULT NULL;
+    DECLARE f_CONTENTLISTPAGE varchar(200) DEFAULT NULL;
+    DECLARE f_CONTENTSHOWPAGE varchar(200) DEFAULT NULL;
+    DECLARE f_OUTLINEFILEDS varchar(1000) DEFAULT NULL;
+    DECLARE f_OUTLINEDBFIELDS varchar(1000) DEFAULT NULL;
+    DECLARE f_ISCLUSTER smallint(6) DEFAULT 0;
+    DECLARE f_SHOWFIELDS varchar(300) DEFAULT NULL;
+    DECLARE f_FIELDSWIDTH varchar(200) DEFAULT NULL;
+    DECLARE f_BASEPROPS varchar(200) DEFAULT NULL;
+    DECLARE f_OTHERPROPS varchar(200) DEFAULT NULL;
+    DECLARE f_ADVANCEPROPS varchar(200) DEFAULT NULL;
+    DECLARE f_TOOLBAR longtext;
+    DECLARE f_ADVTOOLBAR longtext;
+    DECLARE f_ISCONTAINSCHILDREN int DEFAULT 0;
+    DECLARE f_METASYNFIELDS varchar(500) DEFAULT NULL;
+    DECLARE f_FLUENCEXML longtext;
+    DECLARE f_USEDOCLEVEL smallint(6) DEFAULT NULL;
+    DECLARE f_lastmodifytime datetime DEFAULT NULL;
+    DECLARE f_VIEWPROPS varchar(300) DEFAULT NULL;
+    DECLARE f_NEEDEDPROPS varchar(300) DEFAULT NULL;
+    DECLARE f_INHERIT int DEFAULT 0;
+    DECLARE f_IsSubscribe smallint(6) DEFAULT 0;
+    DECLARE f_ISPUSHABLE tinyint(4) DEFAULT 0 ;
+    DECLARE f_ISDISTRIBUTABLE tinyint(4) DEFAULT 0 ;
+    DECLARE f_CHANNELLOGO varchar(200) DEFAULT NULL;
+    DECLARE f_SEARCHWORDVALUE varchar(40) DEFAULT NULL;
+    DECLARE f_CHNLDESCPINYIN varchar(254) DEFAULT NULL;
 
 
   DECLARE cur CURSOR FOR
@@ -176,6 +177,13 @@ CREATE PROCEDURE sp_data_migration_wcmchannel(IN prevChnlId BIGINT(20),
     ;
 
 
+    select concat('开始迁移 ', migr_table_name) info;
+
+    SET @log_sql = trs_data_migration.build_migration_log_sql(migr_table_name, 0);
+    prepare stmt from @log_sql;
+    EXECUTE stmt;
+    deallocate prepare stmt;
+
 
     WHILE isover = 0 DO
 
@@ -295,9 +303,9 @@ CREATE PROCEDURE sp_data_migration_wcmchannel(IN prevChnlId BIGINT(20),
                   f_CHNLDESCPINYIN
                 );
 
-          SET @sql = trs_data_migration.build_migration_log_sql('wcmchannel', @CHANNELID);
+          SET @log_sql = trs_data_migration.build_migration_log_sql(migr_table_name, @CHANNELID);
 
-          prepare stmt from @sql;
+          prepare stmt from @log_sql;
           EXECUTE stmt;
           deallocate prepare stmt;
     END IF ;
@@ -359,11 +367,8 @@ CREATE PROCEDURE sp_data_migration_wcmchannel(IN prevChnlId BIGINT(20),
 	
 	CLOSE cur;
 
-    SET @sql = trs_data_migration.build_migration_log_sql('wcmchannel', -1);
+    select concat('完成迁移 ', migr_table_name) info;
 
-    prepare stmt from @sql;
-    EXECUTE stmt;
-    deallocate prepare stmt;
-		
-	END $$
+
+  END $$
 DELIMITER ;

TRS.WCM.Developer/贵州项目/3_sp_data_migration_wcmchannelchildindexquote.sql

@@ -10,12 +10,16 @@ CREATE PROCEDURE sp_data_migration_wcmchannelchildindexquote(IN templateIdOffset
 	
     DECLARE isover INT DEFAULT 0;
 
+    DECLARE migr_table_name varchar(255) DEFAULT 'wcmchannelchildindexquote';
+
     DECLARE  f_TEMPLATEID int(11) DEFAULT '0';
     DECLARE  f_FOLDERTYPE int(11) DEFAULT '0';
     DECLARE  f_FOLDERID int(11) DEFAULT '0';
     DECLARE  f_QUOTECHANNELID int(11) DEFAULT '0';
 
 
+
+
     DECLARE cur CURSOR FOR
 		SELECT
       TEMPLATEID,
@@ -36,6 +40,13 @@ CREATE PROCEDURE sp_data_migration_wcmchannelchildindexquote(IN templateIdOffset
     ;
 
 
+    select concat('开始迁移 ', migr_table_name) info;
+
+    SET @log_sql = trs_data_migration.build_migration_log_sql(migr_table_name, 0);
+    prepare stmt from @log_sql;
+    EXECUTE stmt;
+    deallocate prepare stmt;
+
 
     WHILE isover= 0 DO
 
@@ -80,11 +91,8 @@ CREATE PROCEDURE sp_data_migration_wcmchannelchildindexquote(IN templateIdOffset
 	
 	CLOSE cur;
 
-    SET @sql = trs_data_migration.build_migration_log_sql('wcmchannelchildindexquote', -1);
+    select concat('完成迁移 ', migr_table_name) info;
 
-    prepare stmt from @sql;
-    EXECUTE stmt;
-    deallocate prepare stmt;
-		
-	END $$
+
+  END $$
 DELIMITER ;

TRS.WCM.Developer/贵州项目/3_sp_data_migration_wcmchannelsyn.sql

@@ -10,6 +10,8 @@ CREATE PROCEDURE sp_data_migration_wcmchannelsyn(IN prevChannelSynId BIGINT(20),
 	
     DECLARE isover INT DEFAULT 0;
 
+    DECLARE migr_table_name varchar(255) DEFAULT 'wcmchannelsyn';
+
     DECLARE  f_CHANNELSYNID int(11) DEFAULT NULL;
     DECLARE  f_SRCCHANNEL int(11) DEFAULT NULL;
     DECLARE  f_TOCHANNEL int(11) DEFAULT NULL;
@@ -25,6 +27,7 @@ CREATE PROCEDURE sp_data_migration_wcmchannelsyn(IN prevChannelSynId BIGINT(20),
     DECLARE  f_CLASSINFOIDS varchar(100) DEFAULT NULL ;
 
 
+
     DECLARE cur CURSOR FOR
 		SELECT
       CHANNELSYNID,
@@ -64,6 +67,12 @@ CREATE PROCEDURE sp_data_migration_wcmchannelsyn(IN prevChannelSynId BIGINT(20),
     ;
 
 
+    select concat('开始迁移 ', migr_table_name) info;
+
+    SET @log_sql = trs_data_migration.build_migration_log_sql(migr_table_name, 0);
+    prepare stmt from @log_sql;
+    EXECUTE stmt;
+    deallocate prepare stmt;
 
     WHILE isover= 0 DO
 
@@ -112,9 +121,9 @@ CREATE PROCEDURE sp_data_migration_wcmchannelsyn(IN prevChannelSynId BIGINT(20),
               f_CLASSINFOIDS
             );
 
-          SET @sql = trs_data_migration.build_migration_log_sql('wcmchannelsyn', @CHANNELSYNID);
+          SET @log_sql = trs_data_migration.build_migration_log_sql(migr_table_name, @CHANNELSYNID);
 
-          prepare stmt from @sql;
+          prepare stmt from @log_sql;
           EXECUTE stmt;
           deallocate prepare stmt;
     END IF ;
@@ -139,11 +148,8 @@ CREATE PROCEDURE sp_data_migration_wcmchannelsyn(IN prevChannelSynId BIGINT(20),
 	
 	CLOSE cur;
 
-    SET @sql = trs_data_migration.build_migration_log_sql('wcmchannelsyn', -1);
+    select concat('完成迁移 ', migr_table_name) info;
 
-    prepare stmt from @sql;
-    EXECUTE stmt;
-    deallocate prepare stmt;
-		
-	END $$
+
+  END $$
 DELIMITER ;

TRS.WCM.Developer/贵州项目/3_sp_data_migration_wcmchnldoc.sql

@@ -12,6 +12,8 @@ CREATE PROCEDURE sp_data_migration_wcmchnldoc(IN prevRecId BIGINT(20),
 	
     DECLARE isover INT DEFAULT 0;
 
+    DECLARE migr_table_name varchar(255) DEFAULT 'wcmchnldoc';
+
     DECLARE  f_CHNLID int(11)  DEFAULT '0';
     DECLARE  f_DOCID int(11)  DEFAULT '0';
     DECLARE  f_DOCORDER int(11)  DEFAULT '0';
@@ -54,6 +56,9 @@ CREATE PROCEDURE sp_data_migration_wcmchnldoc(IN prevRecId BIGINT(20),
     DECLARE  f_ACTIONUSER varchar(100) DEFAULT NULL ;
 
 
+
+
+
     DECLARE cur CURSOR FOR
 		SELECT
       CHNLID,
@@ -147,6 +152,12 @@ CREATE PROCEDURE sp_data_migration_wcmchnldoc(IN prevRecId BIGINT(20),
     ;
 
 
+    select concat('开始迁移 ', migr_table_name) info;
+
+    SET @log_sql = trs_data_migration.build_migration_log_sql(migr_table_name, 0);
+    prepare stmt from @log_sql;
+    EXECUTE stmt;
+    deallocate prepare stmt;
 
     WHILE isover= 0 DO
 
@@ -249,9 +260,9 @@ CREATE PROCEDURE sp_data_migration_wcmchnldoc(IN prevRecId BIGINT(20),
               f_ACTIONUSER
             );
 
-          SET @sql = trs_data_migration.build_migration_log_sql('wcmchnldoc', @RECID);
+          SET @log_sql = trs_data_migration.build_migration_log_sql(migr_table_name, @RECID);
 
-          prepare stmt from @sql;
+          prepare stmt from @log_sql;
           EXECUTE stmt;
           deallocate prepare stmt;
     END IF ;
@@ -303,11 +314,8 @@ CREATE PROCEDURE sp_data_migration_wcmchnldoc(IN prevRecId BIGINT(20),
 	
 	CLOSE cur;
 
-    SET @sql = trs_data_migration.build_migration_log_sql('wcmchnldoc', -1);
+    select concat('完成迁移 ', migr_table_name) info;
 
-    prepare stmt from @sql;
-    EXECUTE stmt;
-    deallocate prepare stmt;
-		
-	END $$
+
+  END $$
 DELIMITER ;

TRS.WCM.Developer/贵州项目/3_sp_data_migration_wcmdocument.sql

@@ -11,87 +11,92 @@ CREATE PROCEDURE sp_data_migration_wcmdocument(IN prevDocId BIGINT(20),
 
 	BEGIN 
 	
-	DECLARE isover INT DEFAULT 0;	
-	
-  DECLARE f_DOCID int(11) DEFAULT 0;
-  DECLARE f_DOCCHANNEL int(11) DEFAULT 0;
-  DECLARE f_DOCVERSION int(11) DEFAULT 0;
-  DECLARE f_DOCTYPE int(11) DEFAULT 0;
-  DECLARE f_DOCTITLE varchar(1000) DEFAULT 0;
-  DECLARE f_ShortTitle varchar(400) DEFAULT NULL;
-  DECLARE f_DOCSOURCE int(11) DEFAULT 0;
-  DECLARE f_DOCSECURITY int(11) DEFAULT 0;
-  DECLARE f_DOCSTATUS int(11) DEFAULT 0;
-  DECLARE f_DOCKIND int(11) DEFAULT NULL;
-  DECLARE f_DOCCONTENT longtext;
-  DECLARE f_DOCHTMLCON longtext;
-  DECLARE f_DOCABSTRACT varchar(2000) DEFAULT NULL;
-  DECLARE f_DOCKEYWORDS varchar(200) DEFAULT NULL;
-  DECLARE f_DOCRELWORDS varchar(200) DEFAULT NULL;
-  DECLARE f_DOCPEOPLE varchar(200) DEFAULT NULL;
-  DECLARE f_DOCPLACE varchar(200) DEFAULT NULL;
-  DECLARE f_DOCAUTHOR varchar(200) DEFAULT NULL;
-  DECLARE f_DOCEDITOR varchar(50) DEFAULT NULL;
-  DECLARE f_DOCAUDITOR varchar(50) DEFAULT NULL;
-  DECLARE f_DOCOUTUPID int(11) DEFAULT NULL;
-  DECLARE f_DOCVALID datetime DEFAULT NULL;
-  DECLARE f_DOCPUBURL varchar(400) DEFAULT NULL;
-  DECLARE f_DOCPUBTIME datetime DEFAULT NULL;
-  DECLARE f_DOCRELTIME datetime DEFAULT NULL;
-  DECLARE f_CRUSER varchar(50) DEFAULT NULL;
-  DECLARE f_CRTIME datetime DEFAULT NULL;
-  DECLARE f_DOCWORDSCOUNT int(11) DEFAULT 0;
-  DECLARE f_DOCPRO int(11) DEFAULT 1;
-  DECLARE f_RIGHTDEFINED smallint(6) DEFAULT 0;
-  DECLARE f_TITLECOLOR varchar(20) DEFAULT NULL;
-  DECLARE f_TEMPLATEID int(11) DEFAULT 0;
-  DECLARE f_SCHEDULE int(11) DEFAULT 0;
-  DECLARE f_DOCNO varchar(20) DEFAULT NULL;
-  DECLARE f_DOCFLAG int(11) DEFAULT 0;
-  DECLARE f_EDITOR varchar(100) DEFAULT NULL;
-  DECLARE f_ATTRIBUTE varchar(500) DEFAULT NULL;
-  DECLARE f_HITSCOUNT int(11) DEFAULT 0;
-  DECLARE f_DOCPUBHTMLCON longtext ;
-  DECLARE f_SUBDOCTITLE varchar(500) DEFAULT NULL;
-  DECLARE f_ATTACHPIC smallint(6) DEFAULT NULL;
-  DECLARE f_DOCLINK varchar(500) DEFAULT NULL;
-  DECLARE f_DOCFILENAME varchar(50) DEFAULT NULL;
-  DECLARE f_DOCFROMVERSION int(11) DEFAULT NULL;
-  DECLARE f_OPERTIME datetime DEFAULT NULL;
-  DECLARE f_OPERUSER varchar(50) DEFAULT NULL;
-  DECLARE f_FLOWOPERATIONMARK varchar(20) DEFAULT NULL;
-  DECLARE f_FLOWPREOPERATIONMARK varchar(20) DEFAULT NULL;
-  DECLARE f_FLOWOPERATIONMASKENUM varchar(20) DEFAULT NULL;
-  DECLARE f_DOCSOURCENAME varchar(100) DEFAULT NULL;
-  DECLARE f_DOCLINKTO varchar(300) DEFAULT NULL;
-  DECLARE f_DOCMIRRORTO varchar(300) DEFAULT NULL;
-  DECLARE f_RANDOMSERIAL varchar(100) DEFAULT NULL;
-  DECLARE f_POSTUSER varchar(50) DEFAULT NULL;
-  DECLARE f_ISPAGEIMG tinyint(4) DEFAULT NULL;
-  DECLARE f_PUBLISHDATE varchar(50) DEFAULT NULL;
-  DECLARE f_PAGENUM varchar(20) DEFAULT NULL;
-  DECLARE f_PAGENAME varchar(150) DEFAULT NULL;
-  DECLARE f_PDFFILENAME varchar(150) DEFAULT NULL;
-  DECLARE f_PAGEIMAGEFILENAME varchar(50) DEFAULT NULL;
-  DECLARE f_MAP varchar(500) DEFAULT NULL;
-  DECLARE f_YINTI varchar(200) DEFAULT NULL;
-  DECLARE f_SITEID int(11) DEFAULT 0;
-  DECLARE f_SRCSITEID int(11) DEFAULT 0;
-  DECLARE f_DOCFIRSTPUBTIME datetime DEFAULT NULL;
-  DECLARE f_NODEID int(11) DEFAULT 0;
-  DECLARE f_ORDERID int(11) DEFAULT 0;
-  DECLARE f_CRDEPT varchar(200) DEFAULT NULL;
-  DECLARE f_DOCFORM int(11) DEFAULT 0;
-  DECLARE f_DOCLEVEL int(11) DEFAULT NULL;
-  DECLARE f_olddocpuburl varchar(400) DEFAULT NULL;
-  DECLARE f_AttachVideo smallint(6) DEFAULT 0;
-  DECLARE f_AttachAudio smallint(6) DEFAULT 0;
-  DECLARE f_ThumbFiles varchar(2000) DEFAULT NULL;
-  DECLARE f_commentFlag tinyint(4) DEFAULT 0;
-  DECLARE f_readingMoodFlag tinyint(4) DEFAULT 0;
-  DECLARE f_FromType int(11) DEFAULT 0 ;
-  DECLARE f_FromId int(11) DEFAULT 0 ;
-  DECLARE f_OriginDocId int(11) DEFAULT 0 ;
+    DECLARE isover INT DEFAULT 0;
+
+    DECLARE migr_table_name varchar(255) DEFAULT 'wcmdocument';
+    
+    DECLARE f_DOCID int(11) DEFAULT 0;
+    DECLARE f_DOCCHANNEL int(11) DEFAULT 0;
+    DECLARE f_DOCVERSION int(11) DEFAULT 0;
+    DECLARE f_DOCTYPE int(11) DEFAULT 0;
+    DECLARE f_DOCTITLE varchar(1000) DEFAULT 0;
+    DECLARE f_ShortTitle varchar(400) DEFAULT NULL;
+    DECLARE f_DOCSOURCE int(11) DEFAULT 0;
+    DECLARE f_DOCSECURITY int(11) DEFAULT 0;
+    DECLARE f_DOCSTATUS int(11) DEFAULT 0;
+    DECLARE f_DOCKIND int(11) DEFAULT NULL;
+    DECLARE f_DOCCONTENT longtext;
+    DECLARE f_DOCHTMLCON longtext;
+    DECLARE f_DOCABSTRACT varchar(2000) DEFAULT NULL;
+    DECLARE f_DOCKEYWORDS varchar(200) DEFAULT NULL;
+    DECLARE f_DOCRELWORDS varchar(200) DEFAULT NULL;
+    DECLARE f_DOCPEOPLE varchar(200) DEFAULT NULL;
+    DECLARE f_DOCPLACE varchar(200) DEFAULT NULL;
+    DECLARE f_DOCAUTHOR varchar(200) DEFAULT NULL;
+    DECLARE f_DOCEDITOR varchar(50) DEFAULT NULL;
+    DECLARE f_DOCAUDITOR varchar(50) DEFAULT NULL;
+    DECLARE f_DOCOUTUPID int(11) DEFAULT NULL;
+    DECLARE f_DOCVALID datetime DEFAULT NULL;
+    DECLARE f_DOCPUBURL varchar(400) DEFAULT NULL;
+    DECLARE f_DOCPUBTIME datetime DEFAULT NULL;
+    DECLARE f_DOCRELTIME datetime DEFAULT NULL;
+    DECLARE f_CRUSER varchar(50) DEFAULT NULL;
+    DECLARE f_CRTIME datetime DEFAULT NULL;
+    DECLARE f_DOCWORDSCOUNT int(11) DEFAULT 0;
+    DECLARE f_DOCPRO int(11) DEFAULT 1;
+    DECLARE f_RIGHTDEFINED smallint(6) DEFAULT 0;
+    DECLARE f_TITLECOLOR varchar(20) DEFAULT NULL;
+    DECLARE f_TEMPLATEID int(11) DEFAULT 0;
+    DECLARE f_SCHEDULE int(11) DEFAULT 0;
+    DECLARE f_DOCNO varchar(20) DEFAULT NULL;
+    DECLARE f_DOCFLAG int(11) DEFAULT 0;
+    DECLARE f_EDITOR varchar(100) DEFAULT NULL;
+    DECLARE f_ATTRIBUTE varchar(500) DEFAULT NULL;
+    DECLARE f_HITSCOUNT int(11) DEFAULT 0;
+    DECLARE f_DOCPUBHTMLCON longtext ;
+    DECLARE f_SUBDOCTITLE varchar(500) DEFAULT NULL;
+    DECLARE f_ATTACHPIC smallint(6) DEFAULT NULL;
+    DECLARE f_DOCLINK varchar(500) DEFAULT NULL;
+    DECLARE f_DOCFILENAME varchar(50) DEFAULT NULL;
+    DECLARE f_DOCFROMVERSION int(11) DEFAULT NULL;
+    DECLARE f_OPERTIME datetime DEFAULT NULL;
+    DECLARE f_OPERUSER varchar(50) DEFAULT NULL;
+    DECLARE f_FLOWOPERATIONMARK varchar(20) DEFAULT NULL;
+    DECLARE f_FLOWPREOPERATIONMARK varchar(20) DEFAULT NULL;
+    DECLARE f_FLOWOPERATIONMASKENUM varchar(20) DEFAULT NULL;
+    DECLARE f_DOCSOURCENAME varchar(100) DEFAULT NULL;
+    DECLARE f_DOCLINKTO varchar(300) DEFAULT NULL;
+    DECLARE f_DOCMIRRORTO varchar(300) DEFAULT NULL;
+    DECLARE f_RANDOMSERIAL varchar(100) DEFAULT NULL;
+    DECLARE f_POSTUSER varchar(50) DEFAULT NULL;
+    DECLARE f_ISPAGEIMG tinyint(4) DEFAULT NULL;
+    DECLARE f_PUBLISHDATE varchar(50) DEFAULT NULL;
+    DECLARE f_PAGENUM varchar(20) DEFAULT NULL;
+    DECLARE f_PAGENAME varchar(150) DEFAULT NULL;
+    DECLARE f_PDFFILENAME varchar(150) DEFAULT NULL;
+    DECLARE f_PAGEIMAGEFILENAME varchar(50) DEFAULT NULL;
+    DECLARE f_MAP varchar(500) DEFAULT NULL;
+    DECLARE f_YINTI varchar(200) DEFAULT NULL;
+    DECLARE f_SITEID int(11) DEFAULT 0;
+    DECLARE f_SRCSITEID int(11) DEFAULT 0;
+    DECLARE f_DOCFIRSTPUBTIME datetime DEFAULT NULL;
+    DECLARE f_NODEID int(11) DEFAULT 0;
+    DECLARE f_ORDERID int(11) DEFAULT 0;
+    DECLARE f_CRDEPT varchar(200) DEFAULT NULL;
+    DECLARE f_DOCFORM int(11) DEFAULT 0;
+    DECLARE f_DOCLEVEL int(11) DEFAULT NULL;
+    DECLARE f_olddocpuburl varchar(400) DEFAULT NULL;
+    DECLARE f_AttachVideo smallint(6) DEFAULT 0;
+    DECLARE f_AttachAudio smallint(6) DEFAULT 0;
+    DECLARE f_ThumbFiles varchar(2000) DEFAULT NULL;
+    DECLARE f_commentFlag tinyint(4) DEFAULT 0;
+    DECLARE f_readingMoodFlag tinyint(4) DEFAULT 0;
+    DECLARE f_FromType int(11) DEFAULT 0 ;
+    DECLARE f_FromId int(11) DEFAULT 0 ;
+    DECLARE f_OriginDocId int(11) DEFAULT 0 ;
+
+
+
 
 
   DECLARE cur_doc CURSOR FOR
@@ -265,6 +270,13 @@ CREATE PROCEDURE sp_data_migration_wcmdocument(IN prevDocId BIGINT(20),
     ;
 
 
+    select concat('开始迁移 ', migr_table_name) info;
+
+
+    SET @log_sql = trs_data_migration.build_migration_log_sql(migr_table_name, 0);
+    prepare stmt from @log_sql;
+    EXECUTE stmt;
+    deallocate prepare stmt;
 
     WHILE isover= 0 DO
 
@@ -450,9 +462,9 @@ CREATE PROCEDURE sp_data_migration_wcmdocument(IN prevDocId BIGINT(20),
                 f_OriginDocId
                 );
 
-          SET @sql = trs_data_migration.build_migration_log_sql('wcmdocument', @DOCID);
+          SET @log_sql = trs_data_migration.build_migration_log_sql(migr_table_name, @DOCID);
 
-          prepare stmt from @sql;
+          prepare stmt from @log_sql;
           EXECUTE stmt;
           deallocate prepare stmt;
     END IF ;
@@ -543,11 +555,8 @@ CREATE PROCEDURE sp_data_migration_wcmdocument(IN prevDocId BIGINT(20),
 	
 	CLOSE cur_doc;
 
-    SET @sql = trs_data_migration.build_migration_log_sql('wcmdocument', -1);
+    select concat('完成迁移 ', migr_table_name) info;
 
-    prepare stmt from @sql;
-    EXECUTE stmt;
-    deallocate prepare stmt;
-		
-	END $$
+
+  END $$
 DELIMITER ;

TRS.WCM.Developer/贵州项目/3_sp_data_migration_wcmfolderpublishconfig.sql

@@ -11,6 +11,8 @@ CREATE PROCEDURE sp_data_migration_wcmfolderpublishconfig(IN prevFolderPublishCo
 	
     DECLARE isover INT DEFAULT 0;
 
+    DECLARE migr_table_name varchar(255) DEFAULT 'wcmfolderpublishconfig';
+
     DECLARE f_FOLDERPUBLISHCONFIGID int(11) DEFAULT 0;
     DECLARE f_FOLDERTYPE int(11) DEFAULT 0;
     DECLARE f_FOLDERID int(11) DEFAULT 0;
@@ -24,6 +26,8 @@ CREATE PROCEDURE sp_data_migration_wcmfolderpublishconfig(IN prevFolderPublishCo
     DECLARE f_PAGEENCODING varchar(50) DEFAULT NULL;
 
 
+
+
     DECLARE cur CURSOR FOR
 		SELECT
       FOLDERPUBLISHCONFIGID,
@@ -59,6 +63,13 @@ CREATE PROCEDURE sp_data_migration_wcmfolderpublishconfig(IN prevFolderPublishCo
     ;
 
 
+    select concat('开始迁移 ', migr_table_name) info;
+
+    SET @log_sql = trs_data_migration.build_migration_log_sql(migr_table_name, 0);
+    prepare stmt from @log_sql;
+    EXECUTE stmt;
+    deallocate prepare stmt;
+
 
     WHILE isover= 0 DO
 
@@ -108,9 +119,9 @@ CREATE PROCEDURE sp_data_migration_wcmfolderpublishconfig(IN prevFolderPublishCo
                   f_PAGEENCODING
                 );
 
-          SET @sql = trs_data_migration.build_migration_log_sql('wcmfolderpublishconfig', @FOLDERPUBLISHCONFIGID);
+          SET @log_sql = trs_data_migration.build_migration_log_sql(migr_table_name, @FOLDERPUBLISHCONFIGID);
 
-          prepare stmt from @sql;
+          prepare stmt from @log_sql;
           EXECUTE stmt;
           deallocate prepare stmt;
     END IF ;
@@ -133,11 +144,8 @@ CREATE PROCEDURE sp_data_migration_wcmfolderpublishconfig(IN prevFolderPublishCo
 	
 	CLOSE cur;
 
-    SET @sql = trs_data_migration.build_migration_log_sql('wcmfolderpublishconfig', -1);
+    select concat('完成迁移 ', migr_table_name) info;
 
-    prepare stmt from @sql;
-    EXECUTE stmt;
-    deallocate prepare stmt;
-		
-	END $$
+
+  END $$
 DELIMITER ;

TRS.WCM.Developer/贵州项目/3_sp_data_migration_wcmmetatable.sql

@@ -14,6 +14,7 @@ CREATE PROCEDURE sp_data_migration_wcmmetatable(IN prevTableInfoId VARCHAR(100),
     DECLARE f_TABLEINFOID INT DEFAULT 0;
     DECLARE f_TABLENAME VARCHAR(200) DEFAULT NULL;
 
+
     DECLARE cur CURSOR FOR
       SELECT
         TABLEINFOID,
@@ -39,23 +40,27 @@ CREATE PROCEDURE sp_data_migration_wcmmetatable(IN prevTableInfoId VARCHAR(100),
 
       THEN
 
+        select concat('开始更新 ', 'wcmmetatable', f_TABLENAME, '.MetaDataId & ChannelId') info;
+
         # 由于元数据表是动态生成的，执行存储过程前，需要提前将所有元数据表（结构+数据）直接复制至海云
         # 迁移后的元数据，其元数据ID不能和其他元数据表中的ID发生冲突，需要更改，因此有了以下SQL
-        SET @sql = concat('UPDATE trs_hycloud_iip.', f_TABLENAME,
+        SET @log_sql = concat('UPDATE trs_hycloud_iip.', f_TABLENAME,
                           ' SET MetaDataId = MetaDataId + ', docIdOffset,
                           ', ChannelId = ChannelId + ', channelIdOffset,
                           ' WHERE MetaDataId > ', prevDocId);
 
-        prepare stmt from @sql;
+        prepare stmt from @log_sql;
         EXECUTE stmt;
         deallocate prepare stmt;
 
-        SET @sql = trs_data_migration.build_migration_log_sql(concat('wcmmetatable', f_TABLENAME), -1);
+        SET @log_sql = trs_data_migration.build_migration_log_sql(concat('wcmmetatable', f_TABLENAME), -1);
 
-        prepare stmt from @sql;
+        prepare stmt from @log_sql;
         EXECUTE stmt;
         deallocate prepare stmt;
 
+        select concat('完成更新 ', 'wcmmetatable', f_TABLENAME, '.MetaDataId & ChannelId') info;
+
 
       END IF ;
 
@@ -68,11 +73,6 @@ CREATE PROCEDURE sp_data_migration_wcmmetatable(IN prevTableInfoId VARCHAR(100),
 
     CLOSE cur;
 
-    SET @sql = trs_data_migration.build_migration_log_sql('wcmmetatable_alltables', -1);
-
-    prepare stmt from @sql;
-    EXECUTE stmt;
-    deallocate prepare stmt;
 
 	END $$
 DELIMITER ;

TRS.WCM.Developer/贵州项目/3_sp_data_migration_wcmtemplate.sql

@@ -11,6 +11,9 @@ CREATE PROCEDURE sp_data_migration_wcmtemplate(IN prevTemplateId BIGINT(20),
 	
     DECLARE isover INT DEFAULT 0;
 
+    DECLARE migr_table_name varchar(255) DEFAULT 'wcmtemplate';
+
+
     DECLARE  f_TEMPID int(11) DEFAULT '0';
     DECLARE  f_TEMPNAME varchar(150) DEFAULT '0';
     DECLARE  f_TEMPDESC varchar(200) DEFAULT NULL;
@@ -33,6 +36,8 @@ CREATE PROCEDURE sp_data_migration_wcmtemplate(IN prevTemplateId BIGINT(20),
     DECLARE  f_VISUAL int(11) DEFAULT NULL;
 
 
+
+
     DECLARE cur CURSOR FOR
 		SELECT
       TEMPID,
@@ -56,7 +61,7 @@ CREATE PROCEDURE sp_data_migration_wcmtemplate(IN prevTemplateId BIGINT(20),
       LASTMODIFIEDTIME,
       VISUAL
     FROM trs_data_migration.wcmtemplate
-		ORDER BY FOLDERPUBLISHCONFIGID asc;
+		ORDER BY TEMPID asc;
 
 	DECLARE CONTINUE HANDLER FOR NOT FOUND SET isover = 1;
 	
@@ -86,6 +91,12 @@ CREATE PROCEDURE sp_data_migration_wcmtemplate(IN prevTemplateId BIGINT(20),
     ;
 
 
+    select concat('开始迁移 ', migr_table_name) info;
+
+    SET @log_sql = trs_data_migration.build_migration_log_sql(migr_table_name, 0);
+    prepare stmt from @log_sql;
+    EXECUTE stmt;
+    deallocate prepare stmt;
 
     WHILE isover= 0 DO
 
@@ -161,9 +172,9 @@ CREATE PROCEDURE sp_data_migration_wcmtemplate(IN prevTemplateId BIGINT(20),
                   f_VISUAL
                 );
 
-          SET @sql = trs_data_migration.build_migration_log_sql('wcmtemplate', @TEMPID);
+          SET @log_sql = trs_data_migration.build_migration_log_sql(migr_table_name, @TEMPID);
 
-          prepare stmt from @sql;
+          prepare stmt from @log_sql;
           EXECUTE stmt;
           deallocate prepare stmt;
     END IF ;
@@ -195,11 +206,9 @@ CREATE PROCEDURE sp_data_migration_wcmtemplate(IN prevTemplateId BIGINT(20),
 	
 	CLOSE cur;
 
-    SET @sql = trs_data_migration.build_migration_log_sql('wcmtemplate', -1);
+    select concat('完成迁移 ', migr_table_name) info;
 
-    prepare stmt from @sql;
-    EXECUTE stmt;
-    deallocate prepare stmt;
-		
-	END $$
+
+
+  END $$
 DELIMITER ;

TRS.WCM.Developer/贵州项目/3_sp_data_migration_wcmtemplateargument.sql

@@ -5,12 +5,15 @@ DROP PROCEDURE IF EXISTS sp_data_migration_wcmtemplateargument;
 DELIMITER $$
 CREATE PROCEDURE sp_data_migration_wcmtemplateargument(IN prevTemplateArgId BIGINT(20),
                                               IN templateArgIdOffset BIGINT(20),
+                                              IN templateIdOffset BIGINT(20),
                                               IN siteIdOffset BIGINT(20),
                                               IN channelIdOffset BIGINT(20))
 	BEGIN 
 	
     DECLARE isover INT DEFAULT 0;
 
+    DECLARE migr_table_name varchar(255) DEFAULT 'wcmtemplateargument';
+
     DECLARE  f_TEMPLATEARGUMENTID int(11) DEFAULT '0';
     DECLARE  f_EMPLOYERTYPE int(11) DEFAULT '0';
     DECLARE  f_EMPLOYERID int(11) DEFAULT '0';
@@ -20,6 +23,8 @@ CREATE PROCEDURE sp_data_migration_wcmtemplateargument(IN prevTemplateArgId BIGI
     DECLARE  f_PREFIXOFNAME varchar(256) DEFAULT NULL;
 
 
+
+
     DECLARE cur CURSOR FOR
 		SELECT
       TEMPLATEARGUMENTID,
@@ -47,6 +52,12 @@ CREATE PROCEDURE sp_data_migration_wcmtemplateargument(IN prevTemplateArgId BIGI
     ;
 
 
+    select concat('开始迁移 ', migr_table_name) info;
+
+    SET @log_sql = trs_data_migration.build_migration_log_sql(migr_table_name, 0);
+    prepare stmt from @log_sql;
+    EXECUTE stmt;
+    deallocate prepare stmt;
 
     WHILE isover= 0 DO
 
@@ -57,7 +68,7 @@ CREATE PROCEDURE sp_data_migration_wcmtemplateargument(IN prevTemplateArgId BIGI
 
             SET @TEMPLATEARGUMENTID = f_TEMPLATEARGUMENTID;
             SET f_TEMPLATEARGUMENTID = f_TEMPLATEARGUMENTID + templateArgIdOffset;
-            SET f_TEMPLATEID = f_TEMPLATEID + baseTemplateId;
+            SET f_TEMPLATEID = f_TEMPLATEID + templateIdOffset;
 
             IF (f_EMPLOYERTYPE = 103)
               THEN SET f_EMPLOYERID = f_EMPLOYERID + siteIdOffset;
@@ -69,7 +80,7 @@ CREATE PROCEDURE sp_data_migration_wcmtemplateargument(IN prevTemplateArgId BIGI
 
 
 
-            insert into trs_hycloud_iip.wcmtemplateemploy
+            insert into trs_hycloud_iip.wcmtemplateargument
               (
                 TEMPLATEARGUMENTID,
                 EMPLOYERTYPE,
@@ -90,9 +101,9 @@ CREATE PROCEDURE sp_data_migration_wcmtemplateargument(IN prevTemplateArgId BIGI
                   f_PREFIXOFNAME
                 );
 
-          SET @sql = trs_data_migration.build_migration_log_sql('wcmtemplateargument', @TEMPLATEARGUMENTID);
+          SET @log_sql = trs_data_migration.build_migration_log_sql(migr_table_name, @TEMPLATEARGUMENTID);
 
-          prepare stmt from @sql;
+          prepare stmt from @log_sql;
           EXECUTE stmt;
           deallocate prepare stmt;
     END IF ;
@@ -111,11 +122,8 @@ CREATE PROCEDURE sp_data_migration_wcmtemplateargument(IN prevTemplateArgId BIGI
 	
 	CLOSE cur;
 
-    SET @sql = trs_data_migration.build_migration_log_sql('wcmtemplateargument', -1);
+    select concat('完成迁移 ', migr_table_name) info;
 
-    prepare stmt from @sql;
-    EXECUTE stmt;
-    deallocate prepare stmt;
-		
-	END $$
+
+  END $$
 DELIMITER ;

TRS.WCM.Developer/贵州项目/3_sp_data_migration_wcmtemplateemploy.sql

@@ -12,6 +12,8 @@ CREATE PROCEDURE sp_data_migration_wcmtemplateemploy(IN prevTemplateEmployId BIG
 	
     DECLARE isover INT DEFAULT 0;
 
+    DECLARE migr_table_name varchar(255) DEFAULT 'wcmtemplateemploy';
+
     DECLARE  f_TEMPLATEEMPLOYID int(11) DEFAULT '0';
     DECLARE  f_EMPLOYERTYPE int(11) DEFAULT '0';
     DECLARE  f_EMPLOYERID int(11) DEFAULT '0';
@@ -20,6 +22,8 @@ CREATE PROCEDURE sp_data_migration_wcmtemplateemploy(IN prevTemplateEmployId BIG
     DECLARE  f_ISDEFAULT smallint(6) DEFAULT '0';
 
 
+
+
     DECLARE cur CURSOR FOR
 		SELECT
       TEMPLATEEMPLOYID,
@@ -45,6 +49,13 @@ CREATE PROCEDURE sp_data_migration_wcmtemplateemploy(IN prevTemplateEmployId BIG
     ;
 
 
+    select concat('开始迁移 ', migr_table_name) info;
+
+    SET @log_sql = trs_data_migration.build_migration_log_sql(migr_table_name, 0);
+    prepare stmt from @log_sql;
+    EXECUTE stmt;
+    deallocate prepare stmt;
+
 
     WHILE isover= 0 DO
 
@@ -86,9 +97,9 @@ CREATE PROCEDURE sp_data_migration_wcmtemplateemploy(IN prevTemplateEmployId BIG
                   f_ISDEFAULT
                 );
 
-          SET @sql = trs_data_migration.build_migration_log_sql('wcmtemplateemploy', @TEMPLATEEMPLOYID);
+          SET @log_sql = trs_data_migration.build_migration_log_sql(migr_table_name, @TEMPLATEEMPLOYID);
 
-          prepare stmt from @sql;
+          prepare stmt from @log_sql;
           EXECUTE stmt;
           deallocate prepare stmt;
     END IF ;
@@ -106,11 +117,8 @@ CREATE PROCEDURE sp_data_migration_wcmtemplateemploy(IN prevTemplateEmployId BIG
 	
 	CLOSE cur;
 
-    SET @sql = trs_data_migration.build_migration_log_sql('wcmtemplateemploy', -1);
+    select concat('完成迁移 ', migr_table_name) info;
 
-    prepare stmt from @sql;
-    EXECUTE stmt;
-    deallocate prepare stmt;
-		
-	END $$
+
+  END $$
 DELIMITER ;

TRS.WCM.Developer/贵州项目/3_sp_data_migration_wcmtemplatenest.sql

@@ -9,10 +9,16 @@ CREATE PROCEDURE sp_data_migration_wcmtemplatenest(IN prevTemplateNestId BIGINT(
 	
     DECLARE isover INT DEFAULT 0;
 
+    DECLARE migr_table_name varchar(255) DEFAULT 'wcmtemplatenest';
+
     DECLARE  f_TEMPLATEID int(11) DEFAULT 0;
     DECLARE  f_NESTEDTEMPLATEID int(11) DEFAULT 0;
     DECLARE  f_TEMPLATENESTID int(11) DEFAULT 0;
 
+
+
+    
+
     DECLARE cur CURSOR FOR
 		SELECT
       TEMPLATEID,
@@ -32,6 +38,13 @@ CREATE PROCEDURE sp_data_migration_wcmtemplatenest(IN prevTemplateNestId BIGINT(
     ;
 
 
+    select concat('开始迁移 ', migr_table_name) info;
+
+    SET @log_sql = trs_data_migration.build_migration_log_sql(migr_table_name, 0);
+    prepare stmt from @log_sql;
+    EXECUTE stmt;
+    deallocate prepare stmt;
+
 
     WHILE isover= 0 DO
 
@@ -58,9 +71,9 @@ CREATE PROCEDURE sp_data_migration_wcmtemplatenest(IN prevTemplateNestId BIGINT(
                   f_TEMPLATENESTID
                 );
 
-          SET @sql = trs_data_migration.build_migration_log_sql('wcmtemplatenest', @TEMPLATENESTID);
+          SET @log_sql = trs_data_migration.build_migration_log_sql(migr_table_name, @TEMPLATENESTID);
 
-          prepare stmt from @sql;
+          prepare stmt from @log_sql;
           EXECUTE stmt;
           deallocate prepare stmt;
     END IF ;
@@ -75,11 +88,8 @@ CREATE PROCEDURE sp_data_migration_wcmtemplatenest(IN prevTemplateNestId BIGINT(
 	
 	CLOSE cur;
 
-    SET @sql = trs_data_migration.build_migration_log_sql('wcmtemplatenest', -1);
+    select concat('完成迁移 ', migr_table_name) info;
 
-    prepare stmt from @sql;
-    EXECUTE stmt;
-    deallocate prepare stmt;
-		
-	END $$
+
+  END $$
 DELIMITER ;

TRS.WCM.Developer/贵州项目/3_sp_data_migration_wcmtemplatequote.sql

@@ -12,6 +12,8 @@ CREATE PROCEDURE sp_data_migration_wcmtemplatequote(IN prevTemplateQuoteId BIGIN
 	
     DECLARE isover INT DEFAULT 0;
 
+    DECLARE migr_table_name varchar(255) DEFAULT 'wcmtemplatequote';
+
     DECLARE  f_TEMPLATEQUOTEID int(11) DEFAULT '0';
     DECLARE  f_TEMPLATEID int(11) DEFAULT '0';
     DECLARE  f_TEMPLATETYPE smallint(6) DEFAULT '0';
@@ -49,6 +51,15 @@ CREATE PROCEDURE sp_data_migration_wcmtemplatequote(IN prevTemplateQuoteId BIGIN
 
 
 
+    select concat('开始迁移 ', migr_table_name) info;
+
+    SET @log_sql = trs_data_migration.build_migration_log_sql(migr_table_name, 0);
+    prepare stmt from @log_sql;
+    EXECUTE stmt;
+    deallocate prepare stmt;
+
+
+
     WHILE isover= 0 DO
 
       # 断点续传
@@ -91,9 +102,9 @@ CREATE PROCEDURE sp_data_migration_wcmtemplatequote(IN prevTemplateQuoteId BIGIN
                   f_QUOTETYPE
                 );
 
-          SET @sql = trs_data_migration.build_migration_log_sql('wcmtemplatequote', @TEMPLATEQUOTEID);
+          SET @log_sql = trs_data_migration.build_migration_log_sql(migr_table_name, @TEMPLATEQUOTEID);
 
-          prepare stmt from @sql;
+          prepare stmt from @log_sql;
           EXECUTE stmt;
           deallocate prepare stmt;
     END IF ;
@@ -112,11 +123,8 @@ CREATE PROCEDURE sp_data_migration_wcmtemplatequote(IN prevTemplateQuoteId BIGIN
 	
 	CLOSE cur;
 
-    SET @sql = trs_data_migration.build_migration_log_sql('wcmtemplatequote', -1);
+    select concat('完成迁移 ', migr_table_name) info;
 
-    prepare stmt from @sql;
-    EXECUTE stmt;
-    deallocate prepare stmt;
-		
-	END $$
+
+  END $$
 DELIMITER ;

TRS.WCM.Developer/贵州项目/3_sp_data_migration_wcmwebsite.sql

@@ -6,52 +6,58 @@ DELIMITER $$
 CREATE PROCEDURE sp_data_migration_wcmwebsite(IN prevSiteId BIGINT(20), IN siteIdOffset BIGINT(20))
 	BEGIN 
 	
-	DECLARE isover INT DEFAULT 0;
+	  DECLARE isover INT DEFAULT 0;
+
+    DECLARE migr_table_name varchar(255) DEFAULT 'wcmwebsite';
 	
-  DECLARE f_SITEID int(11) DEFAULT 0;
-  DECLARE f_SITENAME varchar(200) DEFAULT 0;
-  DECLARE f_SITEDESC varchar(200) DEFAULT NULL;
-  DECLARE f_FTPSERVER varchar(200) DEFAULT NULL;
-  DECLARE f_FTPUSER varchar(50) DEFAULT NULL;
-  DECLARE f_FTPPASSWORD varchar(50) DEFAULT NULL;
-  DECLARE f_FTPFOLDER varchar(200) DEFAULT NULL;
-  DECLARE f_DATAPATH varchar(200) DEFAULT NULL;
-  DECLARE f_WEBHTTP varchar(200) DEFAULT NULL;
-  DECLARE f_SITEPROP int(11) DEFAULT NULL;
-  DECLARE f_PARENTID int(11) DEFAULT NULL;
-  DECLARE f_SITEORDER int(11) DEFAULT 0;
-  DECLARE f_ATTRIBUTE varchar(500) DEFAULT NULL;
-  DECLARE f_HOMETEMPLATEID int(11) DEFAULT NULL;
-  DECLARE f_SITEORDERBY varchar(200) DEFAULT NULL;
-  DECLARE f_CRUSER varchar(50) DEFAULT NULL;
-  DECLARE f_CRTIME datetime DEFAULT NULL;
-  DECLARE f_PUBSTATUSES varchar(200) DEFAULT NULL;
-  DECLARE f_SCHEDULE int(11) DEFAULT 0;
-  DECLARE f_STATUS int(11) DEFAULT 0;
-  DECLARE f_PUBLISHPRO smallint(6) DEFAULT 1;
-  DECLARE f_OPERUSER varchar(50) DEFAULT NULL;
-  DECLARE f_OPERTIME datetime DEFAULT NULL;
-  DECLARE f_SITETYPE int(11) DEFAULT 0;
-  DECLARE f_lastmodifytime datetime DEFAULT NULL;
-  DECLARE f_ISMOBILE int(11) DEFAULT 0;
-  DECLARE f_BASEPROPS varchar(300) DEFAULT NULL;
-  DECLARE f_OTHERPROPS varchar(300) DEFAULT NULL;
-  DECLARE f_ADVANCEPROPS varchar(300) DEFAULT NULL;
-  DECLARE f_VIEWPROPS varchar(300) DEFAULT NULL;
-  DECLARE f_NEEDEDPROPS varchar(300) DEFAULT NULL;
-  DECLARE f_MediaType int(11) DEFAULT 1;
-  DECLARE f_IsSubscribe smallint(6) DEFAULT 0;
-  DECLARE f_ISPUSHABLE tinyint(4) DEFAULT 0 ;
-  DECLARE f_ISDISTRIBUTABLE tinyint(4) DEFAULT 0 ;
-  DECLARE f_OUTLINETEMPLATE int(11) DEFAULT 0;
-  DECLARE f_CHNLOUTLINETEMP int(11) DEFAULT 0;
-  DECLARE f_DETAILTEMPLATE int(11) DEFAULT 0;
-  DECLARE f_SITEDESCPINYIN varchar(254) DEFAULT NULL;
-  DECLARE f_IDXPREFIX varchar(30) DEFAULT NULL ;
-  DECLARE f_AUTOCHECK tinyint(4) DEFAULT 0 ;
+    DECLARE f_SITEID int(11) DEFAULT 0;
+    DECLARE f_SITENAME varchar(200) DEFAULT 0;
+    DECLARE f_SITEDESC varchar(200) DEFAULT NULL;
+    DECLARE f_FTPSERVER varchar(200) DEFAULT NULL;
+    DECLARE f_FTPUSER varchar(50) DEFAULT NULL;
+    DECLARE f_FTPPASSWORD varchar(50) DEFAULT NULL;
+    DECLARE f_FTPFOLDER varchar(200) DEFAULT NULL;
+    DECLARE f_DATAPATH varchar(200) DEFAULT NULL;
+    DECLARE f_WEBHTTP varchar(200) DEFAULT NULL;
+    DECLARE f_SITEPROP int(11) DEFAULT NULL;
+    DECLARE f_PARENTID int(11) DEFAULT NULL;
+    DECLARE f_SITEORDER int(11) DEFAULT 0;
+    DECLARE f_ATTRIBUTE varchar(500) DEFAULT NULL;
+    DECLARE f_HOMETEMPLATEID int(11) DEFAULT NULL;
+    DECLARE f_SITEORDERBY varchar(200) DEFAULT NULL;
+    DECLARE f_CRUSER varchar(50) DEFAULT NULL;
+    DECLARE f_CRTIME datetime DEFAULT NULL;
+    DECLARE f_PUBSTATUSES varchar(200) DEFAULT NULL;
+    DECLARE f_SCHEDULE int(11) DEFAULT 0;
+    DECLARE f_STATUS int(11) DEFAULT 0;
+    DECLARE f_PUBLISHPRO smallint(6) DEFAULT 1;
+    DECLARE f_OPERUSER varchar(50) DEFAULT NULL;
+    DECLARE f_OPERTIME datetime DEFAULT NULL;
+    DECLARE f_SITETYPE int(11) DEFAULT 0;
+    DECLARE f_lastmodifytime datetime DEFAULT NULL;
+    DECLARE f_ISMOBILE int(11) DEFAULT 0;
+    DECLARE f_BASEPROPS varchar(300) DEFAULT NULL;
+    DECLARE f_OTHERPROPS varchar(300) DEFAULT NULL;
+    DECLARE f_ADVANCEPROPS varchar(300) DEFAULT NULL;
+    DECLARE f_VIEWPROPS varchar(300) DEFAULT NULL;
+    DECLARE f_NEEDEDPROPS varchar(300) DEFAULT NULL;
+    DECLARE f_MediaType int(11) DEFAULT 1;
+    DECLARE f_IsSubscribe smallint(6) DEFAULT 0;
+    DECLARE f_ISPUSHABLE tinyint(4) DEFAULT 0 ;
+    DECLARE f_ISDISTRIBUTABLE tinyint(4) DEFAULT 0 ;
+    DECLARE f_OUTLINETEMPLATE int(11) DEFAULT 0;
+    DECLARE f_CHNLOUTLINETEMP int(11) DEFAULT 0;
+    DECLARE f_DETAILTEMPLATE int(11) DEFAULT 0;
+    DECLARE f_SITEDESCPINYIN varchar(254) DEFAULT NULL;
+    DECLARE f_IDXPREFIX varchar(30) DEFAULT NULL ;
+    DECLARE f_AUTOCHECK tinyint(4) DEFAULT 0 ;
+  
+
+
 
 
-  DECLARE cur CURSOR FOR
+
+    DECLARE cur CURSOR FOR
 		SELECT
       SITEID,
       SITENAME,
@@ -146,6 +152,13 @@ CREATE PROCEDURE sp_data_migration_wcmwebsite(IN prevSiteId BIGINT(20), IN siteI
     ;
 
 
+    select concat('开始迁移 ', migr_table_name) info;
+
+
+    SET @log_sql = trs_data_migration.build_migration_log_sql(migr_table_name, 0);
+    prepare stmt from @log_sql;
+    EXECUTE stmt;
+    deallocate prepare stmt;
 
     WHILE isover= 0 DO
 
@@ -246,9 +259,9 @@ CREATE PROCEDURE sp_data_migration_wcmwebsite(IN prevSiteId BIGINT(20), IN siteI
                   f_AUTOCHECK
                 );
 
-          SET @sql = trs_data_migration.build_migration_log_sql('wcmwebsite', @SITEID);
+          SET @log_sql = trs_data_migration.build_migration_log_sql(migr_table_name, @SITEID);
 
-          prepare stmt from @sql;
+          prepare stmt from @log_sql;
           EXECUTE stmt;
           deallocate prepare stmt;
     END IF ;
@@ -301,11 +314,8 @@ CREATE PROCEDURE sp_data_migration_wcmwebsite(IN prevSiteId BIGINT(20), IN siteI
 	
 	CLOSE cur;
 
-    SET @sql = trs_data_migration.build_migration_log_sql('wcmwebsite', -1);
+    select concat('完成迁移 ', migr_table_name) info;
 
-    prepare stmt from @sql;
-    EXECUTE stmt;
-    deallocate prepare stmt;
-		
-	END $$
+
+  END $$
 DELIMITER ;

TRS.WCM.Developer/贵州项目/3_sp_data_migration_xwcmclassinfo.sql

@@ -9,6 +9,8 @@ CREATE PROCEDURE sp_data_migration_xwcmclassinfo(IN prevClassInfoId BIGINT(20),
 	
 	  DECLARE isover INT DEFAULT 0;
 
+    DECLARE migr_table_name varchar(255) DEFAULT 'xwcmclassinfo';
+    
     DECLARE  f_CLASSINFOID int(11) DEFAULT NULL;
     DECLARE  f_CLASSORDER int(11) DEFAULT NULL;
     DECLARE  f_CNAME varchar(50) DEFAULT '0';
@@ -20,7 +22,10 @@ CREATE PROCEDURE sp_data_migration_xwcmclassinfo(IN prevClassInfoId BIGINT(20),
     DECLARE  f_CCODE varchar(50) DEFAULT NULL;
 
 
-  DECLARE cur CURSOR FOR
+
+
+
+    DECLARE cur CURSOR FOR
 		SELECT
       CLASSINFOID,
       CLASSORDER,
@@ -51,6 +56,13 @@ CREATE PROCEDURE sp_data_migration_xwcmclassinfo(IN prevClassInfoId BIGINT(20),
     ;
 
 
+    select concat('开始迁移 ', migr_table_name) info;
+
+    SET @log_sql = trs_data_migration.build_migration_log_sql(migr_table_name, 0);
+    prepare stmt from @log_sql;
+    EXECUTE stmt;
+    deallocate prepare stmt;
+
 
     WHILE isover= 0 DO
 
@@ -94,9 +106,9 @@ CREATE PROCEDURE sp_data_migration_xwcmclassinfo(IN prevClassInfoId BIGINT(20),
                   f_CCODE
                 );
 
-          SET @sql = trs_data_migration.build_migration_log_sql('xwcmclassinfo', @CLASSINFOID);
+          SET @log_sql = trs_data_migration.build_migration_log_sql(migr_table_name, @CLASSINFOID);
 
-          prepare stmt from @sql;
+          prepare stmt from @log_sql;
           EXECUTE stmt;
           deallocate prepare stmt;
     END IF ;
@@ -117,11 +129,8 @@ CREATE PROCEDURE sp_data_migration_xwcmclassinfo(IN prevClassInfoId BIGINT(20),
 	
 	CLOSE cur;
 
-    SET @sql = trs_data_migration.build_migration_log_sql('xwcmclassinfo', -1);
+    select concat('完成迁移 ', migr_table_name) info;
 
-    prepare stmt from @sql;
-    EXECUTE stmt;
-    deallocate prepare stmt;
-		
-	END $$
+
+  END $$
 DELIMITER ;

TRS.WCM.Developer/贵州项目/3_sp_data_migration_xwcmclassinfoview.sql

@@ -4,6 +4,7 @@ use trs_data_migration;
 DROP PROCEDURE IF EXISTS sp_data_migration_xwcmclassinfoview;
 DELIMITER $$
 CREATE PROCEDURE sp_data_migration_xwcmclassinfoview(IN prevClassInfoViewId BIGINT(20),
+                                              IN classInfoViewIdOffset BIGINT(20),
                                               IN classInfoIdOffset BIGINT(20),
                                               IN docIdOffset BIGINT(20),
                                               IN viewIdOffset BIGINT(20))
@@ -11,6 +12,8 @@ CREATE PROCEDURE sp_data_migration_xwcmclassinfoview(IN prevClassInfoViewId BIGI
 	
 	  DECLARE isover INT DEFAULT 0;
 
+    DECLARE migr_table_name varchar(255) DEFAULT 'xwcmclassinfoview';
+
     DECLARE  f_CLASSINFOVIEWID int(11) DEFAULT NULL;
     DECLARE  f_CLASSINFOID int(11) DEFAULT NULL;
     DECLARE  f_METADATAID int(11) DEFAULT NULL;
@@ -19,6 +22,7 @@ CREATE PROCEDURE sp_data_migration_xwcmclassinfoview(IN prevClassInfoViewId BIGI
     DECLARE  f_CRTIME datetime DEFAULT NULL;
 
 
+
   DECLARE cur CURSOR FOR
 		SELECT
       CLASSINFOVIEWID,
@@ -45,15 +49,23 @@ CREATE PROCEDURE sp_data_migration_xwcmclassinfoview(IN prevClassInfoViewId BIGI
 
 
 
+    select concat('开始迁移 ', migr_table_name) info;
+
+    SET @log_sql = trs_data_migration.build_migration_log_sql(migr_table_name, 0);
+    prepare stmt from @log_sql;
+    EXECUTE stmt;
+    deallocate prepare stmt;
+
+
     WHILE isover= 0 DO
 
       # 断点续传
-      IF (f_CLASSINFOID > prevClassInfoId)
+      IF (f_CLASSINFOID > prevClassInfoViewId)
 
         THEN
 
           SET @CLASSINFOVIEWID = f_CLASSINFOVIEWID;
-          SET f_CLASSINFOVIEWID = f_CLASSINFOVIEWID + prevClassInfoViewId;
+          SET f_CLASSINFOVIEWID = f_CLASSINFOVIEWID + classInfoViewIdOffset;
           SET f_CLASSINFOID = f_CLASSINFOID + classInfoIdOffset;
           SET f_METADATAID = f_METADATAID + docIdOffset;
           SET f_VIEWID = f_VIEWID + viewIdOffset;
@@ -78,9 +90,9 @@ CREATE PROCEDURE sp_data_migration_xwcmclassinfoview(IN prevClassInfoViewId BIGI
                   f_CRTIME
                 );
 
-          SET @sql = trs_data_migration.build_migration_log_sql('xwcmclassinfoview', @CLASSINFOVIEWID);
+          SET @log_sql = trs_data_migration.build_migration_log_sql(migr_table_name, @CLASSINFOVIEWID);
 
-          prepare stmt from @sql;
+          prepare stmt from @log_sql;
           EXECUTE stmt;
           deallocate prepare stmt;
     END IF ;
@@ -98,11 +110,8 @@ CREATE PROCEDURE sp_data_migration_xwcmclassinfoview(IN prevClassInfoViewId BIGI
 	
 	CLOSE cur;
 
-    SET @sql = trs_data_migration.build_migration_log_sql('xwcmclassinfoview', @CLASSINFOVIEWID);
+    select concat('完成迁移 ', migr_table_name) info;
 
-    prepare stmt from @sql;
-    EXECUTE stmt;
-    deallocate prepare stmt;
-		
-	END $$
+
+  END $$
 DELIMITER ;

TRS.WCM.Developer/贵州项目/3_sp_data_migration_xwcmdbfieldinfo.sql

@@ -12,6 +12,8 @@ CREATE PROCEDURE sp_data_migration_xwcmdbfieldinfo(IN citySuffix VARCHAR(20),
 	
 	  DECLARE isover INT DEFAULT 0;
 
+    DECLARE migr_table_name varchar(255) DEFAULT 'xwcmdbfieldinfo';
+
     DECLARE  f_DBFIELDINFOID int(11) DEFAULT NULL;
     DECLARE  f_TABLENAME varchar(50) DEFAULT '0';
     DECLARE  f_TABLEID int(11) DEFAULT '0';
@@ -33,6 +35,7 @@ CREATE PROCEDURE sp_data_migration_xwcmdbfieldinfo(IN citySuffix VARCHAR(20),
     DECLARE  f_HIDDENFIELD smallint(6) DEFAULT '0';
 
 
+
   DECLARE cur CURSOR FOR
 		SELECT
       DBFIELDINFOID,
@@ -85,6 +88,14 @@ CREATE PROCEDURE sp_data_migration_xwcmdbfieldinfo(IN citySuffix VARCHAR(20),
 
 
 
+    select concat('开始迁移 ', migr_table_name) info;
+
+    SET @log_sql = trs_data_migration.build_migration_log_sql(migr_table_name, 0);
+    prepare stmt from @log_sql;
+    EXECUTE stmt;
+    deallocate prepare stmt;
+
+
     WHILE isover= 0 DO
 
       # 断点续传
@@ -97,7 +108,7 @@ CREATE PROCEDURE sp_data_migration_xwcmdbfieldinfo(IN citySuffix VARCHAR(20),
             SET f_TABLEID = f_TABLEID + tableIdOffset;
             SET f_CLASSID = f_CLASSID + classInfoIdOffset;
 
-            insert into trs_hycloud_iip.xwcmtableinfo
+            insert into trs_hycloud_iip.xwcmdbfieldinfo
               (
                 DBFIELDINFOID,
                 TABLENAME,
@@ -142,9 +153,9 @@ CREATE PROCEDURE sp_data_migration_xwcmdbfieldinfo(IN citySuffix VARCHAR(20),
                   f_HIDDENFIELD
                 );
 
-          SET @sql = trs_data_migration.build_migration_log_sql('xwcmdbfieldinfo', @DBFIELDINFOID);
+          SET @log_sql = trs_data_migration.build_migration_log_sql(migr_table_name, @DBFIELDINFOID);
 
-          prepare stmt from @sql;
+          prepare stmt from @log_sql;
           EXECUTE stmt;
           deallocate prepare stmt;
     END IF ;
@@ -175,11 +186,8 @@ CREATE PROCEDURE sp_data_migration_xwcmdbfieldinfo(IN citySuffix VARCHAR(20),
 	
 	CLOSE cur;
 
-    SET @sql = trs_data_migration.build_migration_log_sql('xwcmdbfieldinfo', -1);
+    select concat('完成迁移 ', migr_table_name) info;
 
-    prepare stmt from @sql;
-    EXECUTE stmt;
-    deallocate prepare stmt;
-		
-	END $$
+
+  END $$
 DELIMITER ;

TRS.WCM.Developer/贵州项目/3_sp_data_migration_xwcmmetaviewemployer.sql

@@ -11,6 +11,8 @@ CREATE PROCEDURE sp_data_migration_xwcmmetaviewemployer(IN prevMetaViewEmployerI
 	
     DECLARE isover INT DEFAULT 0;
 
+    DECLARE migr_table_name varchar(255) DEFAULT 'xwcmmetaviewemployer';
+
     DECLARE  f_VIEWID int(11) DEFAULT '0';
     DECLARE  f_CHANNELID int(11) DEFAULT '0';
     DECLARE  f_METAVIEWEMPLOYERID int(11) DEFAULT '0';
@@ -20,6 +22,8 @@ CREATE PROCEDURE sp_data_migration_xwcmmetaviewemployer(IN prevMetaViewEmployerI
     DECLARE  f_FOLDERID int(11) DEFAULT '0';
 
 
+
+
     DECLARE cur CURSOR FOR
 		SELECT
       VIEWID,
@@ -44,6 +48,14 @@ CREATE PROCEDURE sp_data_migration_xwcmmetaviewemployer(IN prevMetaViewEmployerI
 
 
 
+    select concat('开始迁移 ', migr_table_name) info;
+
+    SET @log_sql = trs_data_migration.build_migration_log_sql(migr_table_name, 0);
+    prepare stmt from @log_sql;
+    EXECUTE stmt;
+    deallocate prepare stmt;
+
+
     WHILE isover= 0 DO
 
       # 断点续传
@@ -80,9 +92,9 @@ CREATE PROCEDURE sp_data_migration_xwcmmetaviewemployer(IN prevMetaViewEmployerI
                   f_EmployerId
                 );
 
-          SET @sql = trs_data_migration.build_migration_log_sql('xwcmmetaviewemployer', @METAVIEWEMPLOYERID);
+          SET @log_sql = trs_data_migration.build_migration_log_sql(migr_table_name, @METAVIEWEMPLOYERID);
 
-          prepare stmt from @sql;
+          prepare stmt from @log_sql;
           EXECUTE stmt;
           deallocate prepare stmt;
     END IF ;
@@ -99,11 +111,9 @@ CREATE PROCEDURE sp_data_migration_xwcmmetaviewemployer(IN prevMetaViewEmployerI
 	
 	CLOSE cur;
 
-    SET @sql = trs_data_migration.build_migration_log_sql('xwcmmetaviewemployer', -1);
+    select concat('完成迁移 ', migr_table_name) info;
 
-    prepare stmt from @sql;
-    EXECUTE stmt;
-    deallocate prepare stmt;
-		
-	END $$
+
+
+  END $$
 DELIMITER ;

TRS.WCM.Developer/贵州项目/3_sp_data_migration_xwcmmetaviewfieldgroup.sql

@@ -10,6 +10,8 @@ CREATE PROCEDURE sp_data_migration_xwcmmetaviewfieldgroup(IN prevMetaViewFieldGr
 	
 	  DECLARE isover INT DEFAULT 0;
 
+    DECLARE migr_table_name varchar(255) DEFAULT 'xwcmmetaviewfieldgroup';
+
     DECLARE  f_METAVIEWFIELDGROUPID int(11) DEFAULT NULL;
     DECLARE  f_GROUPNAME varchar(50) DEFAULT '0';
     DECLARE  f_METAVIEWID int(11) DEFAULT '0';
@@ -19,6 +21,8 @@ CREATE PROCEDURE sp_data_migration_xwcmmetaviewfieldgroup(IN prevMetaViewFieldGr
     DECLARE  f_GROUPORDER int(11) DEFAULT '0';
 
 
+
+
   DECLARE cur CURSOR FOR
 		SELECT
       METAVIEWFIELDGROUPID,
@@ -47,6 +51,13 @@ CREATE PROCEDURE sp_data_migration_xwcmmetaviewfieldgroup(IN prevMetaViewFieldGr
 
 
 
+    select concat('开始迁移 ', migr_table_name) info;
+
+    SET @log_sql = trs_data_migration.build_migration_log_sql(migr_table_name, 0);
+    prepare stmt from @log_sql;
+    EXECUTE stmt;
+    deallocate prepare stmt;
+
     WHILE isover= 0 DO
 
       # 断点续传
@@ -80,9 +91,9 @@ CREATE PROCEDURE sp_data_migration_xwcmmetaviewfieldgroup(IN prevMetaViewFieldGr
                   f_GROUPORDER
                 );
 
-          SET @sql = trs_data_migration.build_migration_log_sql('xwcmmetaviewfieldgroup', @METAVIEWFIELDGROUPID);
+          SET @log_sql = trs_data_migration.build_migration_log_sql(migr_table_name, @METAVIEWFIELDGROUPID);
 
-          prepare stmt from @sql;
+          prepare stmt from @log_sql;
           EXECUTE stmt;
           deallocate prepare stmt;
     END IF ;
@@ -101,11 +112,8 @@ CREATE PROCEDURE sp_data_migration_xwcmmetaviewfieldgroup(IN prevMetaViewFieldGr
 	
 	CLOSE cur;
 
-    SET @sql = trs_data_migration.build_migration_log_sql('xwcmmetaviewfieldgroup', -1);
+    select concat('完成迁移 ', migr_table_name) info;
 
-    prepare stmt from @sql;
-    EXECUTE stmt;
-    deallocate prepare stmt;
-		
-	END $$
+
+  END $$
 DELIMITER ;

TRS.WCM.Developer/贵州项目/3_sp_data_migration_xwcmtableinfo.sql

@@ -10,6 +10,8 @@ CREATE PROCEDURE sp_data_migration_xwcmtableinfo(IN citySuffix VARCHAR(20),
 	
 	  DECLARE isover INT DEFAULT 0;
 
+    DECLARE migr_table_name varchar(255) DEFAULT 'xwcmtableinfo';
+
     DECLARE  f_TABLEINFOID int(11) DEFAULT NULL;
     DECLARE  f_TABLENAME varchar(50) DEFAULT NULL;
     DECLARE  f_ANOTHERNAME varchar(100) DEFAULT NULL;
@@ -20,6 +22,8 @@ CREATE PROCEDURE sp_data_migration_xwcmtableinfo(IN citySuffix VARCHAR(20),
     DECLARE  f_OWNERID int(11) DEFAULT '4';
 
 
+
+
   DECLARE cur CURSOR FOR
 		SELECT
       TABLEINFOID,
@@ -50,6 +54,13 @@ CREATE PROCEDURE sp_data_migration_xwcmtableinfo(IN citySuffix VARCHAR(20),
 
 
 
+    select concat('开始迁移 ', migr_table_name) info;
+
+    SET @log_sql = trs_data_migration.build_migration_log_sql(migr_table_name, 0);
+    prepare stmt from @log_sql;
+    EXECUTE stmt;
+    deallocate prepare stmt;
+
     WHILE isover= 0 DO
 
       # 断点续传
@@ -83,9 +94,9 @@ CREATE PROCEDURE sp_data_migration_xwcmtableinfo(IN citySuffix VARCHAR(20),
                   f_OWNERID
                 );
 
-          SET @sql = trs_data_migration.build_migration_log_sql('xwcmtableinfo', @TABLEINFOID);
+          SET @log_sql = trs_data_migration.build_migration_log_sql(migr_table_name, @TABLEINFOID);
 
-          prepare stmt from @sql;
+          prepare stmt from @log_sql;
           EXECUTE stmt;
           deallocate prepare stmt;
     END IF ;
@@ -105,11 +116,8 @@ CREATE PROCEDURE sp_data_migration_xwcmtableinfo(IN citySuffix VARCHAR(20),
 	
 	CLOSE cur;
 
-    SET @sql = trs_data_migration.build_migration_log_sql('xwcmtableinfo', -1);
+    select concat('完成迁移 ', migr_table_name) info;
 
-    prepare stmt from @sql;
-    EXECUTE stmt;
-    deallocate prepare stmt;
-		
-	END $$
+
+  END $$
 DELIMITER ;

TRS.WCM.Developer/贵州项目/3_sp_data_migration_xwcmviewfieldinfo.sql

@@ -16,6 +16,9 @@ CREATE PROCEDURE sp_data_migration_xwcmviewfieldinfo(IN citySuffix VARCHAR(20),
 	
 	  DECLARE isover INT DEFAULT 0;
 
+
+    DECLARE migr_table_name varchar(255) DEFAULT 'xwcmviewfieldinfo';
+
     DECLARE  f_VIEWFIELDINFOID int(11) DEFAULT NULL;
     DECLARE  f_TABLENAME varchar(50) DEFAULT NULL;
     DECLARE  f_TABLEID int(11) DEFAULT '0';
@@ -60,6 +63,7 @@ CREATE PROCEDURE sp_data_migration_xwcmviewfieldinfo(IN citySuffix VARCHAR(20),
     DECLARE  f_ISONLYSITE varchar(10) DEFAULT NULL;
 
 
+
   DECLARE cur CURSOR FOR
 		SELECT
       VIEWFIELDINFOID,
@@ -157,6 +161,13 @@ CREATE PROCEDURE sp_data_migration_xwcmviewfieldinfo(IN citySuffix VARCHAR(20),
     ;
 
 
+    select concat('开始迁移 ', migr_table_name) info;
+
+    SET log_sql = trs_data_migration.build_migration_log_sql(migr_table_name, 0);
+    prepare stmt from log_sql;
+    EXECUTE stmt;
+    deallocate prepare stmt;
+
 
     WHILE isover= 0 DO
 
@@ -266,9 +277,9 @@ CREATE PROCEDURE sp_data_migration_xwcmviewfieldinfo(IN citySuffix VARCHAR(20),
                   f_ISONLYSITE
                 );
 
-          SET @sql = trs_data_migration.build_migration_log_sql('xwcmviewfieldinfo', @VIEWFIELDINFOID);
+          SET log_sql = trs_data_migration.build_migration_log_sql(migr_table_name, @VIEWFIELDINFOID);
 
-          prepare stmt from @sql;
+          prepare stmt from log_sql;
           EXECUTE stmt;
           deallocate prepare stmt;
     END IF ;
@@ -322,11 +333,9 @@ CREATE PROCEDURE sp_data_migration_xwcmviewfieldinfo(IN citySuffix VARCHAR(20),
 	
 	CLOSE cur;
 
-    SET @sql = trs_data_migration.build_migration_log_sql('xwcmviewfieldinfo', -1);
+    select concat('完成迁移 ', migr_table_name) info;
 
-    prepare stmt from @sql;
-    EXECUTE stmt;
-    deallocate prepare stmt;
-		
-	END $$
+
+
+  END $$
 DELIMITER ;

TRS.WCM.Developer/贵州项目/3_sp_data_migration_xwcmviewinfo.sql

@@ -11,6 +11,8 @@ CREATE PROCEDURE sp_data_migration_xwcmviewinfo(IN citySuffix VARCHAR(20),
 	
 	DECLARE isover INT DEFAULT 0;
 
+    DECLARE migr_table_name varchar(255) DEFAULT 'xwcmviewinfo';
+
     DECLARE  f_VIEWINFOID int(11) DEFAULT NULL;
     DECLARE  f_VIEWNAME varchar(100) DEFAULT NULL;
     DECLARE  f_VIEWDESC varchar(400) DEFAULT NULL;
@@ -32,6 +34,8 @@ CREATE PROCEDURE sp_data_migration_xwcmviewinfo(IN citySuffix VARCHAR(20),
     DECLARE  f_Attribute varchar(500) DEFAULT NULL;
 
 
+
+
   DECLARE cur CURSOR FOR
 		SELECT
       VIEWINFOID,
@@ -83,6 +87,13 @@ CREATE PROCEDURE sp_data_migration_xwcmviewinfo(IN citySuffix VARCHAR(20),
     ;
 
 
+    select concat('开始迁移 ', migr_table_name) info;
+
+    SET @log_sql = trs_data_migration.build_migration_log_sql(migr_table_name, 0);
+    prepare stmt from @log_sql;
+    EXECUTE stmt;
+    deallocate prepare stmt;
+
 
     WHILE isover= 0 DO
 
@@ -140,9 +151,9 @@ CREATE PROCEDURE sp_data_migration_xwcmviewinfo(IN citySuffix VARCHAR(20),
                   f_Attribute
                 );
 
-          SET @sql = trs_data_migration.build_migration_log_sql('xwcmviewinfo', @VIEWINFOID);
+          SET @log_sql = trs_data_migration.build_migration_log_sql(migr_table_name, @VIEWINFOID);
 
-          prepare stmt from @sql;
+          prepare stmt from @log_sql;
           EXECUTE stmt;
           deallocate prepare stmt;
     END IF ;
@@ -173,11 +184,9 @@ CREATE PROCEDURE sp_data_migration_xwcmviewinfo(IN citySuffix VARCHAR(20),
 	
 	CLOSE cur;
 
-    SET @sql = trs_data_migration.build_migration_log_sql('xwcmviewinfo', -1);
+    select concat('完成迁移 ', migr_table_name) info;
 
-    prepare stmt from @sql;
-    EXECUTE stmt;
-    deallocate prepare stmt;
-		
-	END $$
+
+
+  END $$
 DELIMITER ;

TRS.WCM.Developer/贵州项目/4_sp_city_n.sql

@@ -37,27 +37,32 @@ CREATE PROCEDURE sp_city_n(IN n INT)
 
 
     # xx ID 偏移量，为了和海云系统中的 xx ID 错开一段距离
-    SET @siteIdOffset = 1000 * @n;
-    SET @channelIdOffset = 100000 * @n;
-    SET @channelSynIdOffset = 100000 * @n;
-    SET @templateIdOffset = 100000 * @n;
-    SET @recIdOffset = 10000000 * @n;
-    SET @docIdOffset = 10000000 * @n;
-    SET @viewIdOffset = 1000 * @n;
-    SET @folderPublishConfigIdOffset = 100000 * @n;
-    SET @templateArgIdOffset = 100000 * @n;
-    SET @templateEmployIdOffset = 1000000 * @n;
-    SET @templateNestIdOffset = 100000 * @n;
-    SET @templateQuoteIdOffset = 1000000 * @n;
-    SET @classInfoIdOffset = 10000 * @n;
-    SET @fieldIdOffset = 100000 * @n;
-    SET @tableInfoIdOffset = 1000 * @n;
+    SET @siteIdOffset = 10000 * @n;
+    SET @viewIdOffset = 10000 * @n;
+    SET @tableInfoIdOffset = 10000 * @n;
+    SET @metaViewFieldGroupIdOffset = 10000 * @n;
+    SET @fieldGroupIdOffset = 10000 * @n;
+
+    SET @classInfoViewIdOffset = 100000 * @n;
+    SET @classInfoIdOffset = 100000 * @n;
+    SET @fieldIdOffset = 1000000 * @n;
     SET @metaViewEmployerIdOffset = 100000 * @n;
     SET @viewFieldIdOffset = 100000 * @n;
     SET @dbFieldIdOffset = 100000 * @n;
-    SET @fieldGroupIdOffset = 1000 * @n;
-    SET @metaViewFieldGroupIdOffset = 1000 * @n;
+
+    SET @channelIdOffset = 1000000 * @n;
+    SET @channelSynIdOffset = 1000000 * @n;
+    SET @templateIdOffset = 1000000 * @n;
+    SET @folderPublishConfigIdOffset = 1000000 * @n;
+    SET @templateArgIdOffset = 1000000 * @n;
+    SET @templateEmployIdOffset = 1000000 * @n;
+    SET @templateNestIdOffset = 1000000 * @n;
+    SET @templateQuoteIdOffset = 1000000 * @n;
+
     SET @appendixIdOffset = 10000000 * @n;
+    SET @recIdOffset = 10000000 * @n;
+    SET @docIdOffset = 10000000 * @n;
+
 
 
 
@@ -65,18 +70,18 @@ CREATE PROCEDURE sp_city_n(IN n INT)
     call sp_data_migration_wcmchannel(@prevChannelId, @siteIdOffset, @channelIdOffset);
     call sp_data_migration_wcmchannelchildindexquote(@templateIdOffset, @siteIdOffset, @channelIdOffset);
     call sp_data_migration_wcmchannelsyn(@prevChannelSynId, @channelSynIdOffset, @channelIdOffset);
-    call sp_data_migration_wcmchnldoc(@prevRecId, @recIdOffset, @prevDocId, @siteIdOffset, @channelIdOffset);
+    call sp_data_migration_wcmchnldoc(@prevRecId, @recIdOffset, @docIdOffset, @siteIdOffset, @channelIdOffset);
     call sp_data_migration_wcmdocument(@prevDocId, @prevDocId, @viewIdOffset, @siteIdOffset, @channelIdOffset);
     call sp_data_migration_wcmfolderpublishconfig(@prevFolderPublishConfigId, @folderPublishConfigIdOffset, @siteIdOffset, @channelIdOffset);
     call sp_data_migration_wcmtemplate(@prevTemplateId, @templateIdOffset, @siteIdOffset, @channelIdOffset);
-    call sp_data_migration_wcmtemplateargument(@prevTemplateArgId, @templateArgIdOffset, @siteIdOffset, @channelIdOffset);
+    call sp_data_migration_wcmtemplateargument(@prevTemplateArgId, @templateArgIdOffset, @templateIdOffset, @siteIdOffset, @channelIdOffset);
     call sp_data_migration_wcmtemplateemploy(@prevTemplateEmployId, @templateEmployIdOffset, @templateIdOffset, @siteIdOffset, @channelIdOffset);
     call sp_data_migration_wcmtemplatenest(@prevTemplateNestId, @templateNestIdOffset);
     call sp_data_migration_wcmtemplatequote(@prevTemplateQuoteId, @templateQuoteIdOffset, @templateIdOffset, @siteIdOffset, @channelIdOffset);
     call sp_data_migration_wcmwebsite(@prevSiteId, @siteIdOffset);
     call sp_data_migration_xwcmclassinfo(@prevClassInfoId, @classInfoIdOffset);
-    call sp_data_migration_xwcmclassinfoview(@prevClassInfoViewId, @classInfoIdOffset, @docIdOffset, @viewIdOffset);
-    call sp_data_migration_xwcmdbinfo(@citySuffix, @prevFieldId, @fieldIdOffset, @prevClassInfoId, @tableInfoIdOffset);
+    call sp_data_migration_xwcmclassinfoview(@prevClassInfoViewId, @classInfoViewIdOffset, @classInfoIdOffset, @docIdOffset, @viewIdOffset);
+    call sp_data_migration_xwcmdbfieldinfo(@citySuffix, @prevFieldId, @fieldIdOffset, @prevClassInfoId, @tableInfoIdOffset);
     call sp_data_migration_xwcmmetaviewemployer(@prevMetaViewEmployerId, @metaViewEmployerIdOffset, @channelIdOffset);
     call sp_data_migration_xwcmmetaviewfieldgroup(@prevMetaViewFieldGroupId, @metaViewFieldGroupIdOffset, @viewIdOffset);
     call sp_data_migration_xwcmtableinfo(@citySuffix, @prevTableInfoId, @tableInfoIdOffset);
@@ -86,5 +91,17 @@ CREATE PROCEDURE sp_city_n(IN n INT)
 
 
 
+    # 迁移 MAS 视频，6个wcm节点的视频是在一起的。可重复执行。
+
+    # 支持断点续传，上一次迁移的最后一个 xx ID
+    SET @prevMasId = ifnull((SELECT prev_id from trs_data_migration.data_migration_log where table_name = 'mas_masid'), 0);
+    SET @prevMasVideoId = ifnull((SELECT prev_id from trs_data_migration.data_migration_log where table_name = 'mas_masvideo'), 0);
+
+    SET @masIdOffset = 1000000;
+    SET @masVideoIdOffset = 1000000;
+
+    call trs_data_migration.sp_data_migration_masid(@prevMasId, @masIdOffset);
+    call trs_data_migration.sp_data_migration_masvideo(@prevMasVideoId, @masVideoIdOffset);
+
   END $$
 DELIMITER ;

TRS.WCM.Developer/贵州项目/5_caller.sql

@@ -20,16 +20,3 @@ CALL trs_data_migration.sp_city_n(1);
 # 迁移第6个wcm节点
 #CALL trs_data_migration.sp_city_n(6);
 
-
-
-# 迁移 MAS 视频，6个wcm节点的视频是在一起的
-
-# 支持断点续传，上一次迁移的最后一个 xx ID
-SET @prevMasId = ifnull((SELECT prev_id from trs_data_migration.data_migration_log where table_name = 'mas_masid'), 0);
-SET @prevMasVideoId = ifnull((SELECT prev_id from trs_data_migration.data_migration_log where table_name = 'mas_masvideo'), 0);
-
-SET @masIdOffset = 100000;
-SET @masVideoIdOffset = 100000;
-
-call trs_data_migration.sp_data_migration_masid(@prevMasId, @masIdOffset);
-call trs_data_migration.sp_data_migration_masvideo(@prevMasVideoId, @masVideoIdOffset);