Преглед на файлове

脚本支持增量更新数据4

lijihong преди 6 години
родител
ревизия
6ab99511d6

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

@@ -4,6 +4,7 @@ use trs_data_migration;
 DROP PROCEDURE IF EXISTS sp_data_migration_wcmchannel;
 DELIMITER $$
 CREATE PROCEDURE sp_data_migration_wcmchannel(IN prevChnlId BIGINT(20),
+                                              IN siteIdOffset BIGINT(20),
                                               IN channelIdOffset BIGINT(20))
 	BEGIN 
 	
@@ -191,10 +192,10 @@ CREATE PROCEDURE sp_data_migration_wcmchannel(IN prevChnlId BIGINT(20),
             SET @CHANNELID = f_CHANNELID;
             SET f_CHANNELID = f_CHANNELID + channelIdOffset;
 
-            SET @site_offset_num = ifnull((SELECT offset_num FROM data_migration_offset WHERE table_name = site_migr_table_name AND start_id < f_SITEID and  end_id >= f_SITEID), 0);
+            SET @site_offset_num = ifnull((SELECT offset_num FROM data_migration_offset WHERE table_name = site_migr_table_name AND start_id < f_SITEID and  end_id >= f_SITEID), siteIdOffset);
             SET f_SITEID = f_SITEID + @site_offset_num;
 
-            SET @channel_offset_num = ifnull((SELECT offset_num FROM data_migration_offset WHERE table_name = migr_table_name AND start_id < f_PARENTID and  end_id >= f_PARENTID), 0);
+            SET @channel_offset_num = ifnull((SELECT offset_num FROM data_migration_offset WHERE table_name = migr_table_name AND start_id < f_PARENTID and  end_id >= f_PARENTID), channelIdOffset);
             SET f_PARENTID = f_PARENTID + @channel_offset_num;
 
             insert into trs_hycloud_iip.wcmchannel

+ 7 - 5
TRS.WCM.Developer/贵州项目/3_sp_data_migration_wcmchannelchildindexquote.sql

@@ -3,7 +3,9 @@ use trs_data_migration;
 
 DROP PROCEDURE IF EXISTS sp_data_migration_wcmchannelchildindexquote;
 DELIMITER $$
-CREATE PROCEDURE sp_data_migration_wcmchannelchildindexquote()
+CREATE PROCEDURE sp_data_migration_wcmchannelchildindexquote(IN templateIdOffset BIGINT(20),
+                                              IN siteIdOffset BIGINT(20),
+                                              IN channelIdOffset BIGINT(20))
 	BEGIN 
 	
     DECLARE isover INT DEFAULT 0;
@@ -47,21 +49,21 @@ CREATE PROCEDURE sp_data_migration_wcmchannelchildindexquote()
 
     WHILE isover= 0 DO
 
-      SET @template_offset_num = ifnull((SELECT offset_num FROM data_migration_offset WHERE table_name = template_migr_table_name AND start_id < f_TEMPLATEID and  end_id >=f_TEMPLATEID), 0);
+      SET @template_offset_num = ifnull((SELECT offset_num FROM data_migration_offset WHERE table_name = template_migr_table_name AND start_id < f_TEMPLATEID and  end_id >=f_TEMPLATEID), templateIdOffset);
       SET f_TEMPLATEID = f_TEMPLATEID + @template_offset_num;
 
-      SET @quote_offset_num = ifnull((SELECT offset_num FROM data_migration_offset WHERE table_name = channel_migr_table_name AND start_id < f_QUOTECHANNELID and  end_id >=f_QUOTECHANNELID), 0);
+      SET @quote_offset_num = ifnull((SELECT offset_num FROM data_migration_offset WHERE table_name = channel_migr_table_name AND start_id < f_QUOTECHANNELID and  end_id >=f_QUOTECHANNELID), channelIdOffset);
       SET f_QUOTECHANNELID = f_QUOTECHANNELID + @quote_offset_num;
 
       IF (f_FOLDERTYPE = 103)
         THEN
-          SET @site_offset_num = ifnull((SELECT offset_num FROM data_migration_offset WHERE table_name = site_migr_table_name AND start_id < f_FOLDERID and  end_id >=f_FOLDERID), 0);
+          SET @site_offset_num = ifnull((SELECT offset_num FROM data_migration_offset WHERE table_name = site_migr_table_name AND start_id < f_FOLDERID and  end_id >=f_FOLDERID), siteIdOffset);
           SET f_FOLDERID = f_FOLDERID + @site_offset_num;
       END IF ;
 
       IF (f_FOLDERTYPE = 101)
         THEN
-          SET @channel_offset_num = ifnull((SELECT offset_num FROM data_migration_offset WHERE table_name = channel_migr_table_name AND start_id < f_FOLDERID and  end_id >=f_FOLDERID), 0);
+          SET @channel_offset_num = ifnull((SELECT offset_num FROM data_migration_offset WHERE table_name = channel_migr_table_name AND start_id < f_FOLDERID and  end_id >=f_FOLDERID), channelIdOffset);
           SET f_FOLDERID = f_FOLDERID + @channel_offset_num;
       END IF ;
 

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

@@ -4,7 +4,8 @@ use trs_data_migration;
 DROP PROCEDURE IF EXISTS sp_data_migration_wcmchannelsyn;
 DELIMITER $$
 CREATE PROCEDURE sp_data_migration_wcmchannelsyn(IN prevChannelSynId BIGINT(20),
-                                                  IN channelSynIdOffset BIGINT(20))
+                                                  IN channelSynIdOffset BIGINT(20),
+                                                  IN channelIdOffset BIGINT(20))
 	BEGIN
 	
     DECLARE isover INT DEFAULT 0;
