Merge branch 'master' of /Users/macro.li/IdeaProjects/TRS.WCM.Developer with conflicts.

TRS.WCM.Developer/贵州项目/0_update_data_dbfield.sql

@@ -11,43 +11,43 @@ CREATE PROCEDURE update_data_dbfield (
 	)
 	BEGIN
 		#xwcmdbfieldinfo 添加默认字段
-		select CONCAT('INSERT INTO  trs_hycloud_iip.xwcmdbfieldinfo
+		select CONCAT('INSERT INTO  xwcmdbfieldinfo
 			(DBFIELDINFOID, TABLENAME, TABLEID, FIELDNAME, ANOTHERNAME, FIELDTYPE, DBTYPE, DBLENGTH, DEFAULTVALUE, ENMVALUE, NOTNULL, CLASSID, DBSCALE, CRUSER, CRTIME, VALIDATOR, RADORCHK, NOTEDIT, HIDDENFIELD)
 	VALUES (',dbfieldinfoOffset,' + 1, ',metableName,' ,',tableId,', \'FromType\', \'第三方类型\', 45, 4, 0, NULL, NULL, 0, 0, 0, \'admin\', \'2018-09-20 14:50:31\', NULL, NULL, 0, 0);
 
-	INSERT INTO  trs_hycloud_iip.xwcmdbfieldinfo
+	INSERT INTO  xwcmdbfieldinfo
 			(DBFIELDINFOID, TABLENAME, TABLEID, FIELDNAME, ANOTHERNAME, FIELDTYPE, DBTYPE, DBLENGTH, DEFAULTVALUE, ENMVALUE, NOTNULL, CLASSID, DBSCALE, CRUSER, CRTIME, VALIDATOR, RADORCHK, NOTEDIT, HIDDENFIELD)
 	VALUES (',dbfieldinfoOffset,' + 2, ',metableName,' ,',tableId,' \'FromId\', \'第三方ID\', 40, 12, 100, NULL, NULL, 0, 0, 0, \'admin\', \'2018-09-20 14:50:31\', NULL, NULL, 0, 0);
 
-	INSERT INTO  trs_hycloud_iip.xwcmdbfieldinfo
+	INSERT INTO  xwcmdbfieldinfo
 			(DBFIELDINFOID, TABLENAME, TABLEID, FIELDNAME, ANOTHERNAME, FIELDTYPE, DBTYPE, DBLENGTH, DEFAULTVALUE, ENMVALUE, NOTNULL, CLASSID, DBSCALE, CRUSER, CRTIME, VALIDATOR, RADORCHK, NOTEDIT, HIDDENFIELD)
 	VALUES (',dbfieldinfoOffset,' + 3, ',metableName,' ,',tableId,' \'OriginMetaDataId\', \'源文档ID\', 45, 4, 0, NULL, NULL, 0, 0, 0, \'admin\', \'2018-09-20 14:50:31\', NULL, NULL, 0, 0);
 
-	INSERT INTO  trs_hycloud_iip.xwcmdbfieldinfo
+	INSERT INTO  xwcmdbfieldinfo
 			(DBFIELDINFOID, TABLENAME, TABLEID, FIELDNAME, ANOTHERNAME, FIELDTYPE, DBTYPE, DBLENGTH, DEFAULTVALUE, ENMVALUE, NOTNULL, CLASSID, DBSCALE, CRUSER, CRTIME, VALIDATOR, RADORCHK, NOTEDIT, HIDDENFIELD)
 	VALUES (',dbfieldinfoOffset,' + 4, ',metableName,' ,',tableId,' \'AttachPic\', \'含图\', 45, 5, 150, NULL, NULL, 0, 0, 0, \'admin\', \'2018-09-20 14:50:31\', NULL, NULL, 0, 0);
 
-	INSERT INTO  trs_hycloud_iip.xwcmdbfieldinfo
+	INSERT INTO  xwcmdbfieldinfo
 			(DBFIELDINFOID, TABLENAME, TABLEID, FIELDNAME, ANOTHERNAME, FIELDTYPE, DBTYPE, DBLENGTH, DEFAULTVALUE, ENMVALUE, NOTNULL, CLASSID, DBSCALE, CRUSER, CRTIME, VALIDATOR, RADORCHK, NOTEDIT, HIDDENFIELD)
 	VALUES (',dbfieldinfoOffset,' + 5, ',metableName,' ,',tableId,' \'AttachVideo\', \'含视频\', 45, 5, 150, NULL, NULL, 0, 0, 0, \'admin\', \'2018-09-20 14:50:31\', NULL, NULL, 0, 0);
 
-	INSERT INTO  trs_hycloud_iip.xwcmdbfieldinfo
+	INSERT INTO  xwcmdbfieldinfo
 			(DBFIELDINFOID, TABLENAME, TABLEID, FIELDNAME, ANOTHERNAME, FIELDTYPE, DBTYPE, DBLENGTH, DEFAULTVALUE, ENMVALUE, NOTNULL, CLASSID, DBSCALE, CRUSER, CRTIME, VALIDATOR, RADORCHK, NOTEDIT, HIDDENFIELD)
 	VALUES (',dbfieldinfoOffset,' + 6, ',metableName,' ,',tableId,' \'AttachAudio\', \'含音频\', 45, 5, 150, NULL, NULL, 0, 0, 0, \'admin\', \'2018-09-20 14:50:31\', NULL, NULL, 0, 0);
 
-	INSERT INTO  trs_hycloud_iip.xwcmdbfieldinfo
+	INSERT INTO  xwcmdbfieldinfo
 			(DBFIELDINFOID, TABLENAME, TABLEID, FIELDNAME, ANOTHERNAME, FIELDTYPE, DBTYPE, DBLENGTH, DEFAULTVALUE, ENMVALUE, NOTNULL, CLASSID, DBSCALE, CRUSER, CRTIME, VALIDATOR, RADORCHK, NOTEDIT, HIDDENFIELD)
 	VALUES (',dbfieldinfoOffset,' + 7, ',metableName,' ,',tableId,' \'DocType\', \'文档类型\', 45, 4, 0, NULL, NULL, 0, 0, 0, \'admin\', \'2018-09-20 14:50:31\', NULL, NULL, 0, 0);
 
-	INSERT INTO trs_hycloud_iip.xwcmdbfieldinfo
+	INSERT INTO xwcmdbfieldinfo
 			(DBFIELDINFOID, TABLENAME, TABLEID, FIELDNAME, ANOTHERNAME, FIELDTYPE, DBTYPE, DBLENGTH, DEFAULTVALUE, ENMVALUE, NOTNULL, CLASSID, DBSCALE, CRUSER, CRTIME, VALIDATOR, RADORCHK, NOTEDIT, HIDDENFIELD)
 	VALUES (',dbfieldinfoOffset,' + 8, ',metableName,' ,',tableId,' \'DOCRELTIME\', \'撰写时间\', 11, 93, 0, NULL, NULL, 0, 0, 0, \'admin\', \'2018-09-20 14:50:31\', NULL, NULL, 0, 0);
 
-	INSERT INTO trs_hycloud_iip.xwcmdbfieldinfo
+	INSERT INTO xwcmdbfieldinfo
 			(DBFIELDINFOID, TABLENAME, TABLEID, FIELDNAME, ANOTHERNAME, FIELDTYPE, DBTYPE, DBLENGTH, DEFAULTVALUE, ENMVALUE, NOTNULL, CLASSID, DBSCALE, CRUSER, CRTIME, VALIDATOR, RADORCHK, NOTEDIT, HIDDENFIELD)
 	VALUES (',dbfieldinfoOffset,' + 9, ',metableName,' ,',tableId,' \'ThumbFiles\', \'文档附图\', 40, 12, 2000, NULL, NULL, 0, 0, 0, \'admin\', \'2018-09-20 14:50:31\', NULL, NULL, 0, 0);
 
-	alter table trs_hycloud_iip.wcmmetatable', metableName,
+	alter table wcmmetatable', metableName,
 											 ' add column OriginMetaDataId int(11) DEFAULT NULL,
                         add column FromType int(11) DEFAULT NULL,
                         add column FromId int(11) DEFAULT NULL,

TRS.WCM.Developer/贵州项目/0_update_data_table.sql

@@ -2,14 +2,11 @@
 
 DROP PROCEDURE IF EXISTS update_data_table;
 DELIMITER $$
-CREATE PROCEDURE update_data_table(
-                                  IN citySuffix VARCHAR(255),
-                                  IN prevtabelId BIGINT(20))
+CREATE PROCEDURE update_data_table(IN prevtabelId BIGINT(20))
 	BEGIN 
 	
 	DECLARE isover INT DEFAULT 0;
 	DECLARE table_migr_table_name varchar(255) DEFAULT 'xwcmtableinfo';
-  DECLARE view_migr_table_name varchar(255) DEFAULT 'xwcmviewinfo';
 
     DECLARE  f_TABLEINFOID int(11) DEFAULT NULL;
     DECLARE  f_TABLENAME varchar(50) DEFAULT NULL;
@@ -59,23 +56,19 @@ CREATE PROCEDURE update_data_table(
       IF (f_TABLEINFOID > prevtabelId)
 
         THEN
-          SET @metaTableExists = (SELECT count(1) from information_schema.tables where table_schema = 'trs_hycloud_iip' and table_name = concat('wcmmetatable', f_TABLENAME, citySuffix) );
-
-          IF (@metaTableExists > 0)
             then
               SET @table_offset_num = ifnull((SELECT offset_num FROM data_migration_offset WHERE table_name = table_migr_table_name AND start_id < f_TABLEINFOID and  end_id >= f_TABLEINFOID), 0);
               SET f_TABLEINFOID = f_TABLEINFOID + @table_offset_num;
 
-              set @max_dbfieldinfo_id = ifnull((SELECT MAX(DBFIELDINFOID) from trs_hycloud_iip.xwcmdbfieldinfo), 0);
+              set @max_dbfieldinfo_id = ifnull((SELECT MAX(DBFIELDINFOID) from xwcmdbfieldinfo), 0);
 
-              call update_data_dbfield(concat(f_TABLENAME, citySuffix), f_TABLEINFOID, @max_dbfieldinfo_id + (@i * 9));
+              call update_data_dbfield(f_TABLENAME, f_TABLEINFOID, @max_dbfieldinfo_id + (@i * 9));
 
               set @i = @i + 1;
               SET @log_sql = build_migration_log_sql('update_data_tabel_id', f_TABLEINFOID, now());
               prepare stmt from @log_sql;
               EXECUTE stmt;
               deallocate prepare stmt;
-          end if;
     END IF ;
 
 		FETCH cur INTO

TRS.WCM.Developer/贵州项目/readme.md

@@ -6,36 +6,36 @@
 1. 数据准备与wiki中相同。中间库可以根据节点自己区分。
    
 2. 迁移站点，栏目，视图，模板等基本数据。（用户可以在新系统中增加角色，调整视图和模板）
-  ```sql
-  call sp_city_base(节点ID);
-  
-  ```
+    ```sql
+    call sp_city_base(节点ID);
+    ```
    * 处理元数据字段对应（见：0_update_data.sql）
+   
+   * 需要先对迁移元数据表进行整理，将需要迁移的数据拷贝到中间库。
+      * 删除多余字段元数据,修改元数据表名;
+      ```sql
+      #获取修改元数据的表名的SQL
+       SELECT
+       	CONCAT( 'ALTER TABLE ', table_name, ' RENAME TO ', table_name, '_city4', ';' ) sqls 
+       FROM
+       	information_schema.TABLES 
+       WHERE
+       	table_schema = '中间库的数据库名称，比如：' 
+       	AND table_name LIKE 'wcmmetatable%';
+      ```
+      * 在中间库元数据表，和tabel表添加默认字段
+      ```sql
+      SELECT prev_id from data_migration_log where table_name = 'xwcmtableinfo';
+      # 注意该脚本结果为sql 脚本。需要复制脚本再执行一遍。
+      call update_data_table(迁移起始tabelinfoID);
+      ```
+      * 修改后，将元数据表在trs_hycloud_iip创建。
+      ``` 
+      
+      ```
+   
 3. 迁移数据 和 附件。
 
-   * 需要先对迁移数据进行整理，将需要迁移的数据拷贝到中间库。
-   * 删除多余字段元数据,修改元数据表名;
-   ```sql
-   #获取修改元数据的表名的SQL
-    SELECT
-    	CONCAT( 'ALTER TABLE ', table_name, ' RENAME TO ', table_name, '_city4', ';' ) sqls 
-    FROM
-    	information_schema.TABLES 
-    WHERE
-    	table_schema = '中间库的数据库名称，比如：' 
-    	AND table_name LIKE 'wcmmetatable%';
-   ```
-    * 生成创建表sql以保存元数据表索引
-      SELECT concat('create table trs_hycloud_iip.wcmmetatable',TABLENAME,'_city5 like ','wcmmetatable',TABLENAME,'_city5;') from xwcmtableinfo;
-      * 生成插入数据sql
-      SELECT concat('INSERT INTO trs_hycloud_iip.wcmmetatable',TABLENAME,'_city5 SELECT * from ','wcmmetatable',TABLENAME,'_city5;') from xwcmtableinfo;
-      
-   * 添加默认的元数据字段
-   ```sql
-   SELECT prev_id from data_migration_log where table_name = 'xwcmtableinfo';
-   # 注意该脚本结果为sql 脚本。需要复制脚本再执行一遍。
-   call update_data_table('_city4', 迁移起始tabelinfoID)
-   ```
    * 执行迁移脚本
    ```sql 
    call sp_city_data(节点ID)