Merge remote-tracking branch 'origin/main' into lichang

This commit is contained in:
TsMask
2024-05-30 19:56:07 +08:00
23 changed files with 1804 additions and 1710 deletions

View File

@@ -57,6 +57,81 @@ CREATE TABLE IF NOT EXISTS `alarm_event` (
UNIQUE INDEX `idx_uni_aid_ne_aseq`(`ne_type`, `ne_id`, `alarm_id`, `alarm_seq`) USING BTREE,
INDEX `idx_event_time`(`event_time`) USING BTREE,
INDEX `idx_severity_status`(`alarm_status`, `orig_severity`) USING BTREE
) ENGINE = InnoDB AUTO_INCREMENT = 228788 CHARACTER SET = utf8mb4 COLLATE = utf8mb4_general_ci ROW_FORMAT = Dynamic;
) ENGINE = InnoDB CHARACTER SET = utf8mb4 COLLATE = utf8mb4_general_ci ROW_FORMAT = Dynamic;
-- Move event alarm from table alarm to alarm_event
START TRANSACTION;
INSERT INTO
`omc_db`.`alarm_event` (
`alarm_seq`,
`alarm_id`,
`alarm_title`,
`ne_type`,
`ne_id`,
`alarm_code`,
`event_time`,
`alarm_type`,
`orig_severity`,
`perceived_severity`,
`pv_flag`,
`ne_name`,
`object_uid`,
`object_name`,
`object_type`,
`location_info`,
`province`,
`alarm_status`,
`specific_problem`,
`specific_problem_id`,
`add_info`,
`counter`,
`latest_event_time`,
`ack_state`,
`ack_time`,
`ack_user`,
`clear_type`,
`clear_time`,
`clear_user`,
`timestamp`
)
SELECT
`alarm_seq`,
`alarm_id`,
`alarm_title`,
`ne_type`,
`ne_id`,
`alarm_code`,
`event_time`,
`alarm_type`,
`orig_severity`,
`perceived_severity`,
`pv_flag`,
`ne_name`,
`object_uid`,
`object_name`,
`object_type`,
`location_info`,
`province`,
`alarm_status`,
`specific_problem`,
`specific_problem_id`,
`add_info`,
`counter`,
`latest_event_time`,
`ack_state`,
`ack_time`,
`ack_user`,
`clear_type`,
`clear_time`,
`clear_user`,
`timestamp`
FROM `omc_db`.`alarm`
WHERE
`orig_severity` = 'Event';
DELETE FROM `omc_db`.`alarm` WHERE `orig_severity` = 'Event';
COMMIT;
SET FOREIGN_KEY_CHECKS = 1;

View File

