From 07ade06d18aceb1ac72c77ee570a1f2ecc03f588 Mon Sep 17 00:00:00 2001 From: TsMask <340112800@qq.com> Date: Wed, 19 Jun 2024 11:49:09 +0800 Subject: [PATCH] =?UTF-8?q?sql:=20=E7=A7=BB=E9=99=A4omc=5Fdb=E7=9A=84?= =?UTF-8?q?=E5=BA=93=E6=8C=87=E5=AE=9A?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- database/common/kpi_title.sql | 18 +- database/install/sys_job.sql | 46 ++-- database/install/sys_role_dept.sql | 33 +-- database/install/sys_user.sql | 2 +- database/upgrade/upg_alarm_event.sql | 7 +- database/upgrade/upg_sys_job.sql | 347 ++----------------------- database/upgrade/upg_sys_role_dept.sql | 11 +- database/upgrade/upg_sys_user.sql | 36 ++- database/upgrade/upg_sys_user_post.sql | 17 +- database/upgrade/zupgrade.sql | 81 ++---- 10 files changed, 96 insertions(+), 502 deletions(-) diff --git a/database/common/kpi_title.sql b/database/common/kpi_title.sql index 93b4cf94..e9b22139 100644 --- a/database/common/kpi_title.sql +++ b/database/common/kpi_title.sql @@ -21,16 +21,16 @@ SET FOREIGN_KEY_CHECKS = 0; -- Table structure for kpi_title -- ---------------------------- DROP TABLE IF EXISTS `kpi_title`; -CREATE TABLE `kpi_title` ( - `id` int(11) NOT NULL AUTO_INCREMENT, - `ne_type` varchar(16) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL, - `kpi_id` varchar(16) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL, - `title_json` longtext CHARACTER SET utf8mb4 COLLATE utf8mb4_bin NULL DEFAULT NULL, - `cn_title` varchar(255) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL, - `en_title` varchar(255) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL, +CREATE TABLE `kpi_title` ( + `id` int NOT NULL AUTO_INCREMENT, + `ne_type` varchar(16) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci DEFAULT NULL, + `kpi_id` varchar(16) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci DEFAULT NULL, + `title_json` longtext CHARACTER SET utf8mb4 COLLATE utf8mb4_bin, + `cn_title` varchar(255) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci DEFAULT NULL, + `en_title` varchar(255) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci DEFAULT NULL, PRIMARY KEY (`id`) USING BTREE, - INDEX `idx_kpi_id`(`kpi_id`) USING BTREE -) ENGINE = InnoDB AUTO_INCREMENT = 853 CHARACTER SET = utf8mb4 COLLATE = utf8mb4_general_ci ROW_FORMAT = Dynamic; + KEY `idx_ntype_kid` (`ne_type`,`kpi_id`) USING BTREE +) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_general_ci; -- ---------------------------- -- Records of kpi_title diff --git a/database/install/sys_job.sql b/database/install/sys_job.sql index 9a19829a..45fe3456 100644 --- a/database/install/sys_job.sql +++ b/database/install/sys_job.sql @@ -1,19 +1,3 @@ -/* - Navicat Premium Data Transfer - - Source Server : local_mariadb - Source Server Type : MariaDB - Source Server Version : 100338 (10.3.38-MariaDB) - Source Host : localhost:33066 - Source Schema : omc_db - - Target Server Type : MariaDB - Target Server Version : 100338 (10.3.38-MariaDB) - File Encoding : 65001 - - Date: 28/04/2024 16:05:50 -*/ - SET NAMES utf8mb4; SET FOREIGN_KEY_CHECKS = 0; @@ -21,25 +5,25 @@ SET FOREIGN_KEY_CHECKS = 0; -- Table structure for sys_job -- ---------------------------- DROP TABLE IF EXISTS `sys_job`; -CREATE TABLE `sys_job` ( - `job_id` bigint(20) NOT NULL AUTO_INCREMENT COMMENT '任务ID', +CREATE TABLE `sys_job` ( + `job_id` bigint NOT NULL AUTO_INCREMENT COMMENT '任务ID', `job_name` varchar(50) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NOT NULL DEFAULT '' COMMENT '任务名称', `job_group` varchar(50) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NOT NULL DEFAULT 'DEFAULT' COMMENT '任务组名', `invoke_target` varchar(50) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NOT NULL COMMENT '调用目标字符串', - `target_params` varchar(500) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT '' COMMENT '调用目标传入参数', - `cron_expression` varchar(50) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT '' COMMENT 'cron执行表达式', - `misfire_policy` char(1) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT '3' COMMENT '计划执行错误策略（1立即执行 2执行一次 3放弃执行）', - `concurrent` char(1) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT '0' COMMENT '是否并发执行（0禁止 1允许）', - `status` char(1) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT '0' COMMENT '任务状态（0暂停 1正常）', - `save_log` varchar(1) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT '0' COMMENT '是否记录任务日志（0不记录 1记录）', - `create_by` varchar(50) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT '' COMMENT '创建者', - `create_time` bigint(20) NULL DEFAULT 0 COMMENT '创建时间', - `update_by` varchar(50) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT '' COMMENT '更新者', - `update_time` bigint(20) NULL DEFAULT 0 COMMENT '更新时间', - `remark` varchar(500) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT '' COMMENT '备注', + `target_params` varchar(500) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci DEFAULT '' COMMENT '调用目标传入参数', + `cron_expression` varchar(50) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci DEFAULT '' COMMENT 'cron执行表达式', + `misfire_policy` char(1) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci DEFAULT '3' COMMENT '计划执行错误策略（1立即执行 2执行一次 3放弃执行）', + `concurrent` char(1) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci DEFAULT '0' COMMENT '是否并发执行（0禁止 1允许）', + `status` char(1) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci DEFAULT '0' COMMENT '任务状态（0暂停 1正常）', + `save_log` varchar(1) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci DEFAULT '0' COMMENT '是否记录任务日志（0不记录 1记录）', + `create_by` varchar(50) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci DEFAULT '' COMMENT '创建者', + `create_time` bigint DEFAULT '0' COMMENT '创建时间', + `update_by` varchar(50) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci DEFAULT '' COMMENT '更新者', + `update_time` bigint DEFAULT '0' COMMENT '更新时间', + `remark` varchar(500) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci DEFAULT '' COMMENT '备注', PRIMARY KEY (`job_id`) USING BTREE, - UNIQUE INDEX `idx_uni_name_group`(`job_name`, `job_group`) USING BTREE COMMENT 'unique index for job_name and job_group' -) ENGINE = InnoDB CHARACTER SET = utf8mb4 COLLATE = utf8mb4_general_ci COMMENT = '调度任务调度表' ROW_FORMAT = Dynamic; + UNIQUE KEY `idx_uni_name_group` (`job_name`,`job_group`) USING BTREE COMMENT 'unique index for job_name and job_group' +) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_general_ci COMMENT='调度任务调度表'; -- ---------------------------- -- Records of sys_job diff --git a/database/install/sys_role_dept.sql b/database/install/sys_role_dept.sql index a1a72f19..18311f86 100644 --- a/database/install/sys_role_dept.sql +++ b/database/install/sys_role_dept.sql @@ -1,50 +1,19 @@ --- MariaDB dump 10.19 Distrib 10.6.16-MariaDB, for debian-linux-gnu (x86_64) --- --- Host: 192.168.2.219 Database: omc_db --- ------------------------------------------------------ --- Server version 10.3.38-MariaDB - -/*!40101 SET @OLD_CHARACTER_SET_CLIENT=@@CHARACTER_SET_CLIENT */; -/*!40101 SET @OLD_CHARACTER_SET_RESULTS=@@CHARACTER_SET_RESULTS */; -/*!40101 SET @OLD_COLLATION_CONNECTION=@@COLLATION_CONNECTION */; -/*!40101 SET NAMES utf8mb4 */; -/*!40103 SET @OLD_TIME_ZONE=@@TIME_ZONE */; -/*!40103 SET TIME_ZONE='+00:00' */; -/*!40014 SET @OLD_UNIQUE_CHECKS=@@UNIQUE_CHECKS, UNIQUE_CHECKS=0 */; -/*!40014 SET @OLD_FOREIGN_KEY_CHECKS=@@FOREIGN_KEY_CHECKS, FOREIGN_KEY_CHECKS=0 */; -/*!40101 SET @OLD_SQL_MODE=@@SQL_MODE, SQL_MODE='NO_AUTO_VALUE_ON_ZERO' */; -/*!40111 SET @OLD_SQL_NOTES=@@SQL_NOTES, SQL_NOTES=0 */; - -- -- Table structure for table `sys_role_dept` -- DROP TABLE IF EXISTS `sys_role_dept`; -/*!40101 SET @saved_cs_client = @@character_set_client */; -/*!40101 SET character_set_client = utf8 */; CREATE TABLE `sys_role_dept` ( `role_id` bigint(20) NOT NULL COMMENT '角色ID', `dept_id` bigint(20) NOT NULL COMMENT '部门ID', PRIMARY KEY (`role_id`,`dept_id`) USING BTREE ) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_general_ci ROW_FORMAT=DYNAMIC COMMENT='角色和部门关联表'; -/*!40101 SET character_set_client = @saved_cs_client */; + -- -- Dumping data for table `sys_role_dept` -- LOCK TABLES `sys_role_dept` WRITE; -/*!40000 ALTER TABLE `sys_role_dept` DISABLE KEYS */; -/*!40000 ALTER TABLE `sys_role_dept` ENABLE KEYS */; UNLOCK TABLES; -/*!40103 SET TIME_ZONE=@OLD_TIME_ZONE */; - -/*!40101 SET SQL_MODE=@OLD_SQL_MODE */; -/*!40014 SET FOREIGN_KEY_CHECKS=@OLD_FOREIGN_KEY_CHECKS */; -/*!40014 SET UNIQUE_CHECKS=@OLD_UNIQUE_CHECKS */; -/*!40101 SET CHARACTER_SET_CLIENT=@OLD_CHARACTER_SET_CLIENT */; -/*!40101 SET CHARACTER_SET_RESULTS=@OLD_CHARACTER_SET_RESULTS */; -/*!40101 SET COLLATION_CONNECTION=@OLD_COLLATION_CONNECTION */; -/*!40111 SET SQL_NOTES=@OLD_SQL_NOTES */; - -- Dump completed on 2024-03-06 17:27:00 diff --git a/database/install/sys_user.sql b/database/install/sys_user.sql index 46859488..50a8cf51 100644 --- a/database/install/sys_user.sql +++ b/database/install/sys_user.sql @@ -26,7 +26,7 @@ CREATE TABLE `sys_user` ( `update_time` bigint DEFAULT '0' COMMENT '更新时间', `remark` varchar(500) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci DEFAULT '' COMMENT '备注', PRIMARY KEY (`user_id`) USING BTREE -) ENGINE=InnoDB AUTO_INCREMENT=100 DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_general_ci ROW_FORMAT=DYNAMIC COMMENT='用户信息表'; +) ENGINE=InnoDB AUTO_INCREMENT=100 DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_general_ci COMMENT='用户信息表'; -- -- Dumping data for table `sys_user` diff --git a/database/upgrade/upg_alarm_event.sql b/database/upgrade/upg_alarm_event.sql index eb1b54b7..4831afeb 100644 --- a/database/upgrade/upg_alarm_event.sql +++ b/database/upgrade/upg_alarm_event.sql @@ -62,8 +62,7 @@ CREATE TABLE IF NOT EXISTS `alarm_event` ( -- Move event alarm from table alarm to alarm_event START TRANSACTION; -INSERT INTO - `omc_db`.`alarm_event` ( +INSERT INTO `alarm_event` ( `alarm_seq`, `alarm_id`, `alarm_title`, @@ -126,11 +125,11 @@ SELECT `clear_time`, `clear_user`, `timestamp` -FROM `omc_db`.`alarm` +FROM `alarm` WHERE `orig_severity` = 'Event'; -DELETE FROM `omc_db`.`alarm` WHERE `orig_severity` = 'Event'; +DELETE FROM `alarm` WHERE `orig_severity` = 'Event'; COMMIT; diff --git a/database/upgrade/upg_sys_job.sql b/database/upgrade/upg_sys_job.sql index 947730e6..b8a408d6 100644 --- a/database/upgrade/upg_sys_job.sql +++ b/database/upgrade/upg_sys_job.sql @@ -1,344 +1,31 @@ -/* - Navicat Premium Data Transfer - - Source Server : local_mariadb - Source Server Type : MariaDB - Source Server Version : 100338 (10.3.38-MariaDB) - Source Host : localhost:33066 - Source Schema : omc_db - - Target Server Type : MariaDB - Target Server Version : 100338 (10.3.38-MariaDB) - File Encoding : 65001 - - Date: 25/10/2023 18:24:04 - */ SET NAMES utf8mb4; SET FOREIGN_KEY_CHECKS = 0; + -- ---------------------------- -- Table structure for sys_job -- ---------------------------- -CREATE TABLE IF NOT EXISTS `omc_db`.`sys_job` ( - `job_id` bigint(20) NOT NULL AUTO_INCREMENT COMMENT '任务ID', +CREATE TABLE IF NOT EXISTS `sys_job` ( + `job_id` bigint NOT NULL AUTO_INCREMENT COMMENT '任务ID', `job_name` varchar(50) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NOT NULL DEFAULT '' COMMENT '任务名称', `job_group` varchar(50) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NOT NULL DEFAULT 'DEFAULT' COMMENT '任务组名', `invoke_target` varchar(50) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NOT NULL COMMENT '调用目标字符串', - `target_params` varchar(500) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT '' COMMENT '调用目标传入参数', - `cron_expression` varchar(50) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT '' COMMENT 'cron执行表达式', - `misfire_policy` char(1) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT '3' COMMENT '计划执行错误策略（1立即执行 2执行一次 3放弃执行）', - `concurrent` char(1) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT '0' COMMENT '是否并发执行（0禁止 1允许）', - `status` char(1) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT '0' COMMENT '任务状态（0暂停 1正常）', - `save_log` varchar(1) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT '0' COMMENT '是否记录任务日志（0不记录 1记录）', - `create_by` varchar(50) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT '' COMMENT '创建者', - `create_time` bigint(20) NULL DEFAULT 0 COMMENT '创建时间', - `update_by` varchar(50) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT '' COMMENT '更新者', - `update_time` bigint(20) NULL DEFAULT 0 COMMENT '更新时间', - `remark` varchar(500) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT '' COMMENT '备注', - PRIMARY KEY (`job_id`, `job_name`, `job_group`) USING BTREE -) ENGINE = InnoDB AUTO_INCREMENT = 8 CHARACTER SET = utf8mb4 COLLATE = utf8mb4_general_ci COMMENT = '调度任务调度表' ROW_FORMAT = Dynamic; - -ALTER TABLE - `omc_db`.`sys_job` DROP PRIMARY KEY, -ADD - PRIMARY KEY (`job_id`) USING BTREE, -ADD - UNIQUE INDEX IF NOT EXISTS `idx_uni_name_group`(`job_name`, `job_group`) USING BTREE COMMENT 'unique index for job_name and job_group'; + `target_params` varchar(500) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci DEFAULT '' COMMENT '调用目标传入参数', + `cron_expression` varchar(50) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci DEFAULT '' COMMENT 'cron执行表达式', + `misfire_policy` char(1) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci DEFAULT '3' COMMENT '计划执行错误策略（1立即执行 2执行一次 3放弃执行）', + `concurrent` char(1) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci DEFAULT '0' COMMENT '是否并发执行（0禁止 1允许）', + `status` char(1) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci DEFAULT '0' COMMENT '任务状态（0暂停 1正常）', + `save_log` varchar(1) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci DEFAULT '0' COMMENT '是否记录任务日志（0不记录 1记录）', + `create_by` varchar(50) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci DEFAULT '' COMMENT '创建者', + `create_time` bigint DEFAULT '0' COMMENT '创建时间', + `update_by` varchar(50) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci DEFAULT '' COMMENT '更新者', + `update_time` bigint DEFAULT '0' COMMENT '更新时间', + `remark` varchar(500) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci DEFAULT '' COMMENT '备注', + PRIMARY KEY (`job_id`) USING BTREE, + UNIQUE KEY `idx_uni_name_group` (`job_name`,`job_group`) USING BTREE COMMENT 'unique index for job_name and job_group' +) ENGINE=InnoDB AUTO_INCREMENT=11 DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_general_ci COMMENT='调度任务调度表'; -- ---------------------------- -- Records of sys_job -- ---------------------------- -INSERT IGNORE INTO - `omc_db`.`sys_job` ( - `job_id`, - `job_name`, - `job_group`, - `invoke_target`, - `target_params`, - `cron_expression`, - `misfire_policy`, - `concurrent`, - `status`, - `save_log`, - `create_by`, - `create_time`, - `update_by`, - `update_time`, - `remark` - ) -VALUES ( - 1, - 'job.monitor_sys_resource', - 'SYSTEM', - 'monitor_sys_resource', - '{\"interval\":5}', - '0 0/5 * * * ?', - '3', - '0', - '1', - '0', - 'supervisor', - 1698478134839, - 'supervisor', - 1700571615807, - 'job.monitor_sys_resource_remark' - ); -INSERT IGNORE INTO - `omc_db`.`sys_job` ( - `job_id`, - `job_name`, - `job_group`, - `invoke_target`, - `target_params`, - `cron_expression`, - `misfire_policy`, - `concurrent`, - `status`, - `save_log`, - `create_by`, - `create_time`, - `update_by`, - `update_time`, - `remark` - ) -VALUES ( - 4, - 'job.delExpiredNeBackup', - 'SYSTEM', - 'delExpiredNeBackup', - '{\"duration\":60}', - '0 20 0 * * ?', - '3', - '0', - '1', - '1', - 'supervisor', - 1698478134840, - NULL, - 0, - 'job.delExpiredNeBackupRemark' - ); - -INSERT IGNORE INTO - `omc_db`.`sys_job` ( - `job_id`, - `job_name`, - `job_group`, - `invoke_target`, - `target_params`, - `cron_expression`, - `misfire_policy`, - `concurrent`, - `status`, - `save_log`, - `create_by`, - `create_time`, - `update_by`, - `update_time`, - `remark` - ) -VALUES ( - 5, - 'job.deleteExpiredAlarmRecord', - 'SYSTEM', - 'deleteExpiredRecord', - '{\"duration\":90,\"tableName\":\"alarm\",\"colName\":\"event_time\",\"extras\":\"alarm_status=\'0\'\"}', - '0 10 0 * * ?', - '3', - '0', - '1', - '1', - 'supervisor', - 1698478134841, - NULL, - 0, - 'job.deleteExpiredAlarmRecordRemark' - ); - -INSERT IGNORE INTO - `omc_db`.`sys_job` ( - `job_id`, - `job_name`, - `job_group`, - `invoke_target`, - `target_params`, - `cron_expression`, - `misfire_policy`, - `concurrent`, - `status`, - `save_log`, - `create_by`, - `create_time`, - `update_by`, - `update_time`, - `remark` - ) -VALUES ( - 6, - 'job.deleteExpiredKpiRecord', - 'SYSTEM', - 'deleteExpiredRecord', - '{\"duration\":30,\"tableName\":\"gold_kpi\",\"colName\":\"date\"}', - '0 15 0 * * ?', - '3', - '0', - '1', - '1', - 'supervisor', - 1698478134842, - 'supervisor', - 1700570673113, - 'job.deleteExpiredKpiRecordRemark' - ); - -INSERT IGNORE INTO - `omc_db`.`sys_job` ( - `job_id`, - `job_name`, - `job_group`, - `invoke_target`, - `target_params`, - `cron_expression`, - `misfire_policy`, - `concurrent`, - `status`, - `save_log`, - `create_by`, - `create_time`, - `update_by`, - `update_time`, - `remark` - ) -VALUES ( - 7, - 'job.backupEtcFromNE', - 'SYSTEM', - 'backupEtcFromNE', - NULL, - '0 30 0 * * ?', - '3', - '0', - '1', - '1', - 'supervisor', - 1698478134843, - NULL, - 0, - 'job.backupEtcFromNERemark' - ); - -INSERT IGNORE INTO - `omc_db`.`sys_job` ( - `job_id`, - `job_name`, - `job_group`, - `invoke_target`, - `target_params`, - `cron_expression`, - `misfire_policy`, - `concurrent`, - `status`, - `save_log`, - `create_by`, - `create_time`, - `update_by`, - `update_time`, - `remark` - ) -VALUES ( - 8, - 'job.deleteExpiredNeStateRecord', - 'SYSTEM', - 'deleteExpiredRecord', - '{\"duration\":7,\"tableName\":\"ne_state\",\"colName\":\"timestamp\"}', - '0 25 0 * * ?', - '3', - '0', - '1', - '1', - 'supervisor', - 1698478134842, - 'admin', - 1703668901929, - 'job.deleteExpiredNeStateRecordRemark' - ); - -INSERT IGNORE INTO - `omc_db`.`sys_job` ( - `job_id`, - `job_name`, - `job_group`, - `invoke_target`, - `target_params`, - `cron_expression`, - `misfire_policy`, - `concurrent`, - `status`, - `save_log`, - `create_by`, - `create_time`, - `update_by`, - `update_time`, - `remark` - ) -VALUES ( - 9, - 'job.getStateFromNE', - 'SYSTEM', - 'getStateFromNE', - '', - '0/10 * * * * ?', - '3', - '0', - '1', - '0', - 'supervisor', - 1698478134842, - 'admin', - 1703669877919, - 'job.getStateFromNERemark' - ); - -INSERT IGNORE INTO - `omc_db`.`sys_job` ( - `job_id`, - `job_name`, - `job_group`, - `invoke_target`, - `target_params`, - `cron_expression`, - `misfire_policy`, - `concurrent`, - `status`, - `save_log`, - `create_by`, - `create_time`, - `update_by`, - `update_time`, - `remark` - ) -VALUES ( - 10, - 'job.genNeStateAlarm', - 'SYSTEM', - 'genNeStateAlarm', - '{\"alarmID\":\"HXEMSSM10000\",\"alarmCode\":10000,\"alarmTitle\":\"The system state is abnormal\",\"neType\":\"OMC\",\"alarmType\":\"EquipmentAlarm\",\"origSeverity\": \"Major\",\"objectName\":\"EMS;SystemManagement;Heartbeat\",\"objectType\":\"SystemState\",\"specificProblem\":\"Alarm cause: the system state of target NE has not been received for {threshold} seconds\", \"specificProblemID\":\"AC10000\",\"threshold\":30}', - '0/5 * * * * ?', - '3', - '0', - '1', - '0', - 'supervisor', - 1698478134842, - 'admin', - 1703768623188, - 'job.genNeStateAlarmRemark' - ); - -UPDATE `omc_db`.`sys_job` -SET - `target_params` = '{\"duration\":1,\"tableName\":\"ne_state\",\"colName\":\"timestamp\"}' -WHERE - `job_id` = 8; - SET FOREIGN_KEY_CHECKS = 1; \ No newline at end of file diff --git a/database/upgrade/upg_sys_role_dept.sql b/database/upgrade/upg_sys_role_dept.sql index 2583b7e1..9664021e 100644 --- a/database/upgrade/upg_sys_role_dept.sql +++ b/database/upgrade/upg_sys_role_dept.sql @@ -1,10 +1,9 @@ SET FOREIGN_KEY_CHECKS=0; -CREATE TABLE - IF NOT EXISTS `omc_db`.`sys_role_dept` ( - `role_id` bigint(20) NOT NULL COMMENT '角色ID', - `dept_id` bigint(20) NOT NULL COMMENT '部门ID', - PRIMARY KEY (`role_id`, `dept_id`) USING BTREE - ) ENGINE = InnoDB CHARACTER SET = utf8mb4 COLLATE = utf8mb4_general_ci COMMENT = '角色和部门关联表' ROW_FORMAT = Dynamic; +CREATE TABLE IF NOT EXISTS `sys_role_dept` ( + `role_id` bigint NOT NULL COMMENT '角色ID', + `dept_id` bigint NOT NULL COMMENT '部门ID', + PRIMARY KEY (`role_id`,`dept_id`) USING BTREE +) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_general_ci COMMENT='角色和部门关联表'; SET FOREIGN_KEY_CHECKS=1; \ No newline at end of file diff --git a/database/upgrade/upg_sys_user.sql b/database/upgrade/upg_sys_user.sql index 28364360..547aa13d 100644 --- a/database/upgrade/upg_sys_user.sql +++ b/database/upgrade/upg_sys_user.sql @@ -1,6 +1,6 @@ SET FOREIGN_KEY_CHECKS=0; -CREATE TABLE IF NOT EXISTS `omc_db`.`sys_user` ( +CREATE TABLE IF NOT EXISTS `sys_user` ( `user_id` bigint NOT NULL AUTO_INCREMENT COMMENT '用户ID', `dept_id` bigint DEFAULT '0' COMMENT '部门ID', `user_name` varchar(36) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NOT NULL DEFAULT '' COMMENT '用户账号', @@ -21,10 +21,9 @@ CREATE TABLE IF NOT EXISTS `omc_db`.`sys_user` ( `update_time` bigint DEFAULT '0' COMMENT '更新时间', `remark` varchar(500) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci DEFAULT '' COMMENT '备注', PRIMARY KEY (`user_id`) USING BTREE -) ENGINE=InnoDB AUTO_INCREMENT=100 DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_general_ci ROW_FORMAT=DYNAMIC COMMENT='用户信息表'; +) ENGINE=InnoDB AUTO_INCREMENT=100 DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_general_ci COMMENT='用户信息表'; -INSERT IGNORE INTO - `omc_db`.`sys_user` ( +INSERT IGNORE INTO `sys_user` ( `user_id`, `dept_id`, `user_name`, @@ -47,7 +46,7 @@ INSERT IGNORE INTO ) VALUES ( 1, - NULL, + '100', 'supervisor', 'supervisor', 'sys', @@ -67,8 +66,7 @@ VALUES ( '' ); -INSERT IGNORE INTO - `omc_db`.`sys_user` ( +INSERT IGNORE INTO `sys_user` ( `user_id`, `dept_id`, `user_name`, @@ -91,7 +89,7 @@ INSERT IGNORE INTO ) VALUES ( 2, - NULL, + '100', 'admin', 'admin', 'sys', @@ -111,8 +109,7 @@ VALUES ( '' ); -INSERT IGNORE INTO - `omc_db`.`sys_user` ( +INSERT IGNORE INTO `sys_user` ( `user_id`, `dept_id`, `user_name`, @@ -135,7 +132,7 @@ INSERT IGNORE INTO ) VALUES ( 103, - NULL, + '100', 'manager', 'manager', 'sys', @@ -155,8 +152,7 @@ VALUES ( 'manager' ); -INSERT IGNORE INTO - `omc_db`.`sys_user` ( +INSERT IGNORE INTO `sys_user` ( `user_id`, `dept_id`, `user_name`, @@ -179,7 +175,7 @@ INSERT IGNORE INTO ) VALUES ( 104, - NULL, + '100', 'monitor', 'monitor', 'sys', @@ -200,11 +196,11 @@ VALUES ( ); -- 20240508 -ALTER TABLE `omc_db`.`sys_user` MODIFY COLUMN `dept_id` bigint NULL DEFAULT 0 COMMENT '部门ID' AFTER `user_id`; -ALTER TABLE `omc_db`.`sys_user` MODIFY COLUMN `user_name` varchar(36) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NOT NULL DEFAULT '' COMMENT '用户账号' AFTER `dept_id`; -ALTER TABLE `omc_db`.`sys_user` MODIFY COLUMN `nick_name` varchar(36) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NOT NULL DEFAULT '' COMMENT '用户昵称' AFTER `user_name`; -ALTER TABLE `omc_db`.`sys_user` MODIFY COLUMN `email` varchar(64) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT '' COMMENT '用户邮箱' AFTER `user_type`; -ALTER TABLE `omc_db`.`sys_user` MODIFY COLUMN `phonenumber` varchar(16) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT '' COMMENT '手机号码' AFTER `email`; -ALTER TABLE `omc_db`.`sys_user` MODIFY COLUMN `remark` varchar(500) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT '' COMMENT '备注' AFTER `update_time`; +ALTER TABLE `sys_user` MODIFY COLUMN `dept_id` bigint NULL DEFAULT 0 COMMENT '部门ID' AFTER `user_id`; +ALTER TABLE `sys_user` MODIFY COLUMN `user_name` varchar(36) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NOT NULL DEFAULT '' COMMENT '用户账号' AFTER `dept_id`; +ALTER TABLE `sys_user` MODIFY COLUMN `nick_name` varchar(36) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NOT NULL DEFAULT '' COMMENT '用户昵称' AFTER `user_name`; +ALTER TABLE `sys_user` MODIFY COLUMN `email` varchar(64) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT '' COMMENT '用户邮箱' AFTER `user_type`; +ALTER TABLE `sys_user` MODIFY COLUMN `phonenumber` varchar(16) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT '' COMMENT '手机号码' AFTER `email`; +ALTER TABLE `sys_user` MODIFY COLUMN `remark` varchar(500) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT '' COMMENT '备注' AFTER `update_time`; SET FOREIGN_KEY_CHECKS=1; \ No newline at end of file diff --git a/database/upgrade/upg_sys_user_post.sql b/database/upgrade/upg_sys_user_post.sql index 5b7eea76..6f782221 100644 --- a/database/upgrade/upg_sys_user_post.sql +++ b/database/upgrade/upg_sys_user_post.sql @@ -1,14 +1,11 @@ SET FOREIGN_KEY_CHECKS=0; -DROP TABLE IF EXISTS `omc_db`.`sys_user_post`; -CREATE TABLE `omc_db`.`sys_user_post` ( - `user_id` bigint(20) NOT NULL COMMENT '用户ID', - `post_id` bigint(20) NOT NULL COMMENT '岗位ID', - PRIMARY KEY (`user_id`, `post_id`) USING BTREE - ) ENGINE = InnoDB CHARACTER SET = utf8mb4 COLLATE = utf8mb4_general_ci COMMENT = '用户与岗位关联表' ROW_FORMAT = Dynamic; - -INSERT IGNORE INTO - `omc_db`.`sys_user_post` (`user_id`, `post_id`) -VALUES (1, 1); +CREATE TABLE IF NOT EXISTS `sys_user_post` ( + `user_id` bigint NOT NULL COMMENT '用户ID', + `post_id` bigint NOT NULL COMMENT '岗位ID', + PRIMARY KEY (`user_id`,`post_id`) USING BTREE +) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_general_ci COMMENT='用户与岗位关联表'; + +INSERT IGNORE INTO `sys_user_post` VALUES (1,1),(2,2); SET FOREIGN_KEY_CHECKS=1; \ No newline at end of file diff --git a/database/upgrade/zupgrade.sql b/database/upgrade/zupgrade.sql index 9602307e..f1ae3e39 100644 --- a/database/upgrade/zupgrade.sql +++ b/database/upgrade/zupgrade.sql @@ -1,114 +1,77 @@ DROP TRIGGER IF EXISTS `tg_account_menu`; -ALTER TABLE `omc_db`.`gold_kpi` +ALTER TABLE `gold_kpi` MODIFY COLUMN `value` bigint NULL DEFAULT 0 AFTER `kpi_id`; -ALTER TABLE `omc_db`.`ne_link` DROP INDEX IF EXISTS `idx_netype_neid`; +ALTER TABLE `ne_link` DROP INDEX IF EXISTS `idx_netype_neid`; -ALTER TABLE `omc_db`.`config` -ADD COLUMN IF NOT EXISTS `comment` varchar(255) NULL AFTER `update_time`; - -ALTER TABLE `omc_db`.`nbi_operation_log` +ALTER TABLE `nbi_operation_log` MODIFY COLUMN `created_at` datetime NULL DEFAULT NULL AFTER `log_time`; -ALTER TABLE `omc_db`.`alarm_log` +ALTER TABLE `alarm_log` ADD COLUMN IF NOT EXISTS `alarm_seq` int NULL AFTER `ne_id`; -ALTER TABLE `omc_db`.`nbi_alarm_log` +ALTER TABLE `nbi_alarm_log` ADD COLUMN IF NOT EXISTS `alarm_status` int NULL COMMENT '0/1: 清除告警/活动告警' AFTER `alarm_code`; -ALTER TABLE `omc_db`.`cert_info` DROP INDEX IF EXISTS `idx_netype_neid`; +ALTER TABLE `cert_info` DROP INDEX IF EXISTS `idx_netype_neid`; -ALTER TABLE `omc_db`.`measure_threshold` +ALTER TABLE `measure_threshold` CHANGE COLUMN IF EXISTS `alarm_id` `alarm_code` varchar(16) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT '10200' AFTER `orig_severity`; -ALTER TABLE `omc_db`.`measure_task` +ALTER TABLE `measure_task` ADD COLUMN IF NOT EXISTS `account_id` varchar(32) NULL AFTER `status`, ADD COLUMN IF NOT EXISTS `comment` varchar(255) NULL AFTER `account_id`; -ALTER TABLE `omc_db`.`trace_task` +ALTER TABLE `trace_task` ADD COLUMN IF NOT EXISTS `account_id` varchar(32) NULL AFTER `status`, ADD COLUMN IF NOT EXISTS `comment` varchar(255) NULL AFTER `account_id`; - -INSERT IGNORE INTO `omc_db`.`config` (`id`, `module_name`, `config_tag`, `title_json`, `value`, `value_json`, `comment`) -VALUES ('37', 'System', 'logo', '{\"cn\":\"系统LOGO\",\"en\":\"System LOGO\"}', 'logo30.png', '', ''); - -ALTER TABLE `omc_db`.`param_config` -ADD COLUMN IF NOT EXISTS `method` varchar(64) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT '*' COMMENT 'method allow: \"get\", \"get,post,put\", \"*\"' AFTER `top_display`; DELETE FROM trace_data WHERE timestamp LIKE '2023-%'; -ALTER TABLE `omc_db`.`trace_data` +ALTER TABLE `trace_data` MODIFY COLUMN `timestamp` bigint NULL DEFAULT NULL AFTER `msg_direct`; -ALTER TABLE `omc_db`.`param_config` -MODIFY COLUMN `method` varchar(64) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL COMMENT 'method allow: \"get\", \"get,post,put\", \"delete\"' AFTER `top_display`; - -ALTER TABLE `omc_db`.`trace_data` +ALTER TABLE `trace_data` ADD COLUMN IF NOT EXISTS `length` int NULL AFTER `msg_direct`; -ALTER TABLE - `omc_db`.`ne_backup` +ALTER TABLE `ne_backup` ADD COLUMN IF NOT EXISTS `comment` varchar(255) NULL AFTER `md5_sum`; -ALTER TABLE - `omc_db`.`mml_command` +ALTER TABLE `mml_command` ADD COLUMN IF NOT EXISTS `status` enum('Active', 'Inactive') CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT 'Active' COMMENT '激活: Active 未激活: Inactive' AFTER `param_json`; -UPDATE `omc_db`.`mml_command` +UPDATE `mml_command` SET `status` = 'Inactive' WHERE `category` = 'licenseManagement'; -ALTER TABLE - `omc_db`.`mml_subscriber` +ALTER TABLE `mml_subscriber` ADD COLUMN IF NOT EXISTS `status` enum('Active', 'Inactive') CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT 'Active' COMMENT '激活: Active 未激活: Inactive' AFTER `param_json`; -ALTER TABLE - `omc_db`.`mml_system` +ALTER TABLE `mml_system` ADD COLUMN IF NOT EXISTS `status` enum('Active', 'Inactive') CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT 'Active' COMMENT '激活: Active 未激活: Inactive' AFTER `param_json`; -ALTER TABLE - `omc_db`.`system_log` +ALTER TABLE `system_log` ADD COLUMN IF NOT EXISTS `operation` varchar(16) NULL AFTER `process_id`; -ALTER TABLE `omc_db`.`gold_kpi` -ADD COLUMN IF NOT EXISTS `granularity` tinyint NULL DEFAULT 60 COMMENT '时间颗粒度: 5/10/.../60/300 (秒)' AFTER `index`; - -ALTER TABLE `omc_db`.`gold_kpi` -ADD INDEX IF NOT EXISTS `idx_kpiid` (`kpi_id`) USING BTREE, -ADD INDEX IF NOT EXISTS `idx_timestamp` (`timestamp`) USING BTREE; - -ALTER TABLE `omc_db`.`gold_kpi` -DROP INDEX IF EXISTS `idx_st_nt_id`, -ADD INDEX IF NOT EXISTS `idx_rtds_id`(`rm_uid` ASC, `ne_type` ASC, `date` ASC, `start_time` ASC) USING BTREE; - -ALTER TABLE `omc_db`.`gold_kpi` -ADD INDEX IF NOT EXISTS `idx_date` (`date`) USING BTREE; - -ALTER TABLE `omc_db`.`gold_kpi` -ADD UNIQUE INDEX IF NOT EXISTS `idx_pk_id` (`id`) USING BTREE; - -ALTER TABLE `omc_db`.`kpi_title` -ADD INDEX IF NOT EXISTS `idx_kpi_id` (`kpi_id`) USING BTREE; - -ALTER TABLE `omc_db`.`alarm` +ALTER TABLE `alarm` ADD UNIQUE INDEX IF NOT EXISTS `idx_pk_id` (`id`) USING BTREE; -ALTER TABLE `omc_db`.`alarm` +ALTER TABLE `alarm` ADD INDEX IF NOT EXISTS `idx_severity_status` ( `alarm_status`, `orig_severity` ) USING BTREE; -ALTER TABLE `omc_db`.`mml_system` +ALTER TABLE `mml_system` ADD COLUMN IF NOT EXISTS `object_type` varchar(16) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT 'mml' AFTER `mml_display`; -ALTER TABLE `omc_db`.`ne_state` +ALTER TABLE `ne_state` MODIFY COLUMN `expiry_date` varchar(11) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT '-' AFTER `serial_num`; -ALTER TABLE `omc_db`.`alarm_forward_log` +ALTER TABLE `alarm_forward_log` ADD COLUMN IF NOT EXISTS `interface` varchar(16) NULL AFTER `event_time`; \ No newline at end of file