Parcourir la source

数据迁移的存储过程[13][支持断点续迁]

lin.chen il y a 7 ans
Parent
commit
331b926e6e
31 fichiers modifiés avec 387 ajouts et 151 suppressions
  1. 35 0
      TRS.WCM.Developer/贵州项目/sp/1.sql
  2. 2 2
      TRS.WCM.Developer/贵州项目/sp/call_p_city1.sql
  3. 2 2
      TRS.WCM.Developer/贵州项目/sp/call_p_city2.sql
  4. 2 2
      TRS.WCM.Developer/贵州项目/sp/call_p_city3.sql
  5. 2 2
      TRS.WCM.Developer/贵州项目/sp/call_p_city4.sql
  6. 2 2
      TRS.WCM.Developer/贵州项目/sp/call_p_city5.sql
  7. 2 2
      TRS.WCM.Developer/贵州项目/sp/call_p_city6.sql
  8. 99 90
      TRS.WCM.Developer/贵州项目/sp/p_data_migration_masid.sql
  9. 11 2
      TRS.WCM.Developer/贵州项目/sp/p_data_migration_masvideo.sql
  10. 10 2
      TRS.WCM.Developer/贵州项目/sp/p_data_migration_wcmappendix.sql
  11. 10 2
      TRS.WCM.Developer/贵州项目/sp/p_data_migration_wcmchannel.sql
  12. 5 1
      TRS.WCM.Developer/贵州项目/sp/p_data_migration_wcmchannelchildindexquote.sql
  13. 10 2
      TRS.WCM.Developer/贵州项目/sp/p_data_migration_wcmchannelsyn.sql
  14. 10 2
      TRS.WCM.Developer/贵州项目/sp/p_data_migration_wcmchnldoc.sql
  15. 11 2
      TRS.WCM.Developer/贵州项目/sp/p_data_migration_wcmdocument.sql
  16. 11 2
      TRS.WCM.Developer/贵州项目/sp/p_data_migration_wcmfolderpublishconfig.sql
  17. 11 2
      TRS.WCM.Developer/贵州项目/sp/p_data_migration_wcmmetatable.sql
  18. 11 2
      TRS.WCM.Developer/贵州项目/sp/p_data_migration_wcmtemplate.sql
  19. 11 2
      TRS.WCM.Developer/贵州项目/sp/p_data_migration_wcmtemplateargument.sql
  20. 15 5
      TRS.WCM.Developer/贵州项目/sp/p_data_migration_wcmtemplateemploy.sql
  21. 11 2
      TRS.WCM.Developer/贵州项目/sp/p_data_migration_wcmtemplatenest.sql
  22. 13 3
      TRS.WCM.Developer/贵州项目/sp/p_data_migration_wcmtemplatequote.sql
  23. 11 2
      TRS.WCM.Developer/贵州项目/sp/p_data_migration_wcmwebsite.sql
  24. 10 2
      TRS.WCM.Developer/贵州项目/sp/p_data_migration_xwcmclassinfo.sql
  25. 10 2
      TRS.WCM.Developer/贵州项目/sp/p_data_migration_xwcmclassinfoview.sql
  26. 10 2
      TRS.WCM.Developer/贵州项目/sp/p_data_migration_xwcmdbinfo.sql
  27. 10 2
      TRS.WCM.Developer/贵州项目/sp/p_data_migration_xwcmmetaviewemployer.sql
  28. 10 2
      TRS.WCM.Developer/贵州项目/sp/p_data_migration_xwcmmetaviewfieldgroup.sql
  29. 10 2
      TRS.WCM.Developer/贵州项目/sp/p_data_migration_xwcmtableinfo.sql
  30. 10 2
      TRS.WCM.Developer/贵州项目/sp/p_data_migration_xwcmviewfieldinfo.sql
  31. 10 2
      TRS.WCM.Developer/贵州项目/sp/p_data_migration_xwcmviewinfo.sql

+ 35 - 0
TRS.WCM.Developer/贵州项目/sp/1.sql

@@ -0,0 +1,35 @@
+
+CREATE DATABASE trs_data_migration;
+
+USE trs_data_migration;
+
+CREATE TABLE data_migration_log(
+  table_name VARCHAR(100) NOT NULL COMMENT '迁移的表名',
+  prev_id BIGINT(20) NOT NULL COMMENT '上一条数据ID,-1 表示迁移完毕',
+  PRIMARY KEY (table_name)
+);
+
+
+
+
+
+SET GLOBAL log_bin_trust_function_creators = TRUE;
+DROP FUNCTION IF EXISTS build_migration_log_sql;
+DELIMITER $$
+CREATE FUNCTION build_migration_log_sql(table_name VARCHAR(100), id BIGINT(20))
+  RETURNS VARCHAR(255)
+  BEGIN
+    DECLARE x VARCHAR(255) DEFAULT '';
+    SET x =  concat('insert into ',
+                    'trs_data_migration.data_migration_log (',
+                    'table_name, ',
+                    'prev_id',
+                    ') ',
+                    'values(',
+                    '\'', table_name, '\',',
+                    id,
+                    ') ',
+                    'on duplicate key update ',
+                    'prev_id = ', id);
+    RETURN x;
+  END $$

+ 2 - 2
TRS.WCM.Developer/贵州项目/sp/call_p_city1.sql