@@ -78,9 +79,9 @@ CREATE PROCEDURE sp_data_migration_wcmchannelsyn(IN prevChannelSynId BIGINT(20),
         THEN
           SET @CHANNELSYNID = f_CHANNELSYNID;
           SET f_CHANNELSYNID = f_CHANNELSYNID + channelSynIdOffset;
-          SET @src_offset_num = ifnull((SELECT offset_num FROM data_migration_offset WHERE table_name = channel_migr_table_name AND start_id < f_SRCCHANNEL and  end_id >= f_SRCCHANNEL), 0);
+          SET @src_offset_num = ifnull((SELECT offset_num FROM data_migration_offset WHERE table_name = channel_migr_table_name AND start_id < f_SRCCHANNEL and  end_id >= f_SRCCHANNEL), channelIdOffset);
           SET f_SRCCHANNEL = f_SRCCHANNEL + @src_offset_num;
-          SET @to_offset_num = ifnull((SELECT offset_num FROM data_migration_offset WHERE table_name = channel_migr_table_name AND start_id < f_TOCHANNEL and  end_id >= f_TOCHANNEL), 0);
+          SET @to_offset_num = ifnull((SELECT offset_num FROM data_migration_offset WHERE table_name = channel_migr_table_name AND start_id < f_TOCHANNEL and  end_id >= f_TOCHANNEL), channelIdOffset);
           SET f_TOCHANNEL = f_TOCHANNEL + @to_offset_num;
 
 

+ 7 - 4
TRS.WCM.Developer/贵州项目/3_sp_data_migration_wcmdocument.sql

@@ -4,7 +4,10 @@ use trs_data_migration;
 DROP PROCEDURE IF EXISTS sp_data_migration_wcmdocument;
 DELIMITER $$
 CREATE PROCEDURE sp_data_migration_wcmdocument(IN prevDocId BIGINT(20),
-                                              IN docIdOffset BIGINT(20))
+                                              IN docIdOffset BIGINT(20),
+                                              IN viewIdOffset BIGINT(20),
+                                              IN siteIdOffset BIGINT(20),
+                                              IN channelIdOffset BIGINT(20))
 
 	BEGIN 
 	
