lijihong 6 lat temu
rodzic
commit
9e5f52812b

+ 3 - 46
TRS.WCM.Developer/贵州项目/0_update_data_viewfield.sql → TRS.WCM.Developer/贵州项目/0_update_data_dbfield.sql

@@ -1,18 +1,15 @@
 
 DROP PROCEDURE
 IF
-	EXISTS update_data_viewfield;
+	EXISTS update_data_dbfield;
 
 DELIMITER $$
-CREATE PROCEDURE update_data_viewfield (
+CREATE PROCEDURE update_data_dbfield (
 	IN metableName VARCHAR(255),
 	IN tableId BIGINT ( 20 ),
-	IN viewId BIGINT ( 20 ),
-	IN dbfieldinfoOffset BIGINT ( 20 ),
-	IN viewFieldInfoIdOffset BIGINT ( 20 )
+	IN dbfieldinfoOffset BIGINT ( 20 )
 	)
 	BEGIN
-	start transaction;
 	#xwcmdbfieldinfo 添加默认字段
 	INSERT INTO  trs_hycloud_iip.xwcmdbfieldinfo
 			(DBFIELDINFOID, TABLENAME, TABLEID, FIELDNAME, ANOTHERNAME, FIELDTYPE, DBTYPE, DBLENGTH, DEFAULTVALUE, ENMVALUE, NOTNULL, CLASSID, DBSCALE, CRUSER, CRTIME, VALIDATOR, RADORCHK, NOTEDIT, HIDDENFIELD)
@@ -50,45 +47,6 @@ CREATE PROCEDURE update_data_viewfield (
 			(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);
 
-
-
-	#trs_hycloud_iip.xwcmviewfieldinfo 添加默认字段
-	INSERT INTO trs_hycloud_iip.xwcmviewfieldinfo
-			(VIEWFIELDINFOID, TABLENAME, TABLEID, FIELDNAME, DBFIELDNAME, DBTYPE, DBLENGTH, ANOTHERNAME, FIELDTYPE, DBFIELD, CRUSER, CRTIME, VIEWID)
-	VALUES (viewFieldInfoIdOffset + 1, metableName, tableId, 'FromType', 'FromType', 4, 0, '第三方类型', 45, dbfieldinfoOffset + 1, 'admin', '2018-09-20 14:50:32', viewId);
-
-	INSERT INTO trs_hycloud_iip.xwcmviewfieldinfo
-			(VIEWFIELDINFOID, TABLENAME, TABLEID, FIELDNAME, DBFIELDNAME, DBTYPE, DBLENGTH, ANOTHERNAME, FIELDTYPE, DBFIELD, CRUSER, CRTIME, VIEWID)
-	VALUES (viewFieldInfoIdOffset + 2, metableName, tableId, 'FromId', 'FromId', 12, 100, '第三方ID', 40, dbfieldinfoOffset + 2, 'admin', '2018-09-20 14:50:32', viewId);
-
-	INSERT INTO trs_hycloud_iip.xwcmviewfieldinfo
-			(VIEWFIELDINFOID, TABLENAME, TABLEID, FIELDNAME, DBFIELDNAME, DBTYPE, DBLENGTH, ANOTHERNAME, FIELDTYPE, DBFIELD, CRUSER, CRTIME, VIEWID)
-	VALUES (viewFieldInfoIdOffset + 3, metableName, tableId, 'OriginMetaDataId', 'OriginMetaDataId', 4, 0, '源文档ID', 45, dbfieldinfoOffset + 3, 'admin', '2018-09-20 14:50:32', viewId);
-
-	INSERT INTO trs_hycloud_iip.xwcmviewfieldinfo
-			(VIEWFIELDINFOID, TABLENAME, TABLEID, FIELDNAME, DBFIELDNAME, DBTYPE, DBLENGTH, ANOTHERNAME, FIELDTYPE, DBFIELD, CRUSER, CRTIME, VIEWID)
-	VALUES (viewFieldInfoIdOffset + 4, metableName, tableId, 'AttachPic', 'AttachPic', 5, 150, '含图', 45, dbfieldinfoOffset + 4, 'admin', '2018-09-20 14:50:32', viewId);
-
-	INSERT INTO trs_hycloud_iip.xwcmviewfieldinfo
-			(VIEWFIELDINFOID, TABLENAME, TABLEID, FIELDNAME, DBFIELDNAME, DBTYPE, DBLENGTH, ANOTHERNAME, FIELDTYPE, DBFIELD, CRUSER, CRTIME, VIEWID)
-	VALUES (viewFieldInfoIdOffset + 5, metableName, tableId, 'AttachVideo', 'AttachVideo', 5, 150, '含视频', 45, dbfieldinfoOffset + 5, 'admin', '2018-09-20 14:50:32', viewId);
-
-	INSERT INTO trs_hycloud_iip.xwcmviewfieldinfo
-			(VIEWFIELDINFOID, TABLENAME, TABLEID, FIELDNAME, DBFIELDNAME, DBTYPE, DBLENGTH, ANOTHERNAME, FIELDTYPE, DBFIELD, CRUSER, CRTIME, VIEWID)
-	VALUES (viewFieldInfoIdOffset + 6, metableName, tableId, 'AttachAudio', 'AttachAudio', 5, 150, '含音频', 45, dbfieldinfoOffset + 6, 'admin', '2018-09-20 14:50:32', viewId);
-
-	INSERT INTO trs_hycloud_iip.xwcmviewfieldinfo
-			(VIEWFIELDINFOID, TABLENAME, TABLEID, FIELDNAME, DBFIELDNAME, DBTYPE, DBLENGTH, ANOTHERNAME, FIELDTYPE, DBFIELD, CRUSER, CRTIME, VIEWID)
-	VALUES (viewFieldInfoIdOffset + 7, metableName, tableId, 'DocType', 'DocType', 4, 0, '文档类型', 45, dbfieldinfoOffset + 7, 'admin', '2018-09-20 14:50:32', viewId);
-
-	INSERT INTO trs_hycloud_iip.xwcmviewfieldinfo
-			(VIEWFIELDINFOID, TABLENAME, TABLEID, FIELDNAME, DBFIELDNAME, DBTYPE, DBLENGTH, ANOTHERNAME, FIELDTYPE, DBFIELD, CRUSER, CRTIME, VIEWID)
-	VALUES (viewFieldInfoIdOffset + 8, metableName, tableId,'DOCRELTIME', 'DOCRELTIME', 93, 0, '撰写时间', 11, dbfieldinfoOffset + 8, 'admin', '2018-09-20 14:50:32', viewId);
-
-	INSERT INTO trs_hycloud_iip.xwcmviewfieldinfo
-			(VIEWFIELDINFOID, TABLENAME, TABLEID, FIELDNAME, DBFIELDNAME, DBTYPE, DBLENGTH, ANOTHERNAME, FIELDTYPE, DBFIELD, CRUSER, CRTIME, VIEWID)
-	VALUES (viewFieldInfoIdOffset + 9, metableName, tableId, 'ThumbFiles', 'ThumbFiles', 12, 2000, '文档附图', 40, dbfieldinfoOffset + 9, 'admin', '2018-09-20 14:50:32', viewId);
-
 		set @sql = concat('alter table trs_hycloud_iip.wcmmetatable', metableName,
 											' add column OriginMetaDataId int(11) DEFAULT NULL,
      									add column FromType int(11) DEFAULT NULL,
@@ -103,6 +61,5 @@ CREATE PROCEDURE update_data_viewfield (
 		prepare stmt from @sql;
 		EXECUTE stmt;
 		deallocate prepare stmt;
-	commit;
 END $$
 DELIMITER;

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

@@ -0,0 +1,97 @@
+
+
+DROP PROCEDURE IF EXISTS update_data_table;
+DELIMITER $$
+CREATE PROCEDURE update_data_table(
+                                  IN citySuffix VARCHAR(255),
+                                  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;
+    DECLARE  f_ANOTHERNAME varchar(100) DEFAULT NULL;
+    DECLARE  f_TABLEDESC varchar(200) DEFAULT NULL;
+    DECLARE  f_CRUSER varchar(30) DEFAULT NULL;
+    DECLARE  f_CRTIME datetime DEFAULT NULL;
+    DECLARE  f_OWNERTYPE int(11) DEFAULT '1';
+    DECLARE  f_OWNERID int(11) DEFAULT '4';
+
+
+
+
+  DECLARE cur CURSOR FOR
+		SELECT
+      TABLEINFOID,
+      TABLENAME,
+      ANOTHERNAME,
+      TABLEDESC,
+      CRUSER,
+      CRTIME,
+      OWNERTYPE,
+      OWNERID
+    FROM xwcmtableinfo
+		ORDER BY TABLEINFOID asc;
+
+	DECLARE CONTINUE HANDLER FOR NOT FOUND SET isover = 1;
+
+	OPEN cur;
+
+	FETCH cur INTO
+    f_TABLEINFOID,
+    f_TABLENAME,
+    f_ANOTHERNAME,
+    f_TABLEDESC,
+    f_CRUSER,
+    f_CRTIME,
+    f_OWNERTYPE,
+    f_OWNERID
+    ;
+
+    select concat('开始修改 ', '视图字段') info;
+    WHILE isover= 0 DO
+
+      # 断点续传
+      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
+              select concat('正在修改 ', concat(f_TABLENAME, citySuffix)) info;
+
+              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);
+
+              call update_data_dbfield(concat(f_TABLENAME, citySuffix), f_TABLEINFOID, @max_dbfieldinfo_id);
+
+              SET @log_sql = build_migration_log_sql('update_data_viewfield', f_TABLEINFOID, now());
+              prepare stmt from @log_sql;
+              EXECUTE stmt;
+              deallocate prepare stmt;
+          end if;
+    END IF ;
+
+		FETCH cur INTO
+      f_TABLEINFOID,
+      f_TABLENAME,
+      f_ANOTHERNAME,
+      f_TABLEDESC,
+      f_CRUSER,
+      f_CRTIME,
+      f_OWNERTYPE,
+      f_OWNERID
+      ;
+		
+	END WHILE;
+
+	CLOSE cur;
+
+  END $$
+DELIMITER ;

+ 0 - 146
TRS.WCM.Developer/贵州项目/0_update_data_view.sql

@@ -1,146 +0,0 @@
-
-
-DROP PROCEDURE IF EXISTS update_data_view;
-DELIMITER $$
-CREATE PROCEDURE update_data_view(IN datasourcename VARCHAR(255),
-                                  IN citySuffix VARCHAR(255),
-                                  IN prevViewId 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_VIEWINFOID int(11) DEFAULT NULL;
-    DECLARE  f_VIEWNAME varchar(100) DEFAULT NULL;
-    DECLARE  f_VIEWDESC varchar(400) DEFAULT NULL;
-    DECLARE  f_MAINTABLENAME varchar(50) DEFAULT NULL;
-    DECLARE  f_MAINTABLEID int(11) DEFAULT NULL;
-    DECLARE  f_CRUSER varchar(30) DEFAULT NULL;
-    DECLARE  f_CRTIME datetime DEFAULT NULL;
-    DECLARE  f_OWNERTYPE int(11) DEFAULT '1';
-    DECLARE  f_OWNERID int(11) DEFAULT '4';
-    DECLARE  f_HIDDENAPPENDIX smallint(6) DEFAULT '0';
-    DECLARE  f_ISSPECIAL int(11) DEFAULT NULL;
-    DECLARE  f_VIEWCLASSID int(11) DEFAULT NULL;
-    DECLARE  f_VIEWDESCCON varchar(500) DEFAULT NULL;
-    DECLARE  f_METASYNFIELDS varchar(500) DEFAULT NULL;
-    DECLARE  f_TEMPLATEPATH varchar(50) DEFAULT NULL;
-    DECLARE  f_HIDDENFILEAPPENDIX smallint(6) DEFAULT '0';
-    DECLARE  f_HIDDENIMGAPPENDIX smallint(6) DEFAULT '0';
-    DECLARE  f_HIDDENLINKAPPENDIX smallint(6) DEFAULT '0';
-    DECLARE  f_Attribute varchar(500) DEFAULT NULL;
-
-
-
-
-  DECLARE cur CURSOR FOR
-		SELECT
-      VIEWINFOID,
-      VIEWNAME,
-      VIEWDESC,
-      MAINTABLENAME,
-      MAINTABLEID,
-      CRUSER,
-      CRTIME,
-      OWNERTYPE,
-      OWNERID,
-      HIDDENAPPENDIX,
-      ISSPECIAL,
-      VIEWCLASSID,
-      VIEWDESCCON,
-      METASYNFIELDS,
-      TEMPLATEPATH,
-      HIDDENFILEAPPENDIX,
-      HIDDENIMGAPPENDIX,
-      HIDDENLINKAPPENDIX,
-      null
-    FROM xwcmviewinfo
-		ORDER BY VIEWINFOID asc;
-
-	DECLARE CONTINUE HANDLER FOR NOT FOUND SET isover = 1;
-	
-	OPEN cur;
-	
-	FETCH cur INTO
-    f_VIEWINFOID,
-    f_VIEWNAME,
-    f_VIEWDESC,
-    f_MAINTABLENAME,
-    f_MAINTABLEID,
-    f_CRUSER,
-    f_CRTIME,
-    f_OWNERTYPE,
-    f_OWNERID,
-    f_HIDDENAPPENDIX,
-    f_ISSPECIAL,
-    f_VIEWCLASSID,
-    f_VIEWDESCCON,
-    f_METASYNFIELDS,
-    f_TEMPLATEPATH,
-    f_HIDDENFILEAPPENDIX,
-    f_HIDDENIMGAPPENDIX,
-    f_HIDDENLINKAPPENDIX,
-    f_Attribute
-    ;
-    select concat('开始修改 ', '视图字段') info;
-    WHILE isover= 0 DO
-
-      # 断点续传
-      IF (f_VIEWINFOID > prevViewId)
-
-        THEN
-          SET @metaTableExists = (SELECT count(1) from information_schema.tables where table_schema = datasourcename and table_name = concat('wcmmetatable', f_MAINTABLENAME, citySuffix) );
-
-          IF (@metaTableExists > 0)
-            then
-              select concat('正在修改 ', concat(f_MAINTABLENAME, citySuffix)) info;
-
-              SET @VIEWINFOID = f_VIEWINFOID;
-
-              SET @table_offset_num = ifnull((SELECT offset_num FROM data_migration_offset WHERE table_name = table_migr_table_name AND start_id < f_MAINTABLEID and  end_id >= f_MAINTABLEID), 0);
-              SET f_MAINTABLEID = f_MAINTABLEID + @table_offset_num;
-
-              SET @view_offset_num = ifnull((SELECT offset_num FROM data_migration_offset WHERE table_name = view_migr_table_name AND start_id < f_VIEWINFOID and  end_id >= f_VIEWINFOID), 0);
-              SET f_VIEWINFOID = f_VIEWINFOID + @view_offset_num;
-
-              set @max_viewfieldinfo_d = ifnull((SELECT MAX(VIEWFIELDINFOID) from trs_hycloud_iip.xwcmviewfieldinfo), 0);
-
-              set @max_dbfieldinfo_id = ifnull((SELECT MAX(DBFIELDINFOID) from trs_hycloud_iip.xwcmdbfieldinfo), 0);
-
-              call update_data_viewfield(concat(f_MAINTABLENAME, citySuffix), f_MAINTABLEID, f_VIEWINFOID, @max_dbfieldinfo_id, @max_viewfieldinfo_d);
-
-              SET @log_sql = build_migration_log_sql('update_data_viewfield', @VIEWINFOID, now());
-              prepare stmt from @log_sql;
-              EXECUTE stmt;
-              deallocate prepare stmt;
-          end if;
-    END IF ;
-
-		FETCH cur INTO
-      f_VIEWINFOID,
-      f_VIEWNAME,
-      f_VIEWDESC,
-      f_MAINTABLENAME,
-      f_MAINTABLEID,
-      f_CRUSER,
-      f_CRTIME,
-      f_OWNERTYPE,
-      f_OWNERID,
-      f_HIDDENAPPENDIX,
-      f_ISSPECIAL,
-      f_VIEWCLASSID,
-      f_VIEWDESCCON,
-      f_METASYNFIELDS,
-      f_TEMPLATEPATH,
-      f_HIDDENFILEAPPENDIX,
-      f_HIDDENIMGAPPENDIX,
-      f_HIDDENLINKAPPENDIX,
-      f_Attribute
-      ;
-		
-	END WHILE;
-
-
-  END $$
-DELIMITER ;

+ 2 - 2
TRS.WCM.Developer/贵州项目/readme.md

@@ -26,9 +26,9 @@
    * 将修改后,表名的元数据通过navicat 同步数据传输方式传入到trs_hycloud_iip数据库中。
    * 添加默认的元数据字段
    ```sql
-   SELECT prev_id from data_migration_log where table_name = 'xwcmviewinfo';
+   SELECT prev_id from data_migration_log where table_name = 'xwcmtableinfo';
 
-   call update_data_view('trs_hycloud_iip', '_city4', 迁移起始视图ID)
+   call update_data_table('_city4', 迁移起始tabelinfoID)
    ```
    * 执行迁移脚本
    ```sql