@@ -72,9 +72,9 @@ call p_data_migration_wcmdocument(@prevDocId, @prevDocId, @viewIdOffset, @siteId
 call p_data_migration_wcmfolderpublishconfig(@prevFolderPublishConfigId, @folderPublishConfigIdOffset, @siteIdOffset, @channelIdOffset);
 call p_data_migration_wcmtemplate(@prevTemplateId, @templateIdOffset, @siteIdOffset, @channelIdOffset);
 call p_data_migration_wcmtemplateargument(@prevTemplateArgId, @templateArgIdOffset, @siteIdOffset, @channelIdOffset);
-call p_data_migration_wcmtemplateemploy(@prevTemplateEmployId, @templateEmployIdOffset, @siteIdOffset, @channelIdOffset);
+call p_data_migration_wcmtemplateemploy(@prevTemplateEmployId, @templateEmployIdOffset, @templateIdOffset, @siteIdOffset, @channelIdOffset);
 call p_data_migration_wcmtemplatenest(@prevTemplateNestId, @templateNestIdOffset);
-call p_data_migration_wcmtemplatequote(@prevTemplateQuoteId, @templateQuoteIdOffset, @siteIdOffset, @channelIdOffset);
+call p_data_migration_wcmtemplatequote(@prevTemplateQuoteId, @templateQuoteIdOffset, @templateIdOffset, @siteIdOffset, @channelIdOffset);
 call p_data_migration_wcmwebsite(@prevSiteId, @siteIdOffset);
 call p_data_migration_xwcmclassinfo(@prevClassInfoId, @classInfoIdOffset);
 call p_data_migration_xwcmclassinfoview(@prevClassInfoViewId, @classInfoIdOffset, @docIdOffset, @viewIdOffset);

+ 2 - 2
TRS.WCM.Developer/贵州项目/sp/call_p_city2.sql

@@ -72,9 +72,9 @@ call p_data_migration_wcmdocument(@prevDocId, @prevDocId, @viewIdOffset, @siteId
 call p_data_migration_wcmfolderpublishconfig(@prevFolderPublishConfigId, @folderPublishConfigIdOffset, @siteIdOffset, @channelIdOffset);
 call p_data_migration_wcmtemplate(@prevTemplateId, @templateIdOffset, @siteIdOffset, @channelIdOffset);
 call p_data_migration_wcmtemplateargument(@prevTemplateArgId, @templateArgIdOffset, @siteIdOffset, @channelIdOffset);
-call p_data_migration_wcmtemplateemploy(@prevTemplateEmployId, @templateEmployIdOffset, @siteIdOffset, @channelIdOffset);
+call p_data_migration_wcmtemplateemploy(@prevTemplateEmployId, @templateEmployIdOffset, @templateIdOffset, @siteIdOffset, @channelIdOffset);
 call p_data_migration_wcmtemplatenest(@prevTemplateNestId, @templateNestIdOffset);
-call p_data_migration_wcmtemplatequote(@prevTemplateQuoteId, @templateQuoteIdOffset, @siteIdOffset, @channelIdOffset);
+call p_data_migration_wcmtemplatequote(@prevTemplateQuoteId, @templateQuoteIdOffset, @templateIdOffset, @siteIdOffset, @channelIdOffset);
 call p_data_migration_wcmwebsite(@prevSiteId, @siteIdOffset);
 call p_data_migration_xwcmclassinfo(@prevClassInfoId, @classInfoIdOffset);
 call p_data_migration_xwcmclassinfoview(@prevClassInfoViewId, @classInfoIdOffset, @docIdOffset, @viewIdOffset);

+ 2 - 2
TRS.WCM.Developer/贵州项目/sp/call_p_city3.sql

@@ -72,9 +72,9 @@ call p_data_migration_wcmdocument(@prevDocId, @prevDocId, @viewIdOffset, @siteId
 call p_data_migration_wcmfolderpublishconfig(@prevFolderPublishConfigId, @folderPublishConfigIdOffset, @siteIdOffset, @channelIdOffset);
 call p_data_migration_wcmtemplate(@prevTemplateId, @templateIdOffset, @siteIdOffset, @channelIdOffset);
 call p_data_migration_wcmtemplateargument(@prevTemplateArgId, @templateArgIdOffset, @siteIdOffset, @channelIdOffset);
-call p_data_migration_wcmtemplateemploy(@prevTemplateEmployId, @templateEmployIdOffset, @siteIdOffset, @channelIdOffset);
+call p_data_migration_wcmtemplateemploy(@prevTemplateEmployId, @templateEmployIdOffset, @templateIdOffset, @siteIdOffset, @channelIdOffset);
 call p_data_migration_wcmtemplatenest(@prevTemplateNestId, @templateNestIdOffset);
-call p_data_migration_wcmtemplatequote(@prevTemplateQuoteId, @templateQuoteIdOffset, @siteIdOffset, @channelIdOffset);
+call p_data_migration_wcmtemplatequote(@prevTemplateQuoteId, @templateQuoteIdOffset, @templateIdOffset, @siteIdOffset, @channelIdOffset);
 call p_data_migration_wcmwebsite(@prevSiteId, @siteIdOffset);
 call p_data_migration_xwcmclassinfo(@prevClassInfoId, @classInfoIdOffset);
 call p_data_migration_xwcmclassinfoview(@prevClassInfoViewId, @classInfoIdOffset, @docIdOffset, @viewIdOffset);

+ 2 - 2
TRS.WCM.Developer/贵州项目/sp/call_p_city4.sql

@@ -72,9 +72,9 @@ call p_data_migration_wcmdocument(@prevDocId, @prevDocId, @viewIdOffset, @siteId
 call p_data_migration_wcmfolderpublishconfig(@prevFolderPublishConfigId, @folderPublishConfigIdOffset, @siteIdOffset, @channelIdOffset);
 call p_data_migration_wcmtemplate(@prevTemplateId, @templateIdOffset, @siteIdOffset, @channelIdOffset);
 call p_data_migration_wcmtemplateargument(@prevTemplateArgId, @templateArgIdOffset, @siteIdOffset, @channelIdOffset);
-call p_data_migration_wcmtemplateemploy(@prevTemplateEmployId, @templateEmployIdOffset, @siteIdOffset, @channelIdOffset);
+call p_data_migration_wcmtemplateemploy(@prevTemplateEmployId, @templateEmployIdOffset, @templateIdOffset, @siteIdOffset, @channelIdOffset);
 call p_data_migration_wcmtemplatenest(@prevTemplateNestId, @templateNestIdOffset);
-call p_data_migration_wcmtemplatequote(@prevTemplateQuoteId, @templateQuoteIdOffset, @siteIdOffset, @channelIdOffset);
+call p_data_migration_wcmtemplatequote(@prevTemplateQuoteId, @templateQuoteIdOffset, @templateIdOffset, @siteIdOffset, @channelIdOffset);
 call p_data_migration_wcmwebsite(@prevSiteId, @siteIdOffset);
 call p_data_migration_xwcmclassinfo(@prevClassInfoId, @classInfoIdOffset);
 call p_data_migration_xwcmclassinfoview(@prevClassInfoViewId, @classInfoIdOffset, @docIdOffset, @viewIdOffset);

+ 2 - 2
TRS.WCM.Developer/贵州项目/sp/call_p_city5.sql

@@ -72,9 +72,9 @@ call p_data_migration_wcmdocument(@prevDocId, @prevDocId, @viewIdOffset, @siteId
 call p_data_migration_wcmfolderpublishconfig(@prevFolderPublishConfigId, @folderPublishConfigIdOffset, @siteIdOffset, @channelIdOffset);
 call p_data_migration_wcmtemplate(@prevTemplateId, @templateIdOffset, @siteIdOffset, @channelIdOffset);
 call p_data_migration_wcmtemplateargument(@prevTemplateArgId, @templateArgIdOffset, @siteIdOffset, @channelIdOffset);
-call p_data_migration_wcmtemplateemploy(@prevTemplateEmployId, @templateEmployIdOffset, @siteIdOffset, @channelIdOffset);
+call p_data_migration_wcmtemplateemploy(@prevTemplateEmployId, @templateEmployIdOffset, @templateIdOffset, @siteIdOffset, @channelIdOffset);
 call p_data_migration_wcmtemplatenest(@prevTemplateNestId, @templateNestIdOffset);
-call p_data_migration_wcmtemplatequote(@prevTemplateQuoteId, @templateQuoteIdOffset, @siteIdOffset, @channelIdOffset);
+call p_data_migration_wcmtemplatequote(@prevTemplateQuoteId, @templateQuoteIdOffset, @templateIdOffset, @siteIdOffset, @channelIdOffset);
 call p_data_migration_wcmwebsite(@prevSiteId, @siteIdOffset);
 call p_data_migration_xwcmclassinfo(@prevClassInfoId, @classInfoIdOffset);
 call p_data_migration_xwcmclassinfoview(@prevClassInfoViewId, @classInfoIdOffset, @docIdOffset, @viewIdOffset);

+ 2 - 2
TRS.WCM.Developer/贵州项目/sp/call_p_city6.sql

@@ -72,9 +72,9 @@ call p_data_migration_wcmdocument(@prevDocId, @prevDocId, @viewIdOffset, @siteId
 call p_data_migration_wcmfolderpublishconfig(@prevFolderPublishConfigId, @folderPublishConfigIdOffset, @siteIdOffset, @channelIdOffset);
 call p_data_migration_wcmtemplate(@prevTemplateId, @templateIdOffset, @siteIdOffset, @channelIdOffset);
 call p_data_migration_wcmtemplateargument(@prevTemplateArgId, @templateArgIdOffset, @siteIdOffset, @channelIdOffset);
-call p_data_migration_wcmtemplateemploy(@prevTemplateEmployId, @templateEmployIdOffset, @siteIdOffset, @channelIdOffset);
+call p_data_migration_wcmtemplateemploy(@prevTemplateEmployId, @templateEmployIdOffset, @templateIdOffset, @siteIdOffset, @channelIdOffset);
 call p_data_migration_wcmtemplatenest(@prevTemplateNestId, @templateNestIdOffset);
-call p_data_migration_wcmtemplatequote(@prevTemplateQuoteId, @templateQuoteIdOffset, @siteIdOffset, @channelIdOffset);
+call p_data_migration_wcmtemplatequote(@prevTemplateQuoteId, @templateQuoteIdOffset, @templateIdOffset, @siteIdOffset, @channelIdOffset);
 call p_data_migration_wcmwebsite(@prevSiteId, @siteIdOffset);
 call p_data_migration_xwcmclassinfo(@prevClassInfoId, @classInfoIdOffset);
 call p_data_migration_xwcmclassinfoview(@prevClassInfoViewId, @classInfoIdOffset, @docIdOffset, @viewIdOffset);

+ 99 - 90
TRS.WCM.Developer/贵州项目/sp/p_data_migration_masid.sql

@@ -7,90 +7,38 @@ CREATE PROCEDURE p_data_migration_masid(IN prevMasId BIGINT(20),
                                               IN masIdOffset BIGINT(20))
 	BEGIN 
 	
-	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 cur CURSOR FOR
-		SELECT
-      ID,
-      CREATEDTIME,
-      CREATEDUSER,
-      CREATEDUSERID,
-      CREATEDUSERNICKNAME,
-      LASTMODIFIEDTIME,
-      LASTMODIFIEDUSER,
-      LASTMODIFIEDUSERID,
-      srcObjType
-    FROM v_mas.mas_masid
-		ORDER BY ID asc;
-
-	DECLARE CONTINUE HANDLER FOR NOT FOUND SET isover = 1;
-	
-	OPEN cur;
-	
-	FETCH cur INTO
-    f_ID,
-    f_CREATEDTIME,
-    f_CREATEDUSER,
-    f_CREATEDUSERID,
-    f_CREATEDUSERNICKNAME,
-    f_LASTMODIFIEDTIME,
-    f_LASTMODIFIEDUSER,
-    f_LASTMODIFIEDUSERID,
-    f_srcObjType
-    ;
-
-
-
-    WHILE isover= 0 DO
-
-      # 断点续传
-      IF (f_ID > prevMasId)
-
-        THEN
-
-            SET @ID = f_ID;
-            SET f_ID = f_ID + masIdOffset;
-
-            insert into trs_mas.mas_masid
-              (
-                ID,
-                CREATEDTIME,
-                CREATEDUSER,
-                CREATEDUSERID,
-                CREATEDUSERNICKNAME,
-                LASTMODIFIEDTIME,
-                LASTMODIFIEDUSER,
-                LASTMODIFIEDUSERID,
-                srcObjType
-              )
-              VALUES
-                (
-                  f_ID,
-                  f_CREATEDTIME,
-                  f_CREATEDUSER,
-                  f_CREATEDUSERID,
-                  f_CREATEDUSERNICKNAME,
-                  f_LASTMODIFIEDTIME,
-                  f_LASTMODIFIEDUSER,
-                  f_LASTMODIFIEDUSERID,
-                  f_srcObjType
-                );
-
-            SELECT CONCAT('成功迁移 mas_masid[ID=', @ID, ']') ;
-    END IF ;
-
-		FETCH cur INTO
+    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 cur CURSOR FOR
+      SELECT
+        ID,
+        CREATEDTIME,
+        CREATEDUSER,
+        CREATEDUSERID,
+        CREATEDUSERNICKNAME,
+        LASTMODIFIEDTIME,
+        LASTMODIFIEDUSER,
+        LASTMODIFIEDUSERID,
+        srcObjType
+      FROM v_mas.mas_masid
+      ORDER BY ID asc;
+
+    DECLARE CONTINUE HANDLER FOR NOT FOUND SET isover = 1;
+
+    OPEN cur;
+
+    FETCH cur INTO
       f_ID,
       f_CREATEDTIME,
       f_CREATEDUSER,
@@ -101,12 +49,73 @@ CREATE PROCEDURE p_data_migration_masid(IN prevMasId BIGINT(20),
       f_LASTMODIFIEDUSERID,
       f_srcObjType
       ;
-		
-	END WHILE;
-	
-	CLOSE cur;
 
-  SELECT '迁移 mas_masid 完毕';
-		
+
+
+      WHILE isover= 0 DO
+
+        # 断点续传
+        IF (f_ID > prevMasId)
+
+          THEN
+
+              SET @ID = f_ID;
+              SET f_ID = f_ID + masIdOffset;
+
+              insert into trs_mas.mas_masid
+                (
+                  ID,
+                  CREATEDTIME,
+                  CREATEDUSER,
+                  CREATEDUSERID,
+                  CREATEDUSERNICKNAME,
+                  LASTMODIFIEDTIME,
+                  LASTMODIFIEDUSER,
+                  LASTMODIFIEDUSERID,
+                  srcObjType
+                )
+                VALUES
+                  (
+                    f_ID,
+                    f_CREATEDTIME,
+                    f_CREATEDUSER,
+                    f_CREATEDUSERID,
+                    f_CREATEDUSERNICKNAME,
+                    f_LASTMODIFIEDTIME,
+                    f_LASTMODIFIEDUSER,
+                    f_LASTMODIFIEDUSERID,
+                    f_srcObjType
+                  );
+
+            SET @sql = trs_data_migration.build_migration_log_sql('mas_masid', @ID);
+
+            prepare stmt from @sql;
+            EXECUTE stmt;
+            deallocate prepare stmt;
+
+      END IF ;
+
+      FETCH cur INTO
+        f_ID,
+        f_CREATEDTIME,
+        f_CREATEDUSER,
+        f_CREATEDUSERID,
+        f_CREATEDUSERNICKNAME,
+        f_LASTMODIFIEDTIME,
+        f_LASTMODIFIEDUSER,
+        f_LASTMODIFIEDUSERID,
+        f_srcObjType
+        ;
+
+    END WHILE;
+
+    CLOSE cur;
+
+    SET @sql = trs_data_migration.build_migration_log_sql('mas_masid', -1);
+
+    prepare stmt from @sql;
+    EXECUTE stmt;
+    deallocate prepare stmt;
+
 	END $$
 DELIMITER ;

+ 11 - 2
TRS.WCM.Developer/贵州项目/sp/p_data_migration_masvideo.sql

@@ -542,7 +542,12 @@ CREATE PROCEDURE p_data_migration_masvideo(IN prevMasId BIGINT(20),
                   f_YEAR
                 );
 
-            SELECT CONCAT('成功迁移 mas_masvideo[ID=', @ID, ']') ;
+          SET @sql = trs_data_migration.build_migration_log_sql('mas_masvideo', @ID);
+
+          prepare stmt from @sql;
+          EXECUTE stmt;
+          deallocate prepare stmt;
+
     END IF ;
 
 		FETCH cur INTO
@@ -652,7 +657,11 @@ CREATE PROCEDURE p_data_migration_masvideo(IN prevMasId BIGINT(20),
 	
 	CLOSE cur;
 
-  SELECT '迁移 mas_masvideo 完毕';
+    SET @sql = trs_data_migration.build_migration_log_sql('mas_masvideo', -1);
+
+    prepare stmt from @sql;
+    EXECUTE stmt;
+    deallocate prepare stmt;
 		
 	END $$
 DELIMITER ;

+ 10 - 2
TRS.WCM.Developer/贵州项目/sp/p_data_migration_wcmappendix.sql

@@ -170,7 +170,11 @@ CREATE PROCEDURE p_data_migration_wcmappendix(IN prevAppendixId BIGINT(20),
                   f_AppFromId
                 );
 
-            SELECT CONCAT('成功迁移 wcmappendix[APPENDIXID=', @APPENDIXID, ']') ;
+          SET @sql = trs_data_migration.build_migration_log_sql('wcmappendix', @APPENDIXID);
+
+          prepare stmt from @sql;
+          EXECUTE stmt;
+          deallocate prepare stmt;
     END IF ;
 
 		FETCH cur INTO
@@ -205,7 +209,11 @@ CREATE PROCEDURE p_data_migration_wcmappendix(IN prevAppendixId BIGINT(20),
 	
 	CLOSE cur;
 
-  SELECT '迁移 wcmappendix 完毕';
+    SET @sql = trs_data_migration.build_migration_log_sql('wcmappendix', -1);
+
+    prepare stmt from @sql;
+    EXECUTE stmt;
+    deallocate prepare stmt;
 		
 	END $$
 DELIMITER ;

+ 10 - 2
TRS.WCM.Developer/贵州项目/sp/p_data_migration_wcmchannel.sql

@@ -295,7 +295,11 @@ CREATE PROCEDURE p_data_migration_wcmchannel(IN prevChnlId BIGINT(20),
                   f_CHNLDESCPINYIN
                 );
 
-            SELECT CONCAT('成功迁移 wcmchannel[CHANNELID=', @CHANNELID, ']') ;
+          SET @sql = trs_data_migration.build_migration_log_sql('wcmchannel', @CHANNELID);
+
+          prepare stmt from @sql;
+          EXECUTE stmt;
+          deallocate prepare stmt;
     END IF ;
 
 		FETCH cur INTO
@@ -355,7 +359,11 @@ CREATE PROCEDURE p_data_migration_wcmchannel(IN prevChnlId BIGINT(20),
 	
 	CLOSE cur;
 
-  SELECT '迁移 wcmchannel 完毕';
+    SET @sql = trs_data_migration.build_migration_log_sql('wcmchannel', -1);
+
+    prepare stmt from @sql;
+    EXECUTE stmt;
+    deallocate prepare stmt;
 		
 	END $$
 DELIMITER ;

+ 5 - 1
TRS.WCM.Developer/贵州项目/sp/p_data_migration_wcmchannelchildindexquote.sql

@@ -80,7 +80,11 @@ CREATE PROCEDURE p_data_migration_wcmchannelchildindexquote(IN templateIdOffset
 	
 	CLOSE cur;
 
-  SELECT '迁移 wcmchannelchildindexquote 完毕';
+    SET @sql = trs_data_migration.build_migration_log_sql('wcmchannelchildindexquote', -1);
+
+    prepare stmt from @sql;
+    EXECUTE stmt;
+    deallocate prepare stmt;
 		
 	END $$
 DELIMITER ;

+ 10 - 2
TRS.WCM.Developer/贵州项目/sp/p_data_migration_wcmchannelsyn.sql

@@ -112,7 +112,11 @@ CREATE PROCEDURE p_data_migration_wcmchannelsyn(IN prevChannelSynId BIGINT(20),
               f_CLASSINFOIDS
             );
 
-          SELECT CONCAT('成功迁移 wcmchannelsyn[CHANNELSYNID=', @CHANNELSYNID, ']') ;
+          SET @sql = trs_data_migration.build_migration_log_sql('wcmchannelsyn', @CHANNELSYNID);
+
+          prepare stmt from @sql;
+          EXECUTE stmt;
+          deallocate prepare stmt;
     END IF ;
 
 		FETCH cur INTO
@@ -135,7 +139,11 @@ CREATE PROCEDURE p_data_migration_wcmchannelsyn(IN prevChannelSynId BIGINT(20),
 	
 	CLOSE cur;
 
-  SELECT '迁移 wcmchannelsyn 完毕';
+    SET @sql = trs_data_migration.build_migration_log_sql('wcmchannelsyn', -1);
+
+    prepare stmt from @sql;
+    EXECUTE stmt;
+    deallocate prepare stmt;
 		
 	END $$
 DELIMITER ;

+ 10 - 2
TRS.WCM.Developer/贵州项目/sp/p_data_migration_wcmchnldoc.sql

@@ -249,7 +249,11 @@ CREATE PROCEDURE p_data_migration_wcmchnldoc(IN prevRecId BIGINT(20),
               f_ACTIONUSER
             );
 
-          SELECT CONCAT('成功迁移 wcmchnldoc[RECID=', @RECID, ']') ;
+          SET @sql = trs_data_migration.build_migration_log_sql('wcmchnldoc', @RECID);
+
+          prepare stmt from @sql;
+          EXECUTE stmt;
+          deallocate prepare stmt;
     END IF ;
 
 		FETCH cur INTO
@@ -299,7 +303,11 @@ CREATE PROCEDURE p_data_migration_wcmchnldoc(IN prevRecId BIGINT(20),
 	
 	CLOSE cur;
 
-  SELECT '迁移 wcmchnldoc 完毕';
+    SET @sql = trs_data_migration.build_migration_log_sql('wcmchnldoc', -1);
+
+    prepare stmt from @sql;
+    EXECUTE stmt;
+    deallocate prepare stmt;
 		
 	END $$
 DELIMITER ;

+ 11 - 2
TRS.WCM.Developer/贵州项目/sp/p_data_migration_wcmdocument.sql

@@ -281,6 +281,7 @@ CREATE PROCEDURE p_data_migration_wcmdocument(IN prevDocId BIGINT(20),
         THEN
           # 迁移后的数据,ID增加某一特定的值
           # 文档ID
+          SET @DOCID = f_DOCID;
           SET f_DOCID = f_DOCID + docIdOffset;
           # 栏目ID
           SET f_DOCCHANNEL = f_DOCCHANNEL + channelIdOffset;
@@ -460,7 +461,11 @@ CREATE PROCEDURE p_data_migration_wcmdocument(IN prevDocId BIGINT(20),
                 f_OriginDocId
                 );
 
-            SELECT CONCAT('成功迁移 wcmdocument[docid=', f_DOCID, ']') ;
+          SET @sql = trs_data_migration.build_migration_log_sql('wcmdocument', @DOCID);
+
+          prepare stmt from @sql;
+          EXECUTE stmt;
+          deallocate prepare stmt;
     END IF ;
 
 		FETCH cur_doc INTO
@@ -551,7 +556,11 @@ CREATE PROCEDURE p_data_migration_wcmdocument(IN prevDocId BIGINT(20),
 	
 	CLOSE cur_doc;
 
-  SELECT '迁移 wcmdocument 完毕';
+    SET @sql = trs_data_migration.build_migration_log_sql('wcmdocument', -1);
+
+    prepare stmt from @sql;
+    EXECUTE stmt;
+    deallocate prepare stmt;
 		
 	END $$
 DELIMITER ;

+ 11 - 2
TRS.WCM.Developer/贵州项目/sp/p_data_migration_wcmfolderpublishconfig.sql

@@ -67,6 +67,7 @@ CREATE PROCEDURE p_data_migration_wcmfolderpublishconfig(IN prevFolderPublishCon
 
         THEN
 
+            SET @FOLDERPUBLISHCONFIGID = f_FOLDERPUBLISHCONFIGID;
             SET f_FOLDERPUBLISHCONFIGID = f_FOLDERPUBLISHCONFIGID + folderPublishConfigIdOffset;
 
             IF (f_FOLDERTYPE = 103)
@@ -107,7 +108,11 @@ CREATE PROCEDURE p_data_migration_wcmfolderpublishconfig(IN prevFolderPublishCon
                   f_PAGEENCODING
                 );
 
-            SELECT CONCAT('成功迁移 wcmfolderpublishconfig[FOLDERPUBLISHCONFIGID=', f_FOLDERPUBLISHCONFIGID, ']') ;
+          SET @sql = trs_data_migration.build_migration_log_sql('wcmfolderpublishconfig', @FOLDERPUBLISHCONFIGID);
+
+          prepare stmt from @sql;
+          EXECUTE stmt;
+          deallocate prepare stmt;
     END IF ;
 
 		FETCH cur INTO
@@ -128,7 +133,11 @@ CREATE PROCEDURE p_data_migration_wcmfolderpublishconfig(IN prevFolderPublishCon
 	
 	CLOSE cur;
 
-  SELECT '迁移 wcmfolderpublishconfig 完毕';
+    SET @sql = trs_data_migration.build_migration_log_sql('wcmfolderpublishconfig', -1);
+
+    prepare stmt from @sql;
+    EXECUTE stmt;
+    deallocate prepare stmt;
 		
 	END $$
 DELIMITER ;

+ 11 - 2
TRS.WCM.Developer/贵州项目/sp/p_data_migration_wcmmetatable.sql

@@ -50,7 +50,12 @@ CREATE PROCEDURE p_data_migration_wcmmetatable(IN prevTableInfoId VARCHAR(100),
         EXECUTE stmt;
         deallocate prepare stmt;
 
-        SELECT CONCAT('成功升级 wcmmetatable', f_TABLENAME, ' 的MetaDataId和ChannelId') ;
+        SET @sql = trs_data_migration.build_migration_log_sql(concat('wcmmetatable', f_TABLENAME), -1);
+
+        prepare stmt from @sql;
+        EXECUTE stmt;
+        deallocate prepare stmt;
+
 
       END IF ;
 
@@ -63,7 +68,11 @@ CREATE PROCEDURE p_data_migration_wcmmetatable(IN prevTableInfoId VARCHAR(100),
 
     CLOSE cur;
 
-    SELECT concat('升级 wcmmetatable', f_TABLENAME, ' 完毕');
+    SET @sql = trs_data_migration.build_migration_log_sql('wcmmetatable_alltables', -1);
+
+    prepare stmt from @sql;
+    EXECUTE stmt;
+    deallocate prepare stmt;
 
 	END $$
 DELIMITER ;

+ 11 - 2
TRS.WCM.Developer/贵州项目/sp/p_data_migration_wcmtemplate.sql

@@ -94,6 +94,7 @@ CREATE PROCEDURE p_data_migration_wcmtemplate(IN prevTemplateId BIGINT(20),
 
         THEN
 
+            SET @TEMPID = f_TEMPID;
             SET f_TEMPID = f_TEMPID + templateIdOffset;
 
             IF (f_FOLDERTYPE = 103)
@@ -160,7 +161,11 @@ CREATE PROCEDURE p_data_migration_wcmtemplate(IN prevTemplateId BIGINT(20),
                   f_VISUAL
                 );
 
-            SELECT CONCAT('成功迁移 wcmtemplate[TEMPID=', f_TEMPID, ']') ;
+          SET @sql = trs_data_migration.build_migration_log_sql('wcmtemplate', @TEMPID);
+
+          prepare stmt from @sql;
+          EXECUTE stmt;
+          deallocate prepare stmt;
     END IF ;
 
 		FETCH cur INTO
@@ -190,7 +195,11 @@ CREATE PROCEDURE p_data_migration_wcmtemplate(IN prevTemplateId BIGINT(20),
 	
 	CLOSE cur;
 
-  SELECT '迁移 wcmtemplate 完毕';
+    SET @sql = trs_data_migration.build_migration_log_sql('wcmtemplate', -1);
+
+    prepare stmt from @sql;
+    EXECUTE stmt;
+    deallocate prepare stmt;
 		
 	END $$
 DELIMITER ;

+ 11 - 2
TRS.WCM.Developer/贵州项目/sp/p_data_migration_wcmtemplateargument.sql

@@ -55,6 +55,7 @@ CREATE PROCEDURE p_data_migration_wcmtemplateargument(IN prevTemplateArgId BIGIN
 
         THEN
 
+            SET @TEMPLATEARGUMENTID = f_TEMPLATEARGUMENTID;
             SET f_TEMPLATEARGUMENTID = f_TEMPLATEARGUMENTID + templateArgIdOffset;
             SET f_TEMPLATEID = f_TEMPLATEID + baseTemplateId;
 
@@ -89,7 +90,11 @@ CREATE PROCEDURE p_data_migration_wcmtemplateargument(IN prevTemplateArgId BIGIN
                   f_PREFIXOFNAME
                 );
 
-            SELECT CONCAT('成功迁移 wcmtemplateargument[TEMPLATEARGUMENTID=', f_TEMPLATEARGUMENTID, ']') ;
+          SET @sql = trs_data_migration.build_migration_log_sql('wcmtemplateargument', @TEMPLATEARGUMENTID);
+
+          prepare stmt from @sql;
+          EXECUTE stmt;
+          deallocate prepare stmt;
     END IF ;
 
 		FETCH cur INTO
@@ -106,7 +111,11 @@ CREATE PROCEDURE p_data_migration_wcmtemplateargument(IN prevTemplateArgId BIGIN
 	
 	CLOSE cur;
 
-  SELECT '迁移 wcmtemplateargument 完毕';
+    SET @sql = trs_data_migration.build_migration_log_sql('wcmtemplateargument', -1);
+
+    prepare stmt from @sql;
+    EXECUTE stmt;
+    deallocate prepare stmt;
 		
 	END $$
 DELIMITER ;

+ 15 - 5
TRS.WCM.Developer/贵州项目/sp/p_data_migration_wcmtemplateemploy.sql

@@ -5,6 +5,7 @@ DROP PROCEDURE IF EXISTS p_data_migration_wcmtemplateemploy;
 DELIMITER $$
 CREATE PROCEDURE p_data_migration_wcmtemplateemploy(IN prevTemplateEmployId BIGINT(20),
                                               IN templateEmployIdOffset BIGINT(20),
+                                              IN templateIdOffset BIGINT(20),
                                               IN siteIdOffset BIGINT(20),
                                               IN channelIdOffset BIGINT(20))
 	BEGIN 
@@ -52,15 +53,16 @@ CREATE PROCEDURE p_data_migration_wcmtemplateemploy(IN prevTemplateEmployId BIGI
 
         THEN
 
+            SET @TEMPLATEEMPLOYID = f_TEMPLATEEMPLOYID;
             SET f_TEMPLATEEMPLOYID = f_TEMPLATEEMPLOYID + templateEmployIdOffset;
-            SET f_TEMPLATEID = f_TEMPLATEID + baseTemplateId;
+            SET f_TEMPLATEID = f_TEMPLATEID + templateIdOffset;
 
             IF (f_EMPLOYERTYPE = 103)
-              THEN SET f_TEMPLATEID = f_TEMPLATEID + siteIdOffset;
+              THEN SET f_EMPLOYERID = f_EMPLOYERID + siteIdOffset;
             END IF ;
 
             IF (f_EMPLOYERTYPE = 101)
-              THEN SET f_TEMPLATEID = f_TEMPLATEID + channelIdOffset;
+              THEN SET f_EMPLOYERID = f_EMPLOYERID + channelIdOffset;
             END IF ;
 
 
@@ -84,7 +86,11 @@ CREATE PROCEDURE p_data_migration_wcmtemplateemploy(IN prevTemplateEmployId BIGI
                   f_ISDEFAULT
                 );
 
-            SELECT CONCAT('成功迁移 wcmtemplateemploy[TEMPLATEEMPLOYID=', f_TEMPID, ']') ;
+          SET @sql = trs_data_migration.build_migration_log_sql('wcmtemplateemploy', @TEMPLATEEMPLOYID);
+
+          prepare stmt from @sql;
+          EXECUTE stmt;
+          deallocate prepare stmt;
     END IF ;
 
 		FETCH cur INTO
@@ -100,7 +106,11 @@ CREATE PROCEDURE p_data_migration_wcmtemplateemploy(IN prevTemplateEmployId BIGI
 	
 	CLOSE cur;
 
-  SELECT '迁移 wcmtemplateemploy 完毕';
+    SET @sql = trs_data_migration.build_migration_log_sql('wcmtemplateemploy', -1);
+
+    prepare stmt from @sql;
+    EXECUTE stmt;
+    deallocate prepare stmt;
 		
 	END $$
 DELIMITER ;

+ 11 - 2
TRS.WCM.Developer/贵州项目/sp/p_data_migration_wcmtemplatenest.sql

@@ -40,6 +40,7 @@ CREATE PROCEDURE p_data_migration_wcmtemplatenest(IN prevTemplateNestId BIGINT(2
 
         THEN
 
+            SET @TEMPLATENESTID = f_TEMPLATENESTID;
             SET f_TEMPLATENESTID = f_TEMPLATENESTID + templateNestIdOffset;
             SET f_TEMPLATEID = f_TEMPLATEID + templateNestIdOffset;
             SET f_NESTEDTEMPLATEID = f_NESTEDTEMPLATEID + templateNestIdOffset;
@@ -57,7 +58,11 @@ CREATE PROCEDURE p_data_migration_wcmtemplatenest(IN prevTemplateNestId BIGINT(2
                   f_TEMPLATENESTID
                 );
 
-            SELECT CONCAT('成功迁移 wcmtemplatenest[TEMPLATENESTID=', f_TEMPLATENESTID, ']') ;
+          SET @sql = trs_data_migration.build_migration_log_sql('wcmtemplatenest', @TEMPLATENESTID);
+
+          prepare stmt from @sql;
+          EXECUTE stmt;
+          deallocate prepare stmt;
     END IF ;
 
 		FETCH cur INTO
@@ -70,7 +75,11 @@ CREATE PROCEDURE p_data_migration_wcmtemplatenest(IN prevTemplateNestId BIGINT(2
 	
 	CLOSE cur;
 
-  SELECT '迁移 wcmtemplatenest 完毕';
+    SET @sql = trs_data_migration.build_migration_log_sql('wcmtemplatenest', -1);
+
+    prepare stmt from @sql;
+    EXECUTE stmt;
+    deallocate prepare stmt;
 		
 	END $$
 DELIMITER ;

+ 13 - 3
TRS.WCM.Developer/贵州项目/sp/p_data_migration_wcmtemplatequote.sql

@@ -5,6 +5,7 @@ DROP PROCEDURE IF EXISTS p_data_migration_wcmtemplatequote;
 DELIMITER $$
 CREATE PROCEDURE p_data_migration_wcmtemplatequote(IN prevTemplateQuoteId BIGINT(20),
                                               IN templateQuoteIdOffset BIGINT(20),
+                                              IN templateIdOffset BIGINT(20),
                                               IN siteIdOffset BIGINT(20),
                                               IN channelIdOffset BIGINT(20))
 	BEGIN 
@@ -55,8 +56,9 @@ CREATE PROCEDURE p_data_migration_wcmtemplatequote(IN prevTemplateQuoteId BIGINT
 
         THEN
 
+            SET @TEMPLATEQUOTEID = f_TEMPLATEQUOTEID;
             SET f_TEMPLATEQUOTEID = f_TEMPLATEQUOTEID + templateQuoteIdOffset;
-            SET f_TEMPLATEID = f_TEMPLATEID + baseTemplateId;
+            SET f_TEMPLATEID = f_TEMPLATEID + templateIdOffset;
 
             IF (f_QUOTEDFOLDERTYPE = 103)
               THEN SET f_QUOTEDFOLDERID = f_QUOTEDFOLDERID + siteIdOffset;
@@ -89,7 +91,11 @@ CREATE PROCEDURE p_data_migration_wcmtemplatequote(IN prevTemplateQuoteId BIGINT
                   f_QUOTETYPE
                 );
 
-            SELECT CONCAT('成功迁移 wcmtemplatequote[TEMPLATEQUOTEID=', f_TEMPLATEQUOTEID, ']') ;
+          SET @sql = trs_data_migration.build_migration_log_sql('wcmtemplatequote', @TEMPLATEQUOTEID);
+
+          prepare stmt from @sql;
+          EXECUTE stmt;
+          deallocate prepare stmt;
     END IF ;
 
 		FETCH cur INTO
@@ -106,7 +112,11 @@ CREATE PROCEDURE p_data_migration_wcmtemplatequote(IN prevTemplateQuoteId BIGINT
 	
 	CLOSE cur;
 
-  SELECT '迁移 wcmtemplatequote 完毕';
+    SET @sql = trs_data_migration.build_migration_log_sql('wcmtemplatequote', -1);
+
+    prepare stmt from @sql;
+    EXECUTE stmt;
+    deallocate prepare stmt;
 		
 	END $$
 DELIMITER ;

+ 11 - 2
TRS.WCM.Developer/贵州项目/sp/p_data_migration_wcmwebsite.sql

@@ -154,6 +154,7 @@ CREATE PROCEDURE p_data_migration_wcmwebsite(IN prevSiteId BIGINT(20), IN siteId
 
         THEN
 
+            SET @SITEID = f_SITEID;
             SET f_SITEID = f_SITEID + siteIdOffset;
 
             insert into trs_hycloud_iip.wcmwebsite
@@ -245,7 +246,11 @@ CREATE PROCEDURE p_data_migration_wcmwebsite(IN prevSiteId BIGINT(20), IN siteId
                   f_AUTOCHECK
                 );
 
-            SELECT CONCAT('成功迁移 wcmwebsite[siteid=', f_SITEID, ']') ;
+          SET @sql = trs_data_migration.build_migration_log_sql('wcmwebsite', @SITEID);
+
+          prepare stmt from @sql;
+          EXECUTE stmt;
+          deallocate prepare stmt;
     END IF ;
 
 		FETCH cur INTO
@@ -296,7 +301,11 @@ CREATE PROCEDURE p_data_migration_wcmwebsite(IN prevSiteId BIGINT(20), IN siteId
 	
 	CLOSE cur;
 
-  SELECT '迁移 wcmwebsite 完毕';
+    SET @sql = trs_data_migration.build_migration_log_sql('wcmwebsite', -1);
+
+    prepare stmt from @sql;
+    EXECUTE stmt;
+    deallocate prepare stmt;
 		
 	END $$
 DELIMITER ;

+ 10 - 2
TRS.WCM.Developer/贵州项目/sp/p_data_migration_xwcmclassinfo.sql

@@ -94,7 +94,11 @@ CREATE PROCEDURE p_data_migration_xwcmclassinfo(IN prevClassInfoId BIGINT(20),
                   f_CCODE
                 );
 
-            SELECT CONCAT('成功迁移 xwcmclassinfo[CLASSINFOID=', @CLASSINFOID, ']') ;
+          SET @sql = trs_data_migration.build_migration_log_sql('xwcmclassinfo', @CLASSINFOID);
+
+          prepare stmt from @sql;
+          EXECUTE stmt;
+          deallocate prepare stmt;
     END IF ;
 
 		FETCH cur INTO
@@ -113,7 +117,11 @@ CREATE PROCEDURE p_data_migration_xwcmclassinfo(IN prevClassInfoId BIGINT(20),
 	
 	CLOSE cur;
 
-  SELECT '迁移 xwcmclassinfo 完毕';
+    SET @sql = trs_data_migration.build_migration_log_sql('xwcmclassinfo', -1);
+
+    prepare stmt from @sql;
+    EXECUTE stmt;
+    deallocate prepare stmt;
 		
 	END $$
 DELIMITER ;

+ 10 - 2
TRS.WCM.Developer/贵州项目/sp/p_data_migration_xwcmclassinfoview.sql

@@ -78,7 +78,11 @@ CREATE PROCEDURE p_data_migration_xwcmclassinfoview(IN prevClassInfoViewId BIGIN
                   f_CRTIME
                 );
 
-            SELECT CONCAT('成功迁移 xwcmclassinfoview[CLASSINFOVIEWID=', @CLASSINFOVIEWID, ']') ;
+          SET @sql = trs_data_migration.build_migration_log_sql('xwcmclassinfoview', @CLASSINFOVIEWID);
+
+          prepare stmt from @sql;
+          EXECUTE stmt;
+          deallocate prepare stmt;
     END IF ;
 
 		FETCH cur INTO
@@ -94,7 +98,11 @@ CREATE PROCEDURE p_data_migration_xwcmclassinfoview(IN prevClassInfoViewId BIGIN
 	
 	CLOSE cur;
 
-  SELECT '迁移 xwcmclassinfoview 完毕';
+    SET @sql = trs_data_migration.build_migration_log_sql('xwcmclassinfoview', @CLASSINFOVIEWID);
+
+    prepare stmt from @sql;
+    EXECUTE stmt;
+    deallocate prepare stmt;
 		
 	END $$
 DELIMITER ;

+ 10 - 2
TRS.WCM.Developer/贵州项目/sp/p_data_migration_xwcmdbinfo.sql

@@ -142,7 +142,11 @@ CREATE PROCEDURE p_data_migration_xwcmdbfieldinfo(IN citySuffix VARCHAR(20),
                   f_HIDDENFIELD
                 );
 
-            SELECT CONCAT('成功迁移 xwcmdbfieldinfo[DBFIELDINFOID=', @DBFIELDINFOID, ']') ;
+          SET @sql = trs_data_migration.build_migration_log_sql('xwcmdbfieldinfo', @DBFIELDINFOID);
+
+          prepare stmt from @sql;
+          EXECUTE stmt;
+          deallocate prepare stmt;
     END IF ;
 
 		FETCH cur INTO
@@ -171,7 +175,11 @@ CREATE PROCEDURE p_data_migration_xwcmdbfieldinfo(IN citySuffix VARCHAR(20),
 	
 	CLOSE cur;
 
-  SELECT '迁移 xwcmdbfieldinfo 完毕';
+    SET @sql = trs_data_migration.build_migration_log_sql('xwcmdbfieldinfo', -1);
+
+    prepare stmt from @sql;
+    EXECUTE stmt;
+    deallocate prepare stmt;
 		
 	END $$
 DELIMITER ;

+ 10 - 2
TRS.WCM.Developer/贵州项目/sp/p_data_migration_xwcmmetaviewemployer.sql

@@ -80,7 +80,11 @@ CREATE PROCEDURE p_data_migration_xwcmmetaviewemployer(IN prevMetaViewEmployerId
                   f_EmployerId
                 );
 
-            SELECT CONCAT('成功迁移 xwcmmetaviewemployer[METAVIEWEMPLOYERID=', @METAVIEWEMPLOYERID, ']') ;
+          SET @sql = trs_data_migration.build_migration_log_sql('xwcmmetaviewemployer', @METAVIEWEMPLOYERID);
+
+          prepare stmt from @sql;
+          EXECUTE stmt;
+          deallocate prepare stmt;
     END IF ;
 
 		FETCH cur INTO
@@ -95,7 +99,11 @@ CREATE PROCEDURE p_data_migration_xwcmmetaviewemployer(IN prevMetaViewEmployerId
 	
 	CLOSE cur;
 
-  SELECT '迁移 xwcmmetaviewemployer 完毕';
+    SET @sql = trs_data_migration.build_migration_log_sql('xwcmmetaviewemployer', -1);
+
+    prepare stmt from @sql;
+    EXECUTE stmt;
+    deallocate prepare stmt;
 		
 	END $$
 DELIMITER ;

+ 10 - 2
TRS.WCM.Developer/贵州项目/sp/p_data_migration_xwcmmetaviewfieldgroup.sql

@@ -80,7 +80,11 @@ CREATE PROCEDURE p_data_migration_xwcmmetaviewfieldgroup(IN prevMetaViewFieldGro
                   f_GROUPORDER
                 );
 
-            SELECT CONCAT('成功迁移 xwcmmetaviewfieldgroup[METAVIEWFIELDGROUPID=', @METAVIEWFIELDGROUPID, ']') ;
+          SET @sql = trs_data_migration.build_migration_log_sql('xwcmmetaviewfieldgroup', @METAVIEWFIELDGROUPID);
+
+          prepare stmt from @sql;
+          EXECUTE stmt;
+          deallocate prepare stmt;
     END IF ;
 
 		FETCH cur INTO
@@ -97,7 +101,11 @@ CREATE PROCEDURE p_data_migration_xwcmmetaviewfieldgroup(IN prevMetaViewFieldGro
 	
 	CLOSE cur;
 
-  SELECT '迁移 xwcmmetaviewfieldgroup 完毕';
+    SET @sql = trs_data_migration.build_migration_log_sql('xwcmmetaviewfieldgroup', -1);
+
+    prepare stmt from @sql;
+    EXECUTE stmt;
+    deallocate prepare stmt;
 		
 	END $$
 DELIMITER ;

+ 10 - 2
TRS.WCM.Developer/贵州项目/sp/p_data_migration_xwcmtableinfo.sql

@@ -83,7 +83,11 @@ CREATE PROCEDURE p_data_migration_xwcmtableinfo(IN citySuffix VARCHAR(20),
                   f_OWNERID
                 );
 
-            SELECT CONCAT('成功迁移 xwcmtableinfo[TABLEINFOID=', @TABLEINFOID, ']') ;
+          SET @sql = trs_data_migration.build_migration_log_sql('xwcmtableinfo', @TABLEINFOID);
+
+          prepare stmt from @sql;
+          EXECUTE stmt;
+          deallocate prepare stmt;
     END IF ;
 
 		FETCH cur INTO
@@ -101,7 +105,11 @@ CREATE PROCEDURE p_data_migration_xwcmtableinfo(IN citySuffix VARCHAR(20),
 	
 	CLOSE cur;
 
-  SELECT '迁移 xwcmtableinfo 完毕';
+    SET @sql = trs_data_migration.build_migration_log_sql('xwcmtableinfo', -1);
+
+    prepare stmt from @sql;
+    EXECUTE stmt;
+    deallocate prepare stmt;
 		
 	END $$
 DELIMITER ;

+ 10 - 2
TRS.WCM.Developer/贵州项目/sp/p_data_migration_xwcmviewfieldinfo.sql

@@ -266,7 +266,11 @@ CREATE PROCEDURE p_data_migration_xwcmviewfieldinfo(IN citySuffix VARCHAR(20),
                   f_ISONLYSITE
                 );
 
-            SELECT CONCAT('成功迁移 xwcmviewfieldinfo[VIEWFIELDINFOID=', @VIEWFIELDINFOID, ']') ;
+          SET @sql = trs_data_migration.build_migration_log_sql('xwcmviewfieldinfo', @VIEWFIELDINFOID);
+
+          prepare stmt from @sql;
+          EXECUTE stmt;
+          deallocate prepare stmt;
     END IF ;
 
 		FETCH cur INTO
@@ -318,7 +322,11 @@ CREATE PROCEDURE p_data_migration_xwcmviewfieldinfo(IN citySuffix VARCHAR(20),
 	
 	CLOSE cur;
 
-  SELECT '迁移 xwcmviewfieldinfo 完毕';
+    SET @sql = trs_data_migration.build_migration_log_sql('xwcmviewfieldinfo', -1);
+
+    prepare stmt from @sql;
+    EXECUTE stmt;
+    deallocate prepare stmt;
 		
 	END $$
 DELIMITER ;

+ 10 - 2
TRS.WCM.Developer/贵州项目/sp/p_data_migration_xwcmviewinfo.sql

@@ -140,7 +140,11 @@ CREATE PROCEDURE p_data_migration_xwcmviewinfo(IN citySuffix VARCHAR(20),
                   f_Attribute
                 );
 
-            SELECT CONCAT('成功迁移 xwcmviewinfo[VIEWINFOID=', @VIEWINFOID, ']') ;
+          SET @sql = trs_data_migration.build_migration_log_sql('xwcmviewinfo', @VIEWINFOID);
+
+          prepare stmt from @sql;
+          EXECUTE stmt;
+          deallocate prepare stmt;
     END IF ;
 
 		FETCH cur INTO
@@ -169,7 +173,11 @@ CREATE PROCEDURE p_data_migration_xwcmviewinfo(IN citySuffix VARCHAR(20),
 	
 	CLOSE cur;
 
-  SELECT '迁移 xwcmviewinfo 完毕';
+    SET @sql = trs_data_migration.build_migration_log_sql('xwcmviewinfo', -1);
+
+    prepare stmt from @sql;
+    EXECUTE stmt;
+    deallocate prepare stmt;
 		
 	END $$
 DELIMITER ;