@@ -291,16 +294,16 @@ CREATE PROCEDURE sp_data_migration_wcmdocument(IN prevDocId BIGINT(20),
             SET f_OriginDocId = f_DOCID;
           END IF;
           # 栏目ID
-          SET @channel_offset_num = ifnull((SELECT offset_num FROM data_migration_offset WHERE table_name = channel_migr_table_name AND start_id < f_DOCCHANNEL and  end_id >= f_DOCCHANNEL), 0);
+          SET @channel_offset_num = ifnull((SELECT offset_num FROM data_migration_offset WHERE table_name = channel_migr_table_name AND start_id < f_DOCCHANNEL and  end_id >= f_DOCCHANNEL), channelIdOffset);
           SET f_DOCCHANNEL = f_DOCCHANNEL + @channel_offset_num;
           # 视图ID
           IF (f_DOCKIND > 0)
           THEN
-            SET @view_offset_num = ifnull((SELECT offset_num FROM data_migration_offset WHERE table_name = view_migr_table_name AND start_id < f_DOCKIND and  end_id >= f_DOCKIND), 0);
+            SET @view_offset_num = ifnull((SELECT offset_num FROM data_migration_offset WHERE table_name = view_migr_table_name AND start_id < f_DOCKIND and  end_id >= f_DOCKIND), viewIdOffset);
             SET f_DOCKIND = f_DOCKIND + @view_offset_num;
           END IF ;
           # 站点ID
-          SET @site_offset_num = ifnull((SELECT offset_num FROM data_migration_offset WHERE table_name = site_migr_table_name AND start_id < f_SITEID and  end_id >= f_SITEID), 0);
+          SET @site_offset_num = ifnull((SELECT offset_num FROM data_migration_offset WHERE table_name = site_migr_table_name AND start_id < f_SITEID and  end_id >= f_SITEID), siteIdOffset);
           SET f_SITEID = f_SITEID + @site_offset_num;
           IF (f_DOCTYPE = 1)
             THEN SET f_DOCTYPE = 20;

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

@@ -4,7 +4,9 @@ use trs_data_migration;
 DROP PROCEDURE IF EXISTS sp_data_migration_wcmfolderpublishconfig;
 DELIMITER $$
 CREATE PROCEDURE sp_data_migration_wcmfolderpublishconfig(IN prevFolderPublishConfigId BIGINT(20),
-                                              IN folderPublishConfigIdOffset BIGINT(20))
+                                              IN folderPublishConfigIdOffset BIGINT(20),
+                                              IN siteIdOffset BIGINT(20),
+                                              IN channelIdOffset BIGINT(20))
 	BEGIN 
 	
     DECLARE isover INT DEFAULT 0;
@@ -79,13 +81,13 @@ CREATE PROCEDURE sp_data_migration_wcmfolderpublishconfig(IN prevFolderPublishCo
 
             IF (f_FOLDERTYPE = 103)
               THEN
-                SET @site_offset_num = ifnull((SELECT offset_num FROM data_migration_offset WHERE table_name = site_migr_table_name AND start_id < f_FOLDERID and  end_id >= f_FOLDERID), 0);
+                SET @site_offset_num = ifnull((SELECT offset_num FROM data_migration_offset WHERE table_name = site_migr_table_name AND start_id < f_FOLDERID and  end_id >= f_FOLDERID), siteIdOffset);
                 SET f_FOLDERID = f_FOLDERID + @site_offset_num;
             END IF ;
 
             IF (f_FOLDERTYPE = 101)
               THEN
-                SET @channel_offset_num = ifnull((SELECT offset_num FROM data_migration_offset WHERE table_name = channel_migr_table_name AND start_id < f_FOLDERID and  end_id >= f_FOLDERID), 0);
+                SET @channel_offset_num = ifnull((SELECT offset_num FROM data_migration_offset WHERE table_name = channel_migr_table_name AND start_id < f_FOLDERID and  end_id >= f_FOLDERID), channelIdOffset);
                 SET f_FOLDERID = f_FOLDERID + @channel_offset_num;
             END IF ;
 

+ 7 - 5
TRS.WCM.Developer/贵州项目/3_sp_data_migration_wcmtemplate.sql

@@ -4,7 +4,9 @@ use trs_data_migration;
 DROP PROCEDURE IF EXISTS sp_data_migration_wcmtemplate;
 DELIMITER $$
 CREATE PROCEDURE sp_data_migration_wcmtemplate(IN prevTemplateId BIGINT(20),
-                                              IN templateIdOffset BIGINT(20))
+                                              IN templateIdOffset BIGINT(20),
+                                              IN siteIdOffset BIGINT(20),
+                                              IN channelIdOffset BIGINT(20))
 	BEGIN 
 	
     DECLARE isover INT DEFAULT 0;
