Merge remote-tracking branch 'origin/V0.0.2' into V0.0.2

project_data/sql/0.0.2/soc/soc.sql

@@ -979,112 +979,112 @@ IF
 	END IF;
 	ALTER TABLE core_protection MODIFY device_id BIGINT;
 	IF
-		NOT EXISTS ( SELECT * FROM INFORMATION_SCHEMA.COLUMNS WHERE TABLE_NAME = 'core_safety_task' AND COLUMN_NAME = 'des' ) THEN
+		NOT EXISTS ( SELECT * FROM INFORMATION_SCHEMA.COLUMNS WHERE  table_schema = DATABASE () and TABLE_NAME = 'core_safety_task' AND COLUMN_NAME = 'des' ) THEN
 			ALTER TABLE core_safety_task ADD COLUMN des VARCHAR ( 4000 ) COMMENT '备注';
 		
 	END IF;
 	IF
-		NOT EXISTS ( SELECT * FROM INFORMATION_SCHEMA.COLUMNS WHERE TABLE_NAME = 'sys_nfc_bind' AND COLUMN_NAME = 'label_name' ) THEN
+		NOT EXISTS ( SELECT * FROM INFORMATION_SCHEMA.COLUMNS WHERE  table_schema = DATABASE () and TABLE_NAME = 'sys_nfc_bind' AND COLUMN_NAME = 'label_name' ) THEN
 			ALTER TABLE sys_nfc_bind ADD COLUMN label_name VARCHAR ( 255 ) COMMENT '标签名称';
 		
 	END IF;
 	IF
-		EXISTS ( SELECT * FROM INFORMATION_SCHEMA.COLUMNS WHERE TABLE_NAME = 'sys_area_check' AND COLUMN_NAME = 'area_id' ) THEN
+		EXISTS ( SELECT * FROM INFORMATION_SCHEMA.COLUMNS WHERE table_schema = DATABASE () and  TABLE_NAME = 'sys_area_check' AND COLUMN_NAME = 'area_id' ) THEN
 			ALTER TABLE sys_area_check DROP COLUMN area_id;
 		
 	END IF;
 	IF
-		NOT EXISTS ( SELECT * FROM INFORMATION_SCHEMA.COLUMNS WHERE TABLE_NAME = 'core_safecheck_plan_to_point' AND COLUMN_NAME = 'required' ) THEN
+		NOT EXISTS ( SELECT * FROM INFORMATION_SCHEMA.COLUMNS WHERE  table_schema = DATABASE () and TABLE_NAME = 'core_safecheck_plan_to_point' AND COLUMN_NAME = 'required' ) THEN
 			ALTER TABLE core_safecheck_plan_to_point ADD COLUMN required TINYINT ( 1 ) COMMENT '是否必检';
 		
 	END IF;
 	IF
-		NOT EXISTS ( SELECT * FROM INFORMATION_SCHEMA.COLUMNS WHERE TABLE_NAME = 'core_safecheck_plan' AND COLUMN_NAME = 'distribute_status' ) THEN
+		NOT EXISTS ( SELECT * FROM INFORMATION_SCHEMA.COLUMNS WHERE table_schema = DATABASE () and  TABLE_NAME = 'core_safecheck_plan' AND COLUMN_NAME = 'distribute_status' ) THEN
 			ALTER TABLE core_safecheck_plan ADD COLUMN distribute_status TINYINT ( 1 ) COMMENT '下发状态';
 		
 	END IF;
 	IF
-		NOT EXISTS ( SELECT * FROM INFORMATION_SCHEMA.COLUMNS WHERE TABLE_NAME = 'core_safecheck_plan' AND COLUMN_NAME = 'distribute_plan_status' ) THEN
+		NOT EXISTS ( SELECT * FROM INFORMATION_SCHEMA.COLUMNS WHERE table_schema = DATABASE () and  TABLE_NAME = 'core_safecheck_plan' AND COLUMN_NAME = 'distribute_plan_status' ) THEN
 			ALTER TABLE core_safecheck_plan ADD COLUMN distribute_plan_status TINYINT ( 1 ) COMMENT '计划下发默认状态';
 		
 	END IF;
 	IF
-		NOT EXISTS ( SELECT * FROM INFORMATION_SCHEMA.COLUMNS WHERE TABLE_NAME = 'core_safecheck_plan' AND COLUMN_NAME = 'parent_id' ) THEN
+		NOT EXISTS ( SELECT * FROM INFORMATION_SCHEMA.COLUMNS WHERE table_schema = DATABASE () and  TABLE_NAME = 'core_safecheck_plan' AND COLUMN_NAME = 'parent_id' ) THEN
 			ALTER TABLE core_safecheck_plan ADD COLUMN parent_id TINYINT ( 1 ) COMMENT '计划下发默认状态';
 		
 	END IF;
 	IF