@@ -652,5 +652,6 @@ REPLACE INTO `sys_dict_data` VALUES (2134, 2134, 'dictData.ne_version_status.0',
REPLACE INTO `sys_dict_data` VALUES (2135, 2135, 'dictData.ne_version_status.1', '当前版本', 'i18n_zh', '', '', '1', 'supervisor', 1705550000000, '', 0, '');
REPLACE INTO `sys_dict_data` VALUES (2136, 2136, 'dictData.ne_version_status.2', '上一版本', 'i18n_zh', '', '', '1', 'supervisor', 1705550000000, '', 0, '');
REPLACE INTO `sys_dict_data` VALUES (2137, 2137, 'dictData.ne_version_status.3', '有新版本', 'i18n_zh', '', '', '1', 'supervisor', 1705550000000, '', 0, '');
REPLACE INTO `sys_dict_data` VALUES (2138, 2138, 'menu.fault.event', '事件通知', 'i18n_zh', '', '', '1', 'supervisor', 1717051745866, '', 0, '');
SET FOREIGN_KEY_CHECKS = 1;

View File

@@ -647,5 +647,6 @@ REPLACE INTO `sys_dict_data` VALUES (4134, 4134, 'dictData.ne_version_status.0',
REPLACE INTO `sys_dict_data` VALUES (4135, 4135, 'dictData.ne_version_status.1', 'Current', 'i18n_en', '', '', '1', 'supervisor', 1705550000000, '', 0, '');
REPLACE INTO `sys_dict_data` VALUES (4136, 4136, 'dictData.ne_version_status.2', 'Previous', 'i18n_en', '', '', '1', 'supervisor', 1705550000000, '', 0, '');
REPLACE INTO `sys_dict_data` VALUES (4137, 4137, 'dictData.ne_version_status.3', 'Has New', 'i18n_en', '', '', '1', 'supervisor', 1705550000000, '', 0, '');
REPLACE INTO `sys_dict_data` VALUES (4138, 4138, 'menu.fault.event', 'Event Notification', 'i18n_en', '', '', '1', 'supervisor', 1705550000000, '', 0, '');
SET FOREIGN_KEY_CHECKS = 1;

View File

@@ -38,12 +38,9 @@ INSERT IGNORE INTO `sys_role_menu` VALUES (2, 102);
INSERT IGNORE INTO `sys_role_menu` VALUES (2, 103);
INSERT IGNORE INTO `sys_role_menu` VALUES (2, 104);
INSERT IGNORE INTO `sys_role_menu` VALUES (2, 105);
INSERT IGNORE INTO `sys_role_menu` VALUES (2, 106);
INSERT IGNORE INTO `sys_role_menu` VALUES (2, 107);
INSERT IGNORE INTO `sys_role_menu` VALUES (2, 108);
INSERT IGNORE INTO `sys_role_menu` VALUES (2, 111);
INSERT IGNORE INTO `sys_role_menu` VALUES (2, 112);
INSERT IGNORE INTO `sys_role_menu` VALUES (2, 113);
INSERT IGNORE INTO `sys_role_menu` VALUES (2, 115);
INSERT IGNORE INTO `sys_role_menu` VALUES (2, 116);
INSERT IGNORE INTO `sys_role_menu` VALUES (2, 117);
@@ -74,11 +71,6 @@ INSERT IGNORE INTO `sys_role_menu` VALUES (2, 1021);
INSERT IGNORE INTO `sys_role_menu` VALUES (2, 1022);
INSERT IGNORE INTO `sys_role_menu` VALUES (2, 1023);
INSERT IGNORE INTO `sys_role_menu` VALUES (2, 1024);
INSERT IGNORE INTO `sys_role_menu` VALUES (2, 1025);
INSERT IGNORE INTO `sys_role_menu` VALUES (2, 1026);
INSERT IGNORE INTO `sys_role_menu` VALUES (2, 1027);
INSERT IGNORE INTO `sys_role_menu` VALUES (2, 1028);
INSERT IGNORE INTO `sys_role_menu` VALUES (2, 1029);
INSERT IGNORE INTO `sys_role_menu` VALUES (2, 1030);
INSERT IGNORE INTO `sys_role_menu` VALUES (2, 1031);
INSERT IGNORE INTO `sys_role_menu` VALUES (2, 1032);
@@ -149,6 +141,17 @@ INSERT IGNORE INTO `sys_role_menu` VALUES (2, 2129);
INSERT IGNORE INTO `sys_role_menu` VALUES (2, 2130);
INSERT IGNORE INTO `sys_role_menu` VALUES (2, 2131);
INSERT IGNORE INTO `sys_role_menu` VALUES (2, 2132);
INSERT IGNORE INTO `sys_role_menu` VALUES (2, 2133);
INSERT IGNORE INTO `sys_role_menu` VALUES (2, 2137);
INSERT IGNORE INTO `sys_role_menu` VALUES (2, 2138);
INSERT IGNORE INTO `sys_role_menu` VALUES (2, 2140);
INSERT IGNORE INTO `sys_role_menu` VALUES (2, 2141);
INSERT IGNORE INTO `sys_role_menu` VALUES (2, 2142);
INSERT IGNORE INTO `sys_role_menu` VALUES (2, 2143);
INSERT IGNORE INTO `sys_role_menu` VALUES (2, 2144);
INSERT IGNORE INTO `sys_role_menu` VALUES (2, 2145);
INSERT IGNORE INTO `sys_role_menu` VALUES (2, 2146);
INSERT IGNORE INTO `sys_role_menu` VALUES (2, 2147);
INSERT IGNORE INTO `sys_role_menu` VALUES (3, 1);
INSERT IGNORE INTO `sys_role_menu` VALUES (3, 4);
INSERT IGNORE INTO `sys_role_menu` VALUES (3, 5);
@@ -210,6 +213,11 @@ INSERT IGNORE INTO `sys_role_menu` VALUES (3, 2129);
INSERT IGNORE INTO `sys_role_menu` VALUES (3, 2130);
INSERT IGNORE INTO `sys_role_menu` VALUES (3, 2131);
INSERT IGNORE INTO `sys_role_menu` VALUES (3, 2132);
INSERT IGNORE INTO `sys_role_menu` VALUES (3, 2133);
INSERT IGNORE INTO `sys_role_menu` VALUES (3, 2138);
INSERT IGNORE INTO `sys_role_menu` VALUES (3, 2140);
INSERT IGNORE INTO `sys_role_menu` VALUES (3, 2141);
INSERT IGNORE INTO `sys_role_menu` VALUES (3, 2147);
INSERT IGNORE INTO `sys_role_menu` VALUES (4, 1);
INSERT IGNORE INTO `sys_role_menu` VALUES (4, 5);
INSERT IGNORE INTO `sys_role_menu` VALUES (4, 112);
@@ -251,6 +259,11 @@ INSERT IGNORE INTO `sys_role_menu` VALUES (4, 2129);
INSERT IGNORE INTO `sys_role_menu` VALUES (4, 2130);
INSERT IGNORE INTO `sys_role_menu` VALUES (4, 2131);
INSERT IGNORE INTO `sys_role_menu` VALUES (4, 2132);
INSERT IGNORE INTO `sys_role_menu` VALUES (4, 2133);
INSERT IGNORE INTO `sys_role_menu` VALUES (4, 2138);
INSERT IGNORE INTO `sys_role_menu` VALUES (4, 2140);
INSERT IGNORE INTO `sys_role_menu` VALUES (4, 2141);
INSERT IGNORE INTO `sys_role_menu` VALUES (4, 2147);
INSERT IGNORE INTO `sys_role_menu` VALUES (5, 1);
INSERT IGNORE INTO `sys_role_menu` VALUES (5, 5);
INSERT IGNORE INTO `sys_role_menu` VALUES (5, 112);
@@ -260,96 +273,5 @@ INSERT IGNORE INTO `sys_role_menu` VALUES (5, 2082);
INSERT IGNORE INTO `sys_role_menu` VALUES (5, 2087);
INSERT IGNORE INTO `sys_role_menu` VALUES (5, 2131);
INSERT IGNORE INTO `sys_role_menu` VALUES (5, 2132);
INSERT IGNORE INTO `sys_role_menu` VALUES (100, 1);
INSERT IGNORE INTO `sys_role_menu` VALUES (100, 100);
INSERT IGNORE INTO `sys_role_menu` VALUES (100, 1000);
DELETE FROM `omc_db`.`sys_role_menu`
WHERE
`role_id` = 2
AND `menu_id` = 106;
DELETE FROM `omc_db`.`sys_role_menu`
WHERE
`role_id` = 2
AND `menu_id` = 107;
DELETE FROM `omc_db`.`sys_role_menu`
WHERE
`role_id` = 2
AND `menu_id` = 113;
DELETE FROM `omc_db`.`sys_role_menu`
WHERE
`role_id` = 2
AND `menu_id` = 1025;
DELETE FROM `omc_db`.`sys_role_menu`
WHERE
`role_id` = 2
AND `menu_id` = 1026;
DELETE FROM `omc_db`.`sys_role_menu`
WHERE
`role_id` = 2
AND `menu_id` = 1027;
DELETE FROM `omc_db`.`sys_role_menu`
WHERE
`role_id` = 2
AND `menu_id` = 1028;
DELETE FROM `omc_db`.`sys_role_menu`
WHERE
`role_id` = 2
AND `menu_id` = 1029;
INSERT IGNORE INTO
`omc_db`.`sys_role_menu` (`role_id`, `menu_id`)
VALUES (2, 2133);
INSERT IGNORE INTO
`omc_db`.`sys_role_menu` (`role_id`, `menu_id`)
VALUES (2, 2138);
INSERT IGNORE INTO
`omc_db`.`sys_role_menu` (`role_id`, `menu_id`)
VALUES (2, 2140);
INSERT IGNORE INTO
`omc_db`.`sys_role_menu` (`role_id`, `menu_id`)
VALUES (2, 2141);
INSERT IGNORE INTO
`omc_db`.`sys_role_menu` (`role_id`, `menu_id`)
VALUES (3, 2133);
INSERT IGNORE INTO
`omc_db`.`sys_role_menu` (`role_id`, `menu_id`)
VALUES (3, 2138);
INSERT IGNORE INTO
`omc_db`.`sys_role_menu` (`role_id`, `menu_id`)
VALUES (3, 2140);
INSERT IGNORE INTO
`omc_db`.`sys_role_menu` (`role_id`, `menu_id`)
VALUES (3, 2141);
INSERT IGNORE INTO
`omc_db`.`sys_role_menu` (`role_id`, `menu_id`)
VALUES (4, 2133);
INSERT IGNORE INTO
`omc_db`.`sys_role_menu` (`role_id`, `menu_id`)
VALUES (4, 2138);
INSERT IGNORE INTO
`omc_db`.`sys_role_menu` (`role_id`, `menu_id`)
VALUES (4, 2140);
INSERT IGNORE INTO
`omc_db`.`sys_role_menu` (`role_id`, `menu_id`)
VALUES (4, 2141);
SET FOREIGN_KEY_CHECKS = 1;