@@ -106,25 +108,25 @@ CREATE PROCEDURE sp_data_migration_wcmtemplate(IN prevTemplateId BIGINT(20),
 
             IF (f_FOLDERTYPE = 103)
               THEN
-                SET @site_offset_num = ifnull((SELECT offset_num FROM data_migration_offset WHERE table_name = site_migr_table_name AND start_id < f_FOLDERID and  end_id >= f_FOLDERID), 0);
+                SET @site_offset_num = ifnull((SELECT offset_num FROM data_migration_offset WHERE table_name = site_migr_table_name AND start_id < f_FOLDERID and  end_id >= f_FOLDERID), siteIdOffset);
                 SET f_FOLDERID = f_FOLDERID + @site_offset_num;
             END IF ;
 
             IF (f_FOLDERTYPE = 101)
               THEN
-                SET @channel_offset_num = ifnull((SELECT offset_num FROM data_migration_offset WHERE table_name = channel_migr_table_name AND start_id < f_FOLDERID and  end_id >= f_FOLDERID), 0);
+                SET @channel_offset_num = ifnull((SELECT offset_num FROM data_migration_offset WHERE table_name = channel_migr_table_name AND start_id < f_FOLDERID and  end_id >= f_FOLDERID), channelIdOffset);
                 SET f_FOLDERID = f_FOLDERID + @channel_offset_num;
             END IF ;
 
             IF (f_ROOTTYPE = 103)
               THEN
-                SET @root_offset_num = ifnull((SELECT offset_num FROM data_migration_offset WHERE table_name = site_migr_table_name AND start_id < f_ROOTID and  end_id >= f_ROOTID), 0);
+                SET @root_offset_num = ifnull((SELECT offset_num FROM data_migration_offset WHERE table_name = site_migr_table_name AND start_id < f_ROOTID and  end_id >= f_ROOTID), siteIdOffset);
                 SET f_ROOTID = f_ROOTID + @root_offset_num;
             END IF ;
 
             IF (f_ROOTTYPE = 101)
               THEN
-                SET @rootcl_offset_num = ifnull((SELECT offset_num FROM data_migration_offset WHERE table_name = site_migr_table_name AND start_id < f_ROOTID and  end_id >= f_ROOTID), 0);
+                SET @rootcl_offset_num = ifnull((SELECT offset_num FROM data_migration_offset WHERE table_name = site_migr_table_name AND start_id < f_ROOTID and  end_id >= f_ROOTID), channelIdOffset);
                 SET f_ROOTID = f_ROOTID + @rootcl_offset_num;
             END IF ;
 

+ 7 - 4
TRS.WCM.Developer/贵州项目/3_sp_data_migration_wcmtemplateargument.sql

@@ -4,7 +4,10 @@ use trs_data_migration;
 DROP PROCEDURE IF EXISTS sp_data_migration_wcmtemplateargument;
 DELIMITER $$
 CREATE PROCEDURE sp_data_migration_wcmtemplateargument(IN prevTemplateArgId BIGINT(20),
-                                              IN templateArgIdOffset BIGINT(20))
+                                              IN templateArgIdOffset BIGINT(20),
+                                              IN templateIdOffset BIGINT(20),
+                                              IN siteIdOffset BIGINT(20),
+                                              IN channelIdOffset BIGINT(20))
 	BEGIN 
 	
     DECLARE isover INT DEFAULT 0;