-		NOT EXISTS ( SELECT * FROM INFORMATION_SCHEMA.COLUMNS WHERE TABLE_NAME = 'core_resumption_data' AND COLUMN_NAME = 'data_status' ) THEN
+		NOT EXISTS ( SELECT * FROM INFORMATION_SCHEMA.COLUMNS WHERE  table_schema = DATABASE () and TABLE_NAME = 'core_resumption_data' AND COLUMN_NAME = 'data_status' ) THEN
 			ALTER TABLE core_resumption_data ADD COLUMN `data_status` INT NULL DEFAULT NULL COMMENT '数据状态：1保存未处理，2保存已处理';
 		
 	END IF;
 	IF
-		NOT EXISTS ( SELECT * FROM INFORMATION_SCHEMA.COLUMNS WHERE TABLE_NAME = 'sys_user' AND COLUMN_NAME = 'is_manage' ) THEN
+		NOT EXISTS ( SELECT * FROM INFORMATION_SCHEMA.COLUMNS WHERE  table_schema = DATABASE () and TABLE_NAME = 'sys_user' AND COLUMN_NAME = 'is_manage' ) THEN
 			ALTER TABLE sys_user ADD COLUMN `is_manage` VARCHAR ( 2 ) DEFAULT NULL COMMENT '是否管理人员：Y是，N否';
 		
 	END IF;
 	IF
-		NOT EXISTS ( SELECT * FROM INFORMATION_SCHEMA.COLUMNS WHERE TABLE_NAME = 'core_protection' AND COLUMN_NAME = 'alarm_host_id' ) THEN
+		NOT EXISTS ( SELECT * FROM INFORMATION_SCHEMA.COLUMNS WHERE  table_schema = DATABASE () and TABLE_NAME = 'core_protection' AND COLUMN_NAME = 'alarm_host_id' ) THEN
 			ALTER TABLE `core_protection` CHANGE COLUMN `alarm_host_code` `alarm_host_id` BIGINT NULL DEFAULT NULL COMMENT '报警主机id' AFTER `org_name`;
 		ALTER TABLE `core_protection_log` CHANGE COLUMN `alarm_host_code` `alarm_host_id` BIGINT NULL DEFAULT NULL COMMENT '报警主机id' AFTER `code`;
 		
 	END IF;
 	-- 安全检查是否下发标识
     IF
-        NOT EXISTS ( SELECT * FROM INFORMATION_SCHEMA.COLUMNS WHERE TABLE_NAME = 'core_safecheck_plan' AND COLUMN_NAME = 'distribute' ) THEN
+        NOT EXISTS ( SELECT * FROM INFORMATION_SCHEMA.COLUMNS WHERE  table_schema = DATABASE () and TABLE_NAME = 'core_safecheck_plan' AND COLUMN_NAME = 'distribute' ) THEN
         ALTER TABLE `core_safecheck_plan` ADD COLUMN `distribute` VARCHAR ( 2 ) DEFAULT NULL COMMENT '是否已下发';
 
     END IF;
 
 	-- 调阅计划是否立即生成任务
     IF
-NOT EXISTS ( SELECT * FROM INFORMATION_SCHEMA.COLUMNS WHERE TABLE_NAME = 'core_monitoring_retrieval_plan' AND COLUMN_NAME = 'immediately' ) THEN
+NOT EXISTS ( SELECT * FROM INFORMATION_SCHEMA.COLUMNS WHERE  table_schema = DATABASE () and TABLE_NAME = 'core_monitoring_retrieval_plan' AND COLUMN_NAME = 'immediately' ) THEN
 ALTER TABLE `core_monitoring_retrieval_plan` ADD COLUMN `immediately` bit(1) NULL DEFAULT NULL COMMENT '立即生成任务';
 
 END IF;
 -- 调阅任务绑定硬盘录像机
   IF
-NOT EXISTS ( SELECT * FROM INFORMATION_SCHEMA.COLUMNS WHERE TABLE_NAME = 'core_monitoring_task_registration_monitor' AND COLUMN_NAME = 'host_name' ) THEN
+NOT EXISTS ( SELECT * FROM INFORMATION_SCHEMA.COLUMNS WHERE  table_schema = DATABASE () and TABLE_NAME = 'core_monitoring_task_registration_monitor' AND COLUMN_NAME = 'host_name' ) THEN
 ALTER TABLE `core_monitoring_task_registration_monitor` ADD COLUMN `host_name` VARCHAR ( 255 ) DEFAULT NULL COMMENT '硬盘录像机';
 
 END IF;
 -- 调阅任务绑定摄像机
   IF