@@ -64,18 +67,18 @@ CREATE PROCEDURE sp_data_migration_wcmtemplateargument(IN prevTemplateArgId BIGI
 
             SET @TEMPLATEARGUMENTID = f_TEMPLATEARGUMENTID;
             SET f_TEMPLATEARGUMENTID = f_TEMPLATEARGUMENTID + templateArgIdOffset;
-            SET @template_offset_num = ifnull((SELECT offset_num FROM data_migration_offset WHERE table_name = template_migr_table_name AND start_id < f_TEMPLATEID and  end_id >= f_TEMPLATEID), 0);
+            SET @template_offset_num = ifnull((SELECT offset_num FROM data_migration_offset WHERE table_name = template_migr_table_name AND start_id < f_TEMPLATEID and  end_id >= f_TEMPLATEID), templateIdOffset);
             SET f_TEMPLATEID = f_TEMPLATEID + @template_offset_num;
 
             IF (f_EMPLOYERTYPE = 103)
               THEN
-                SET @site_offset_num = ifnull((SELECT offset_num FROM data_migration_offset WHERE table_name = site_migr_table_name AND start_id < f_EMPLOYERID and  end_id >= f_EMPLOYERID), 0);
+                SET @site_offset_num = ifnull((SELECT offset_num FROM data_migration_offset WHERE table_name = site_migr_table_name AND start_id < f_EMPLOYERID and  end_id >= f_EMPLOYERID), siteIdOffset);
                 SET f_EMPLOYERID = f_EMPLOYERID + @site_offset_num;
             END IF ;
 
             IF (f_EMPLOYERTYPE = 101)
               THEN
-                SET @channel_offset_num = ifnull((SELECT offset_num FROM data_migration_offset WHERE table_name = channel_migr_table_name AND start_id < f_EMPLOYERID and  end_id >= f_EMPLOYERID), 0);
+                SET @channel_offset_num = ifnull((SELECT offset_num FROM data_migration_offset WHERE table_name = channel_migr_table_name AND start_id < f_EMPLOYERID and  end_id >= f_EMPLOYERID), channelIdOffset);
                 SET f_EMPLOYERID = f_EMPLOYERID + @channel_offset_num;
             END IF ;
 

+ 7 - 4
TRS.WCM.Developer/贵州项目/3_sp_data_migration_wcmtemplateemploy.sql

@@ -4,7 +4,10 @@ use trs_data_migration;
 DROP PROCEDURE IF EXISTS sp_data_migration_wcmtemplateemploy;
 DELIMITER $$
 CREATE PROCEDURE sp_data_migration_wcmtemplateemploy(IN prevTemplateEmployId BIGINT(20),
-                                              IN templateEmployIdOffset BIGINT(20))
+                                              IN templateEmployIdOffset BIGINT(20),
+                                              IN templateIdOffset BIGINT(20),
+                                              IN siteIdOffset BIGINT(20),
+                                              IN channelIdOffset BIGINT(20))
 	BEGIN 
 	
     DECLARE isover INT DEFAULT 0;
@@ -62,18 +65,18 @@ CREATE PROCEDURE sp_data_migration_wcmtemplateemploy(IN prevTemplateEmployId BIG
 
             SET @TEMPLATEEMPLOYID = f_TEMPLATEEMPLOYID;
             SET f_TEMPLATEEMPLOYID = f_TEMPLATEEMPLOYID + templateEmployIdOffset;
-            SET @template_offset_num = ifnull((SELECT offset_num FROM data_migration_offset WHERE table_name = template_migr_table_name AND start_id < f_TEMPLATEID and  end_id >= f_TEMPLATEID), 0);
+            SET @template_offset_num = ifnull((SELECT offset_num FROM data_migration_offset WHERE table_name = template_migr_table_name AND start_id < f_TEMPLATEID and  end_id >= f_TEMPLATEID), templateIdOffset);
             SET f_TEMPLATEID = f_TEMPLATEID + @template_offset_num;
 
             IF (f_EMPLOYERTYPE = 103)
               THEN
-                SET @site_offset_num = ifnull((SELECT offset_num FROM data_migration_offset WHERE table_name = site_migr_table_name AND start_id < f_EMPLOYERID and  end_id >= f_EMPLOYERID), 0);
+                SET @site_offset_num = ifnull((SELECT offset_num FROM data_migration_offset WHERE table_name = site_migr_table_name AND start_id < f_EMPLOYERID and  end_id >= f_EMPLOYERID), siteIdOffset);
                 SET f_EMPLOYERID = f_EMPLOYERID + @site_offset_num;
             END IF ;
 
             IF (f_EMPLOYERTYPE = 101)
               THEN
-                SET @channel_offset_num = ifnull((SELECT offset_num FROM data_migration_offset WHERE table_name = channel_migr_table_name AND start_id < f_EMPLOYERID and  end_id >= f_EMPLOYERID), 0);
+                SET @channel_offset_num = ifnull((SELECT offset_num FROM data_migration_offset WHERE table_name = channel_migr_table_name AND start_id < f_EMPLOYERID and  end_id >= f_EMPLOYERID), channelIdOffset);
                 SET f_EMPLOYERID = f_EMPLOYERID + @channel_offset_num;
             END IF ;
 

+ 7 - 4
TRS.WCM.Developer/贵州项目/3_sp_data_migration_wcmtemplatequote.sql

@@ -4,7 +4,10 @@ use trs_data_migration;
 DROP PROCEDURE IF EXISTS sp_data_migration_wcmtemplatequote;
 DELIMITER $$
 CREATE PROCEDURE sp_data_migration_wcmtemplatequote(IN prevTemplateQuoteId BIGINT(20),
-                                              IN templateQuoteIdOffset BIGINT(20))
+                                              IN templateQuoteIdOffset BIGINT(20),
+                                              IN templateIdOffset BIGINT(20),
+                                              IN siteIdOffset BIGINT(20),
+                                              IN channelIdOffset BIGINT(20))
 	BEGIN 
 	
     DECLARE isover INT DEFAULT 0;
@@ -66,18 +69,18 @@ CREATE PROCEDURE sp_data_migration_wcmtemplatequote(IN prevTemplateQuoteId BIGIN
             SET @TEMPLATEQUOTEID = f_TEMPLATEQUOTEID;
             SET f_TEMPLATEQUOTEID = f_TEMPLATEQUOTEID + templateQuoteIdOffset;
 
-            SET @template_offset_num = ifnull((SELECT offset_num FROM data_migration_offset WHERE table_name = template_migr_table_name AND start_id < f_TEMPLATEID and  end_id >= f_TEMPLATEID), 0);
+            SET @template_offset_num = ifnull((SELECT offset_num FROM data_migration_offset WHERE table_name = template_migr_table_name AND start_id < f_TEMPLATEID and  end_id >= f_TEMPLATEID), templateIdOffset);
             SET f_TEMPLATEID = f_TEMPLATEID + @template_offset_num;
 
             IF (f_QUOTEDFOLDERTYPE = 103)
               THEN
-                SET @site_offset_num = ifnull((SELECT offset_num FROM data_migration_offset WHERE table_name = site_migr_table_name AND start_id < f_QUOTEDFOLDERID and  end_id >= f_QUOTEDFOLDERID), 0);
+                SET @site_offset_num = ifnull((SELECT offset_num FROM data_migration_offset WHERE table_name = site_migr_table_name AND start_id < f_QUOTEDFOLDERID and  end_id >= f_QUOTEDFOLDERID), siteIdOffset);
                 SET f_QUOTEDFOLDERID = f_QUOTEDFOLDERID + @site_offset_num;
             END IF ;
 
             IF (f_QUOTEDFOLDERTYPE = 101)
               THEN
-                SET @channel_offset_num = ifnull((SELECT offset_num FROM data_migration_offset WHERE table_name = channel_migr_table_name AND start_id < f_QUOTEDFOLDERID and  end_id >= f_QUOTEDFOLDERID), 0);
+                SET @channel_offset_num = ifnull((SELECT offset_num FROM data_migration_offset WHERE table_name = channel_migr_table_name AND start_id < f_QUOTEDFOLDERID and  end_id >= f_QUOTEDFOLDERID), channelIdOffset);
                 SET f_QUOTEDFOLDERID = f_QUOTEDFOLDERID + @channel_offset_num;
             END IF ;
 

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

@@ -5,7 +5,9 @@ DROP PROCEDURE IF EXISTS sp_data_migration_xwcmdbfieldinfo;
 DELIMITER $$
 CREATE PROCEDURE sp_data_migration_xwcmdbfieldinfo(IN citySuffix VARCHAR(20),
                                               IN prevFieldId BIGINT(20),
-                                              IN fieldIdOffset BIGINT(20))
+                                              IN fieldIdOffset BIGINT(20),
+                                              IN classInfoIdOffset BIGINT(20),
+                                              IN tableIdOffset BIGINT(20))
 	BEGIN
 	
 	  DECLARE isover INT DEFAULT 0;