-NOT EXISTS ( SELECT * FROM INFORMATION_SCHEMA.COLUMNS WHERE TABLE_NAME = 'core_monitoring_task_registration_monitor' AND COLUMN_NAME = 'video_channel_name' ) THEN
+NOT EXISTS ( SELECT * FROM INFORMATION_SCHEMA.COLUMNS WHERE table_schema = DATABASE () and  TABLE_NAME = 'core_monitoring_task_registration_monitor' AND COLUMN_NAME = 'video_channel_name' ) THEN
 ALTER TABLE `core_monitoring_task_registration_monitor` ADD COLUMN `video_channel_name` VARCHAR ( 255 ) DEFAULT NULL COMMENT '摄像机';
 
 END IF;
 	-- 履职计划是否下发标识
     IF
-        NOT EXISTS ( SELECT * FROM INFORMATION_SCHEMA.COLUMNS WHERE TABLE_NAME = 'core_resumption_plan' AND COLUMN_NAME = 'distribute' ) THEN
+        NOT EXISTS ( SELECT * FROM INFORMATION_SCHEMA.COLUMNS WHERE  table_schema = DATABASE () and TABLE_NAME = 'core_resumption_plan' AND COLUMN_NAME = 'distribute' ) THEN
         ALTER TABLE `core_resumption_plan` ADD COLUMN `distribute` VARCHAR ( 2 ) DEFAULT NULL COMMENT '是否已下发';
 
     END IF;
 
     -- 履职计划立即生效标识
     IF
-        NOT EXISTS ( SELECT * FROM INFORMATION_SCHEMA.COLUMNS WHERE TABLE_NAME = 'core_resumption_plan' AND COLUMN_NAME = 'build_task_now' ) THEN
+        NOT EXISTS ( SELECT * FROM INFORMATION_SCHEMA.COLUMNS WHERE table_schema = DATABASE () and TABLE_NAME = 'core_resumption_plan' AND COLUMN_NAME = 'build_task_now' ) THEN
         ALTER TABLE `core_resumption_plan` ADD COLUMN `build_task_now` VARCHAR ( 2 ) DEFAULT NULL COMMENT '立即生效';
 
     END IF;
 
     -- 履职项所属机构id字段
     IF
-        NOT EXISTS ( SELECT * FROM INFORMATION_SCHEMA.COLUMNS WHERE TABLE_NAME = 'core_resumption_plan_to_point' AND COLUMN_NAME = 'of_org_id' ) THEN
+        NOT EXISTS ( SELECT * FROM INFORMATION_SCHEMA.COLUMNS WHERE table_schema = DATABASE () and  TABLE_NAME = 'core_resumption_plan_to_point' AND COLUMN_NAME = 'of_org_id' ) THEN
         ALTER TABLE `core_resumption_plan_to_point` ADD COLUMN `of_org_id` bigint NULL COMMENT '所属机构id';
 
     END IF;
 
     -- 履职计划所属机构类型
     IF
-        NOT EXISTS ( SELECT * FROM INFORMATION_SCHEMA.COLUMNS WHERE TABLE_NAME = 'core_resumption_plan' AND COLUMN_NAME = 'plan_of_org_type' ) THEN
+        NOT EXISTS ( SELECT * FROM INFORMATION_SCHEMA.COLUMNS WHERE table_schema = DATABASE () and  TABLE_NAME = 'core_resumption_plan' AND COLUMN_NAME = 'plan_of_org_type' ) THEN
         ALTER TABLE `core_resumption_plan` ADD COLUMN `plan_of_org_type` INT NULL DEFAULT NULL COMMENT '所属机构类型';
 
     END IF;
 	-- 履职任务NFC表增加submitby
     IF
-        NOT EXISTS ( SELECT * FROM INFORMATION_SCHEMA.COLUMNS WHERE TABLE_NAME = 'core_resumption_data_nfc' AND COLUMN_NAME = 'submit_by' ) THEN
-        ALTER TABLE `soc`.`core_resumption_data_nfc` ADD COLUMN `submit_by` bigint NULL COMMENT '提交人id' AFTER `submit_time`;
+        NOT EXISTS ( SELECT * FROM INFORMATION_SCHEMA.COLUMNS WHERE table_schema = DATABASE () and TABLE_NAME = 'core_resumption_data_nfc' AND COLUMN_NAME = 'submit_by' ) THEN
+        ALTER TABLE `core_resumption_data_nfc` ADD COLUMN `submit_by` bigint NULL COMMENT '提交人id' AFTER `submit_time`;
 
     END IF;
 	ALTER TABLE `core_protection` MODIFY COLUMN `device_id` BIGINT NULL DEFAULT NULL COMMENT '设备ID' AFTER `id`;