@@ -101,10 +103,10 @@ CREATE PROCEDURE sp_data_migration_xwcmdbfieldinfo(IN citySuffix VARCHAR(20),
 
             SET @DBFIELDINFOID = f_DBFIELDINFOID;
             SET f_DBFIELDINFOID = f_DBFIELDINFOID + fieldIdOffset;
-            SET @table_offset_num = ifnull((SELECT offset_num FROM data_migration_offset WHERE table_name = tabel_migr_table_name AND start_id < f_TABLEID and  end_id >= f_TABLEID), 0);
+            SET @table_offset_num = ifnull((SELECT offset_num FROM data_migration_offset WHERE table_name = tabel_migr_table_name AND start_id < f_TABLEID and  end_id >= f_TABLEID), tableIdOffset);
             SET f_TABLEID = f_TABLEID + @table_offset_num;
 
-            SET @class_offset_num = ifnull((SELECT offset_num FROM data_migration_offset WHERE table_name = class_igr_table_name AND start_id < f_CLASSID and  end_id >= f_CLASSID), 0);
+            SET @class_offset_num = ifnull((SELECT offset_num FROM data_migration_offset WHERE table_name = class_igr_table_name AND start_id < f_CLASSID and  end_id >= f_CLASSID), classInfoIdOffset);
             SET f_CLASSID = f_CLASSID + @class_offset_num;
 
             insert into trs_hycloud_iip.xwcmdbfieldinfo

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

@@ -5,7 +5,8 @@ DROP PROCEDURE IF EXISTS sp_data_migration_xwcmviewinfo;
 DELIMITER $$
 CREATE PROCEDURE sp_data_migration_xwcmviewinfo(IN citySuffix VARCHAR(20),
                                               IN prevViewId BIGINT(20),
-                                              IN viewIdOffset BIGINT(20))
+                                              IN viewIdOffset BIGINT(20),
+                                              IN mainTableIdOffset BIGINT(20))
 	BEGIN 
 	
 	DECLARE isover INT DEFAULT 0;
@@ -101,7 +102,7 @@ CREATE PROCEDURE sp_data_migration_xwcmviewinfo(IN citySuffix VARCHAR(20),
             SET @VIEWINFOID = f_VIEWINFOID;
             SET f_VIEWINFOID = f_VIEWINFOID + viewIdOffset;
 
-            SET @table_offset_num = ifnull((SELECT offset_num FROM data_migration_offset WHERE table_name = tabel_migr_table_name AND start_id < f_MAINTABLEID and  end_id >= f_MAINTABLEID), 0);
+            SET @table_offset_num = ifnull((SELECT offset_num FROM data_migration_offset WHERE table_name = tabel_migr_table_name AND start_id < f_MAINTABLEID and  end_id >= f_MAINTABLEID), mainTableIdOffset);
             SET f_MAINTABLEID = f_MAINTABLEID + @table_offset_num;
 
             insert into trs_hycloud_iip.xwcmviewinfo

+ 11 - 12
TRS.WCM.Developer/贵州项目/4_sp_city_n.sql

@@ -82,20 +82,20 @@ CREATE PROCEDURE sp_city_n(IN n INT)
 
 
     call sp_data_migration_wcmwebsite(@citySuffix, @prevSiteId, @siteIdOffset);
-    call sp_data_migration_wcmchannel(@prevChannelId, @channelIdOffset);
-    call sp_data_migration_wcmchannelsyn(@prevChannelSynId, @channelSynIdOffset);
+    call sp_data_migration_wcmchannel(@prevChannelId, @siteIdOffset, @channelIdOffset);
+    call sp_data_migration_wcmchannelsyn(@prevChannelSynId, @channelSynIdOffset, @channelIdOffset);
     call sp_data_migration_xwcmtableinfo(@citySuffix, @prevTableInfoId, @tableInfoIdOffset);
     call sp_data_migration_xwcmclassinfo(@prevClassInfoId, @classInfoIdOffset);
-    call sp_data_migration_wcmtemplate(@prevTemplateId, @templateIdOffset);
+    call sp_data_migration_wcmtemplate(@prevTemplateId, @templateIdOffset, @siteIdOffset, @channelIdOffset);
     call sp_data_migration_wcmtemplatenest(@prevTemplateNestId, @templateNestIdOffset);
-    call sp_data_migration_wcmfolderpublishconfig(@prevFolderPublishConfigId, @folderPublishConfigIdOffset);
-    call sp_data_migration_wcmtemplateargument(@prevTemplateArgId, @templateArgIdOffset);
-    call sp_data_migration_wcmtemplateemploy(@prevTemplateEmployId, @templateEmployIdOffset);
-    call sp_data_migration_wcmtemplatequote(@prevTemplateQuoteId, @templateQuoteIdOffset);
-    call sp_data_migration_wcmchannelchildindexquote();
-    call sp_data_migration_xwcmviewinfo(@citySuffix, @prevViewId, @viewIdOffset);
-    call sp_data_migration_xwcmdbfieldinfo(@citySuffix, @prevFieldId, @fieldIdOffset);
-    call sp_data_migration_wcmdocument(@prevDocId, @docIdOffset);
+    call sp_data_migration_wcmfolderpublishconfig(@prevFolderPublishConfigId, @folderPublishConfigIdOffset, @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_wcmtemplatequote(@prevTemplateQuoteId, @templateQuoteIdOffset, @templateIdOffset, @siteIdOffset, @channelIdOffset);
+    call sp_data_migration_wcmchannelchildindexquote(@templateIdOffset, @siteIdOffset, @channelIdOffset);
+    call sp_data_migration_xwcmviewinfo(@citySuffix, @prevViewId, @viewIdOffset, @tableInfoIdOffset);
+    call sp_data_migration_xwcmdbfieldinfo(@citySuffix, @prevFieldId, @fieldIdOffset, @prevClassInfoId, @tableInfoIdOffset);
+    call sp_data_migration_wcmdocument(@prevDocId, @docIdOffset, @viewIdOffset, @siteIdOffset, @channelIdOffset);
     call sp_data_migration_wcmappendix(@prevAppendixId, @appendixIdOffset, @docIdOffset);
     call sp_data_migration_wcmchnldoc(@prevRecId, @recIdOffset, @docIdOffset, @siteIdOffset, @channelIdOffset, @viewIdOffset);
     call sp_data_migration_xwcmclassinfoview(@prevClassInfoViewId, @classInfoViewIdOffset, @classInfoIdOffset, @docIdOffset, @viewIdOffset);
@@ -106,7 +106,6 @@ CREATE PROCEDURE sp_city_n(IN n INT)
 --     call sp_data_migration_xwcmmetaviewfieldgroup(@prevMetaViewFieldGroupId, @metaViewFieldGroupIdOffset, @viewIdOffset);
 
 
-
     # 待优化
     # 迁移 MAS 视频,6个wcm节点的视频是在一起的。可重复执行。