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

2024-05-30 19:56:07 +08:00
parent 969cbdc76a 315ac6fd6e
commit b06393ad70
23 changed files with 1804 additions and 1710 deletions
--- a/captrace/makefile
+++ b/captrace/makefile
@@ -1,7 +1,7 @@
 # Makefile for rest agent project

 PROJECT = OMC
-VERSION = 2.2405.3
+VERSION = 2.2405.4
 PLATFORM = amd64
 ARMPLATFORM = aarch64
 BUILDDIR = ../../build
--- a/config/param/smf_param_config.yaml
+++ b/config/param/smf_param_config.yaml
@@ -58,6 +58,13 @@ smf:
      filter: ''
      display: "AMF URI"
      comment: ""
+    - name: "pcfEnable"
+      type: "bool"
+      value: "true"
+      access: "read-write"
+      filter: ''
+      display: "PCF Enable"
+      comment: ""
    - name: "pcfUri"
      type: "string"
      value: "http://172.16.5.160:8080"
--- a/crontask/makefile
+++ b/crontask/makefile
@@ -1,7 +1,7 @@
 # Makefile for OMC-OMC-crontask project

 PROJECT = OMC
-VERSION = 2.2405.3
+VERSION = 2.2405.4
 LIBDIR = be.ems/lib
 BINNAME = crontask

--- a/data2html/makefile
+++ b/data2html/makefile
@@ -1,7 +1,7 @@
 # Makefile for rest agent project

 PROJECT = OMC
-VERSION = 2.2405.3
+VERSION = 2.2405.4
 RelDate = `date +%Y%m%d`
 Release = $(RelDate)
 RelVer = $(VERSION)-$(RelDate)
--- a/database/common/param_config.sql
+++ b/database/common/param_config.sql
@@ -11,7 +11,7 @@
 Target Server Version : 100338 (10.3.38-MariaDB)
 File Encoding         : 65001

- Date: 29/05/2024 16:28:00
+ Date: 30/05/2024 15:54:34
 */

 SET NAMES utf8mb4;
@@ -31,7 +31,7 @@ CREATE TABLE `param_config`  (
  `param_json` longtext CHARACTER SET utf8mb4 COLLATE utf8mb4_bin NULL DEFAULT NULL,
  PRIMARY KEY (`id`) USING BTREE,
  INDEX `id`(`id`) USING BTREE
-) ENGINE = InnoDB AUTO_INCREMENT = 1645 CHARACTER SET = utf8mb4 COLLATE = utf8mb4_general_ci ROW_FORMAT = Dynamic;
+) ENGINE = InnoDB AUTO_INCREMENT = 1651 CHARACTER SET = utf8mb4 COLLATE = utf8mb4_general_ci ROW_FORMAT = Dynamic;

 -- ----------------------------
 -- Records of param_config
@@ -90,12 +90,6 @@ INSERT INTO `param_config` VALUES (1535, 'PCF', '', 'headerEnrichTemplate', 'Hea
 INSERT INTO `param_config` VALUES (1591, 'SMSC', '', 'system', 'System', '', '{\"list\":[{\"access\":\"read-write\",\"comment\":\"\",\"display\":\"CDR Flag\",\"filter\":\"{\\\"0\\\":\\\"false\\\",\\\"1\\\":\\\"true\\\"}\",\"name\":\"cdrFlag\",\"type\":\"bool\",\"value\":\"1\"},{\"access\":\"read-write\",\"comment\":\"\",\"display\":\"SM Validity\",\"filter\":\"0-2147483647\",\"name\":\"smValidity\",\"type\":\"int\",\"value\":\"259200\"},{\"access\":\"read-write\",\"comment\":\"\",\"display\":\"Log Flag\",\"filter\":\"{\\\"0\\\":\\\"false\\\",\\\"1\\\":\\\"true\\\"}\",\"name\":\"logFlag\",\"type\":\"bool\",\"value\":\"1\"},{\"access\":\"read-write\",\"comment\":\"Enable or disable resend pending SMS to unattainable local users.\",\"display\":\"Local Polling Flag\",\"filter\":\"{\\\"0\\\":\\\"false\\\",\\\"1\\\":\\\"true\\\"}\",\"name\":\"localPollingFlag\",\"type\":\"bool\",\"value\":\"1\"},{\"access\":\"read-write\",\"comment\":\"Enable or disable resend pending SMS to unattainable outbound roaming users.\",\"display\":\"Local Roaming Out Polling Flag\",\"filter\":\"{\\\"0\\\":\\\"false\\\",\\\"1\\\":\\\"true\\\"}\",\"name\":\"localRoamingOutPollingFlag\",\"type\":\"bool\",\"value\":\"1\"},{\"access\":\"read-write\",\"comment\":\"Enable or disable resend pending SMS to unattainable inbound roaming users.\",\"display\":\"Visitor Roaming In Polling Flag\",\"filter\":\"{\\\"0\\\":\\\"false\\\",\\\"1\\\":\\\"true\\\"}\",\"name\":\"visitorRoamingInPollingFlag\",\"type\":\"bool\",\"value\":\"1\"},{\"access\":\"read-write\",\"comment\":\"Enable or disable resend pending SMS to other unattainable users.\",\"display\":\"Other Polling Flag\",\"filter\":\"{\\\"0\\\":\\\"false\\\",\\\"1\\\":\\\"true\\\"}\",\"name\":\"otherPollingFlag\",\"type\":\"bool\",\"value\":\"1\"},{\"access\":\"read-write\",\"comment\":\"Define the maximum port number that the queue of pending SMS may grow to.\",\"display\":\"Polling Number\",\"filter\":\"0-64\",\"name\":\"pollingNumber\",\"type\":\"int\",\"value\":\"64\"},{\"access\":\"read-write\",\"comment\":\"Specify the priority parameter of SM_RP_PRI. true = High; false = Low.\",\"display\":\"Priority Flag\",\"filter\":\"{\\\"0\\\":\\\"false\\\",\\\"1\\\":\\\"true\\\"}\",\"name\":\"priorityFlag\",\"type\":\"bool\",\"value\":\"1\"},{\"access\":\"read-write\",\"comment\":\"Enable or disable TP-Reply-Path parameter in the SMS-DELIVER data unit.\",\"display\":\"TP Reply Path Flag\",\"filter\":\"{\\\"0\\\":\\\"false\\\",\\\"1\\\":\\\"true\\\"}\",\"name\":\"tpReplyPathFlag\",\"type\":\"bool\",\"value\":\"1\"},{\"access\":\"read-write\",\"comment\":\"\",\"display\":\"SMSC Domain\",\"filter\":\"0~16\",\"name\":\"smscDomain\",\"type\":\"string\",\"value\":\"0.0.0.0\"},{\"access\":\"read-write\",\"comment\":\"\",\"display\":\"CSFB VoLTE Flag\",\"filter\":\"{\\\"0\\\":\\\"false\\\",\\\"1\\\":\\\"true\\\"}\",\"name\":\"csfbVolteFlag\",\"type\":\"bool\",\"value\":\"1\"},{\"access\":\"read-write\",\"comment\":\"\",\"display\":\"Camel Flag\",\"filter\":\"{\\\"0\\\":\\\"false\\\",\\\"1\\\":\\\"true\\\"}\",\"name\":\"camelFlag\",\"type\":\"bool\",\"value\":\"0\"},{\"access\":\"read-write\",\"comment\":\"\",\"display\":\"SCF Address\",\"filter\":\"0~16\",\"name\":\"scfAddress\",\"type\":\"string\",\"value\":\"0.0.0.0\"}]}');
 INSERT INTO `param_config` VALUES (1592, 'SMSC', '', 'msisdnsegment', 'MSISDN Segment List', 'put', '{\"array\":[{\"access\":\"read-only\",\"comment\":\"0~15\",\"display\":\"Index\",\"filter\":\"0~15\",\"name\":\"index\",\"type\":\"int\",\"value\":\"0\"},{\"access\":\"read-write\",\"comment\":\"\",\"display\":\"Start MSISDN\",\"filter\":\"0~32\",\"name\":\"startMSISDN\",\"type\":\"string\",\"value\":\"0\"},{\"access\":\"read-write\",\"comment\":\"\",\"display\":\"End MSISDN\",\"filter\":\"0~32\",\"name\":\"endMSISDN\",\"type\":\"string\",\"value\":\"0\"}]}');
 INSERT INTO `param_config` VALUES (1593, 'SMSC', '', 'smpplink', 'SMPP Link List', '', '{\"array\":[{\"access\":\"read-only\",\"comment\":\"0~63\",\"display\":\"Index\",\"filter\":\"0~63\",\"name\":\"index\",\"type\":\"int\",\"value\":\"0\"},{\"access\":\"read-write\",\"comment\":\"\",\"display\":\"Link Alias\",\"filter\":\"0~32\",\"name\":\"linkAlias\",\"type\":\"string\",\"value\":\"0\"},{\"access\":\"read-write\",\"comment\":\"\",\"display\":\"Session Type\",\"filter\":\"{\\\"0\\\":\\\"bindTX\\\",\\\"1\\\":\\\"bindRX\\\",\\\"2\\\":\\\"bindTRX\\\"}\",\"name\":\"sessionType\",\"type\":\"enum\",\"value\":\"0\"},{\"access\":\"read-write\",\"comment\":\"\",\"display\":\"Service Number\",\"filter\":\"0~32\",\"name\":\"serviceNumber\",\"type\":\"string\",\"value\":\"0\"},{\"access\":\"read-write\",\"comment\":\"\",\"display\":\"Data Coding Scheme\",\"filter\":\"{\\\"0\\\":\\\"smpp7def7\\\",\\\"1\\\":\\\"smpp8dcs4def7\\\",\\\"2\\\":\\\"smpp8dcs0def7\\\",\\\"16\\\":\\\"smpp7def8\\\",\\\"17\\\":\\\"smpp8dcs4def8\\\",\\\"18\\\":\\\"smpp8dcs0def8\\\"}\",\"name\":\"dataCodingScheme\",\"type\":\"enum\",\"value\":\"0\"},{\"access\":\"read-write\",\"comment\":\"\",\"display\":\"Platform Num\",\"filter\":\"{\\\"0\\\":\\\"plat0\\\",\\\"1\\\":\\\"plat1\\\",\\\"2\\\":\\\"ignore\\\"}\",\"name\":\"platformNum\",\"type\":\"enum\",\"value\":\"0\"},{\"access\":\"read-write\",\"comment\":\"\",\"display\":\"Time To Live\",\"filter\":\"0-2147483647\",\"name\":\"timeToLive\",\"type\":\"int\",\"value\":\"604800\"},{\"access\":\"read-write\",\"comment\":\"\",\"display\":\"Manipulation Flag\",\"filter\":\"{\\\"0\\\":\\\"false\\\",\\\"1\\\":\\\"true\\\"}\",\"name\":\"manipulationFlag\",\"type\":\"bool\",\"value\":\"1\"},{\"access\":\"read-write\",\"comment\":\"\",\"display\":\"Type of Number\",\"filter\":\"{\\\"0\\\":\\\"unknown\\\",\\\"1\\\":\\\"international\\\",\\\"2\\\":\\\"national\\\",\\\"3\\\":\\\"networkSpecific\\\",\\\"4\\\":\\\"subscriberNumber\\\",\\\"5\\\":\\\"alphanumeric\\\",\\\"6\\\":\\\"abbreviated\\\"}\",\"name\":\"ton\",\"type\":\"enum\",\"value\":\"0\"},{\"access\":\"read-write\",\"comment\":\"\",\"display\":\"Number Plan Indicator\",\"filter\":\"{\\\"0\\\":\\\"unknown\\\",\\\"1\\\":\\\"isdn\\\",\\\"3\\\":\\\"data\\\",\\\"4\\\":\\\"telex\\\",\\\"6\\\":\\\"landMobile\\\",\\\"8\\\":\\\"national\\\",\\\"9\\\":\\\"private\\\",\\\"10\\\":\\\"ermes\\\",\\\"14\\\":\\\"internet\\\",\\\"18\\\":\\\"wapClientID\\\"}\",\"name\":\"npi\",\"type\":\"enum\",\"value\":\"0\"},{\"access\":\"read-write\",\"comment\":\"\",\"display\":\"Role Type\",\"filter\":\"{\\\"0\\\":\\\"server\\\",\\\"1\\\":\\\"client\\\"}\",\"name\":\"roleType\",\"type\":\"enum\",\"value\":\"0\"}]}');
-INSERT INTO `param_config` VALUES (1608, 'SMF', '', 'smfSystem', 'SMF System Config', '', '{\"list\":[{\"access\":\"read-write\",\"comment\":\"\",\"display\":\"SBI IP\",\"filter\":\"\",\"name\":\"sbiIpAddr\",\"type\":\"string\",\"value\":\"172.16.5.150\"},{\"access\":\"read-write\",\"comment\":\"0~65535\",\"display\":\"SBI Port\",\"filter\":\"0~65535\",\"name\":\"sbiPort\",\"type\":\"int\",\"value\":\"8080\"},{\"access\":\"read-write\",\"comment\":\"\",\"display\":\"SBI Scheme\",\"filter\":\"{\\\"0\\\":\\\"http\\\", \\\"1\\\":\\\"https\\\"}\",\"name\":\"sbiScheme\",\"type\":\"enum\",\"value\":\"http\"},{\"access\":\"read-write\",\"comment\":\"\",\"display\":\"N4 IPv4\",\"filter\":\"\",\"name\":\"n4Ipv4\",\"type\":\"ipv4\",\"value\":\"172.16.5.150\"},{\"access\":\"read-write\",\"comment\":\"\",\"display\":\"N4 IPv6\",\"filter\":\"\",\"name\":\"n4Ipv6\",\"type\":\"ipv6\",\"value\":\"\"},{\"access\":\"read-write\",\"comment\":\"\",\"display\":\"N4U IPv4\",\"filter\":\"\",\"name\":\"n4UIpv4\",\"type\":\"ipv4\",\"value\":\"\"},{\"access\":\"read-write\",\"comment\":\"\",\"display\":\"N4U IPv6\",\"filter\":\"\",\"name\":\"n4UIpv6\",\"type\":\"ipv6\",\"value\":\"\"},{\"access\":\"read-write\",\"comment\":\"\",\"display\":\"AMF URI\",\"filter\":\"\",\"name\":\"amfUri\",\"type\":\"string\",\"value\":\"http://172.16.5.120:8080\"},{\"access\":\"read-write\",\"comment\":\"\",\"display\":\"PCF URI\",\"filter\":\"\",\"name\":\"pcfUri\",\"type\":\"string\",\"value\":\"http://172.16.5.160:8080\"},{\"access\":\"read-write\",\"comment\":\"\",\"display\":\"UDM URI\",\"filter\":\"\",\"name\":\"udmUri\",\"type\":\"string\",\"value\":\"http://172.16.5.140:8080\"},{\"access\":\"read-write\",\"display\":\"5G Charging Enable\",\"filter\":\"{\\\"0\\\":\\\"false\\\", \\\"1\\\":\\\"true\\\"}\",\"name\":\"chfEnable\",\"type\":\"bool\",\"value\":\"false\"},{\"access\":\"read-write\",\"comment\":\"\",\"display\":\"CHF Primary URI\",\"filter\":\"\",\"name\":\"chfPrimaryUri\",\"type\":\"string\",\"value\":\"http://172.16.5.240:8080\"},{\"access\":\"read-write\",\"comment\":\"\",\"display\":\"CHF Secondary URI\",\"filter\":\"\",\"name\":\"chfSecondaryUri\",\"type\":\"string\",\"value\":\"\"},{\"access\":\"read-write\",\"comment\":\"\",\"display\":\"NRF Enable\",\"filter\":\"{\\\"0\\\":\\\"false\\\", \\\"1\\\":\\\"true\\\"}\",\"name\":\"nrfEnable\",\"type\":\"bool\",\"value\":\"false\"},{\"access\":\"read-write\",\"comment\":\"\",\"display\":\"NRF URI\",\"filter\":\"\",\"name\":\"nrfUri\",\"type\":\"string\",\"value\":\"http://172.16.5.180:8080\"},{\"access\":\"read-write\",\"comment\":\"\",\"display\":\"Primary DNS IPv4\",\"filter\":\"\",\"name\":\"primaryDnsIpv4\",\"type\":\"ipv4\",\"value\":\"114.114.114.114\"},{\"access\":\"read-write\",\"comment\":\"\",\"display\":\"Secondary DNS IPv4\",\"filter\":\"\",\"name\":\"secondaryDnsIpv4\",\"type\":\"ipv4\",\"value\":\"\"},{\"access\":\"read-write\",\"comment\":\"\",\"display\":\"Primary DNS IPv6\",\"filter\":\"\",\"name\":\"primaryDnsIpv6\",\"type\":\"ipv6\",\"value\":\"\"},{\"access\":\"read-write\",\"comment\":\"\",\"display\":\"Secondary DNS IPv6\",\"filter\":\"\",\"name\":\"secondaryDnsIpv6\",\"type\":\"ipv6\",\"value\":\"\"},{\"access\":\"read-write\",\"comment\":\"\",\"display\":\"Primary PCSCF IPv4\",\"filter\":\"\",\"name\":\"primaryPcscfIpv4\",\"type\":\"ipv4\",\"value\":\"172.16.5.110\"},{\"access\":\"read-write\",\"comment\":\"\",\"display\":\"Secondary PCSCF IPv4\",\"filter\":\"\",\"name\":\"secondaryPcscfIpv4\",\"type\":\"ipv4\",\"value\":\"\"},{\"access\":\"read-write\",\"comment\":\"\",\"display\":\"Primary PCSCF IPv6\",\"filter\":\"\",\"name\":\"primaryPcscfIpv6\",\"type\":\"ipv6\",\"value\":\"\"},{\"access\":\"read-write\",\"comment\":\"\",\"display\":\"Secondary PCSCF IPv6\",\"filter\":\"\",\"name\":\"secondaryPcscfIpv6\",\"type\":\"ipv6\",\"value\":\"\"},{\"access\":\"read-write\",\"comment\":\"\",\"display\":\"UE MTU\",\"filter\":\"0~65535\",\"name\":\"ueMtu\",\"type\":\"int\",\"value\":\"\"}]}');
-INSERT INTO `param_config` VALUES (1609, 'SMF', '', 'spgwSystem', 'SPGW Sytem Config', '', '{\"list\":[{\"access\":\"read-write\",\"comment\":\"\",\"display\":\"Local S11 IP\",\"filter\":\"\",\"name\":\"s11Ip\",\"type\":\"string\",\"value\":\"172.16.5.150\"},{\"access\":\"read-write\",\"comment\":\"\",\"display\":\"Local Diameter IP\",\"filter\":\"\",\"name\":\"localDiameterIp\",\"type\":\"string\",\"value\":\"172.16.5.150\"},{\"access\":\"read-write\",\"comment\":\"\",\"display\":\"Local Diameter Host Name\",\"filter\":\"\",\"name\":\"localDiameterHostName\",\"type\":\"string\",\"value\":\"smf.mnc001.mcc001.3gppnetwork.org\"},{\"access\":\"read-write\",\"comment\":\"\",\"display\":\"Local Diameter Realm Name\",\"filter\":\"\",\"name\":\"localDiameterRealmName\",\"type\":\"string\",\"value\":\"mnc001.mcc001.3gppnetwork.org\"},{\"access\":\"read-write\",\"comment\":\"\",\"display\":\"Gy Enable\",\"filter\":\"false;true;\",\"name\":\"peerGyEnable\",\"type\":\"bool\",\"value\":\"false\"},{\"access\":\"read-write\",\"comment\":\"\",\"display\":\"Primary Remote Gy IP\",\"filter\":\"\",\"name\":\"primaryPeerGyIp\",\"type\":\"string\",\"value\":\"\"},{\"access\":\"read-write\",\"comment\":\"0~65535\",\"display\":\"Primary Remote Gy Port\",\"filter\":\"0~65535\",\"name\":\"primaryPeerGyPort\",\"type\":\"int\",\"value\":\"3868\"},{\"access\":\"read-write\",\"comment\":\"\",\"display\":\"Secondary Remote Gy IP\",\"filter\":\"\",\"name\":\"secondaryPeerGyIp\",\"type\":\"string\",\"value\":\"\"},{\"access\":\"read-write\",\"comment\":\"0~65535\",\"display\":\"Secondary Remote Gy Port\",\"filter\":\"0~65535\",\"name\":\"secondaryPeerGyPort\",\"type\":\"int\",\"value\":\"3868\"},{\"access\":\"read-write\",\"comment\":\"\",\"display\":\"Gx Enable\",\"filter\":\"false;true;\",\"name\":\"peerGxEnable\",\"type\":\"bool\",\"value\":\"false\"},{\"access\":\"read-write\",\"comment\":\"\",\"display\":\"Gx Charging Enable\",\"filter\":\"false;true;\",\"name\":\"gxChargingEnable\",\"type\":\"bool\",\"value\":\"false\"},{\"access\":\"read-write\",\"comment\":\"\",\"display\":\"Primary Remote Gx IP\",\"filter\":\"\",\"name\":\"primaryPeerGxIp\",\"type\":\"string\",\"value\":\"\"},{\"access\":\"read-write\",\"comment\":\"0~65535\",\"display\":\"Primary Remote Gx Port\",\"filter\":\"0~65535\",\"name\":\"primaryPeerGxPort\",\"type\":\"int\",\"value\":\"3868\"},{\"access\":\"read-write\",\"comment\":\"\",\"display\":\"Secondary Remote Gx IP\",\"filter\":\"\",\"name\":\"secondaryPeerGxIp\",\"type\":\"string\",\"value\":\"\"},{\"access\":\"read-write\",\"comment\":\"0~65535\",\"display\":\"Secondary Remote Gx Port\",\"filter\":\"0~65535\",\"name\":\"secondaryPeerGxPort\",\"type\":\"int\",\"value\":\"3868\"}]}');
-INSERT INTO `param_config` VALUES (1610, 'SMF', '', 'upfConfig', 'UPF Config', '', '{\"array\":[{\"access\":\"read-only\",\"comment\":\"\",\"display\":\"Index\",\"filter\":\"0~2047\",\"name\":\"index\",\"type\":\"int\",\"value\":\"\"},{\"access\":\"read-write\",\"comment\":\"\",\"display\":\"UPF ID\",\"filter\":\"1~64\",\"name\":\"id\",\"type\":\"string\",\"value\":\"\"},{\"access\":\"read-write\",\"comment\":\"e.g. ip:port\",\"display\":\"Address\",\"filter\":\"7~45\",\"name\":\"addr\",\"type\":\"string\",\"value\":\"\"},{\"access\":\"read-write\",\"comment\":\"IPv4,IPv6,IPv4v6\",\"display\":\"Ip Pool Type\",\"filter\":\"\",\"name\":\"ipPoolType\",\"type\":\"string\",\"value\":\"IPv4v6\"},{\"access\":\"read-write\",\"comment\":\"CIDR format, e.g. 192.168.1.0/24\",\"display\":\"IPv4 Pools\",\"filter\":\"10~256\",\"name\":\"ipv4Pools\",\"type\":\"string\",\"value\":\"\"},{\"access\":\"read-write\",\"comment\":\"CIDR format, e.g. fe80::20c:29ff:fee4:dab7/50\",\"display\":\"IPv6 Pools\",\"filter\":\"5~512\",\"name\":\"ipv6Pools\",\"type\":\"string\",\"value\":\"\"},{\"access\":\"read-write\",\"comment\":\"\",\"display\":\"Static IPv4 Enable\",\"filter\":\"{\\\"0\\\":\\\"false\\\", \\\"1\\\":\\\"true\\\"}\",\"name\":\"staticIpv4Enable\",\"type\":\"bool\",\"value\":\"\"},{\"access\":\"read-write\",\"comment\":\"ipv4 format\",\"display\":\"Static IPv4 Start\",\"filter\":\"\",\"name\":\"staticIpv4Start\",\"type\":\"ipv4\",\"value\":\"\"},{\"access\":\"read-write\",\"comment\":\"ipv4 format\",\"display\":\"Static IPv4 End\",\"filter\":\"\",\"name\":\"staticIpv4End\",\"type\":\"ipv4\",\"value\":\"\"},{\"access\":\"read-write\",\"comment\":\"\",\"display\":\"Static IPv6 Enable\",\"filter\":\"{\\\"0\\\":\\\"false\\\", \\\"1\\\":\\\"true\\\"}\",\"name\":\"staticIpv6Enable\",\"type\":\"bool\",\"value\":\"\"},{\"access\":\"read-write\",\"comment\":\"ipv6 format\",\"display\":\"Static IPv6 Start\",\"filter\":\"\",\"name\":\"staticIpv6Start\",\"type\":\"ipv6\",\"value\":\"\"},{\"access\":\"read-write\",\"comment\":\"ipv6 format\",\"display\":\"Static IPv6 End\",\"filter\":\"\",\"name\":\"staticIpv6End\",\"type\":\"ipv6\",\"value\":\"\"},{\"array\":[{\"access\":\"read-only\",\"comment\":\"\",\"display\":\"Index\",\"filter\":\"0~2047\",\"name\":\"index\",\"type\":\"int\",\"value\":\"\"},{\"access\":\"read-write\",\"comment\":\"\",\"display\":\"DNN\",\"filter\":\"1~64\",\"name\":\"dnn\",\"type\":\"string\",\"value\":\"\"},{\"access\":\"read-write\",\"comment\":\"IPv4,IPv6,IPv4v6\",\"display\":\"Ip Pool Type\",\"filter\":\"\",\"name\":\"ipPoolType\",\"type\":\"string\",\"value\":\"IPv4v6\"},{\"access\":\"read-write\",\"comment\":\"CIDR format, e.g. 192.168.1.0/24\",\"display\":\"IPv4 Pools\",\"filter\":\"10~256\",\"name\":\"ipv4Pools\",\"type\":\"string\",\"value\":\"\"},{\"access\":\"read-write\",\"comment\":\"CIDR format, e.g. fe80::20c:29ff:fee4:dab7/50\",\"display\":\"IPv6 Pools\",\"filter\":\"5~512\",\"name\":\"ipv6Pools\",\"type\":\"string\",\"value\":\"\"},{\"access\":\"read-write\",\"comment\":\"\",\"display\":\"Static IPv4 Enable\",\"filter\":\"{\\\"0\\\":\\\"false\\\", \\\"1\\\":\\\"true\\\"}\",\"name\":\"staticIpv4Enable\",\"type\":\"bool\",\"value\":\"\"},{\"access\":\"read-write\",\"comment\":\"ipv4 format\",\"display\":\"Static IPv4 Start\",\"filter\":\"\",\"name\":\"staticIpv4Start\",\"type\":\"ipv4\",\"value\":\"\"},{\"access\":\"read-write\",\"comment\":\"ipv4 format\",\"display\":\"Static IPv4 End\",\"filter\":\"\",\"name\":\"staticIpv4End\",\"type\":\"ipv4\",\"value\":\"\"},{\"access\":\"read-write\",\"comment\":\"\",\"display\":\"Static IPv6 Enable\",\"filter\":\"{\\\"0\\\":\\\"false\\\", \\\"1\\\":\\\"true\\\"}\",\"name\":\"staticIpv6Enable\",\"type\":\"bool\",\"value\":\"\"},{\"access\":\"read-write\",\"comment\":\"ipv6 format\",\"display\":\"Static IPv6 Start\",\"filter\":\"\",\"name\":\"staticIpv6Start\",\"type\":\"ipv6\",\"value\":\"\"},{\"access\":\"read-write\",\"comment\":\"ipv6 format\",\"display\":\"Static IPv6 End\",\"filter\":\"\",\"name\":\"staticIpv6End\",\"type\":\"ipv6\",\"value\":\"\"}],\"display\":\"UE DNN IP Pool\",\"name\":\"ueDnnIpPool\"}]}');
-INSERT INTO `param_config` VALUES (1611, 'SMF', '', 'dnnSelectUpf', 'DNN Select UPF', '', '{\"array\":[{\"access\":\"read-only\",\"comment\":\"\",\"display\":\"Index\",\"filter\":\"0~65535\",\"name\":\"index\",\"type\":\"int\",\"value\":\"0\"},{\"access\":\"read-write\",\"comment\":\"\",\"display\":\"DNN\",\"filter\":\"1~64\",\"name\":\"dnn\",\"type\":\"string\",\"value\":\"\"},{\"access\":\"read-write\",\"comment\":\"\",\"display\":\"UPF ID\",\"filter\":\"1~64\",\"name\":\"upfId\",\"type\":\"string\",\"value\":\"\"}]}');
-INSERT INTO `param_config` VALUES (1612, 'SMF', '', 'dnnTaiSelectUpf', 'DNN TAI Select UPF', '', '{\"array\":[{\"access\":\"read-only\",\"comment\":\"\",\"display\":\"Index\",\"filter\":\"0~65535\",\"name\":\"index\",\"type\":\"int\",\"value\":\"\"},{\"access\":\"read-write\",\"comment\":\"\",\"display\":\"DNN\",\"filter\":\"1~64\",\"name\":\"dnn\",\"type\":\"string\",\"value\":\"\"},{\"access\":\"read-write\",\"comment\":\"MCC+MNC+TAC\",\"display\":\"TAI\",\"filter\":\"1~64\",\"name\":\"tai\",\"type\":\"string\",\"value\":\"\"},{\"access\":\"read-write\",\"comment\":\"\",\"display\":\"UPF ID\",\"filter\":\"1~64\",\"name\":\"upfId\",\"type\":\"string\",\"value\":\"upf2-Id\"}]}');
-INSERT INTO `param_config` VALUES (1613, 'SMF', '', 'snssaiSelectUpf', 'SNSSAI Select UPF', '', '{\"array\":[{\"access\":\"read-only\",\"comment\":\"\",\"display\":\"Index\",\"filter\":\"0~65535\",\"name\":\"index\",\"type\":\"int\",\"value\":\"\"},{\"access\":\"read-write\",\"display\":\"Enable\",\"filter\":\"false;true;\",\"name\":\"enable\",\"type\":\"bool\",\"value\":\"true\"},{\"access\":\"read-write\",\"comment\":\"sst1-sd1;sst2-sd2;sst3-sd3\",\"display\":\"SNSSAI\",\"filter\":\"1~64\",\"name\":\"snssai\",\"type\":\"string\",\"value\":\"1-000001\"},{\"access\":\"read-write\",\"comment\":\"upf1-id;upf2-id;upf3-id\",\"display\":\"UPF ID\",\"filter\":\"1~64\",\"name\":\"upfId\",\"type\":\"string\",\"value\":\"upf1-Id\"}]}');
 INSERT INTO `param_config` VALUES (1628, 'UDM', '', 'system', 'System', '', '{\"list\":[{\"access\":\"read-write\",\"comment\":\"\",\"display\":\"Service IP\",\"filter\":\"\",\"name\":\"serviceIP\",\"type\":\"ipv4\",\"value\":\"172.16.5.140\"},{\"access\":\"read-write\",\"comment\":\"\",\"display\":\"Service Port\",\"filter\":\"0~65535\",\"name\":\"servicePort\",\"type\":\"int\",\"value\":\"8080\"},{\"access\":\"read-write\",\"comment\":\"\",\"display\":\"NRF URI\",\"filter\":\"\",\"name\":\"nrfUri\",\"type\":\"string\",\"value\":\"http://172.16.5.180:8080\"},{\"access\":\"read-write\",\"comment\":\"\",\"display\":\"AUSF IP\",\"filter\":\"\",\"name\":\"ausfIP\",\"type\":\"ipv4\",\"value\":\"172.16.5.130\"},{\"access\":\"read-write\",\"comment\":\"\",\"display\":\"FQDN\",\"filter\":\"\",\"name\":\"fqdn\",\"type\":\"string\",\"value\":\"agt.com\"},{\"access\":\"read-write\",\"comment\":\"\",\"display\":\"Priority\",\"filter\":\"0~4095\",\"name\":\"priority\",\"type\":\"int\",\"value\":\"1\"},{\"access\":\"read-write\",\"comment\":\"\",\"display\":\"Capacity\",\"filter\":\"0~65535\",\"name\":\"capacity\",\"type\":\"int\",\"value\":\"4096\"},{\"access\":\"read-write\",\"comment\":\"\",\"display\":\"Group ID\",\"filter\":\"\",\"name\":\"groupId\",\"type\":\"string\",\"value\":\"0\"},{\"access\":\"read-write\",\"comment\":\"\",\"display\":\"Supported Plmn1\",\"filter\":\"^\\\\d{5,6}$\",\"name\":\"supportedPlmn1\",\"type\":\"string\",\"value\":\"00101\"},{\"access\":\"read-write\",\"comment\":\"\",\"display\":\"Supported Plmn2\",\"filter\":\"^\\\\d{5,6}$\",\"name\":\"supportedPlmn2\",\"type\":\"string\",\"value\":\"00101\"},{\"access\":\"read-write\",\"comment\":\"\",\"display\":\"Supported Plmn3\",\"filter\":\"^\\\\d{5,6}$\",\"name\":\"supportedPlmn3\",\"type\":\"string\",\"value\":\"00101\"},{\"access\":\"read-write\",\"comment\":\"\",\"display\":\"Supported Plmn4\",\"filter\":\"^\\\\d{5,6}$\",\"name\":\"supportedPlmn4\",\"type\":\"string\",\"value\":\"00101\"},{\"access\":\"read-write\",\"comment\":\"\",\"display\":\"SUPI Ranges\",\"filter\":\"^imsi-\\\\d{15}~imsi-\\\\d{15}$\",\"name\":\"supiRanges\",\"type\":\"regex\",\"value\":\"imsi-001010100080000~imsi-001010100080099\"},{\"access\":\"read-write\",\"comment\":\"\",\"display\":\"GPSI Ranges\",\"filter\":\"^msisdn-\\\\d{2,15}~msisdn-\\\\d{2,15}$\",\"name\":\"gpsiRanges\",\"type\":\"regex\",\"value\":\"msisdn-69072000~msisdn-69072099\"},{\"access\":\"read-write\",\"comment\":\"\",\"display\":\"Scheme\",\"filter\":\"{\\\"0\\\":\\\"HTTP\\\", \\\"1\\\":\\\"HTTPS\\\"}\",\"name\":\"scheme\",\"type\":\"enum\",\"value\":\"0\"},{\"access\":\"read-write\",\"comment\":\"\",\"display\":\"Redis Link\",\"filter\":\"{\\\"0\\\":\\\"TCP\\\",\\\"1\\\":\\\"SCTP\\\"}\",\"name\":\"redisLink\",\"type\":\"enum\",\"value\":\"0\"},{\"access\":\"read-write\",\"comment\":\"\",\"display\":\"Redis Address\",\"filter\":\"\",\"name\":\"redisAddr\",\"type\":\"string\",\"value\":\"172.16.5.140:6379\"}]}');
 INSERT INTO `param_config` VALUES (1629, 'UDM', '', 'subsUEAmbr', 'Subs UE AMBR', '', '{\"array\":[{\"access\":\"read-only\",\"comment\":\"\",\"display\":\"Index\",\"filter\":\"1~16\",\"name\":\"index\",\"type\":\"int\",\"value\":\"1\"},{\"access\":\"read-write\",\"comment\":\"\",\"display\":\"Name\",\"filter\":\"^.{1,32}$\",\"name\":\"name\",\"type\":\"string\",\"value\":\"def_ambr\"},{\"access\":\"read-write\",\"comment\":\"\",\"display\":\"Uplink\",\"filter\":\"^\\\\d+(\\\\.\\\\d+)?( ?)(bps|Kbps|Mbps|Gbps|Tbps)$\",\"name\":\"uplink\",\"type\":\"regex\",\"value\":\"1 Gbps\"},{\"access\":\"read-write\",\"comment\":\"\",\"display\":\"Downlink\",\"filter\":\"^\\\\d+(\\\\.\\\\d+)?( ?)(bps|Kbps|Mbps|Gbps|Tbps)$\",\"name\":\"downlink\",\"type\":\"regex\",\"value\":\"2 Gbps\"}]}');
 INSERT INTO `param_config` VALUES (1630, 'UDM', '', 'subsNssais', 'Subs NSSAIs', '', '{\"array\":[{\"access\":\"read-only\",\"comment\":\"\",\"display\":\"Index\",\"filter\":\"1~16\",\"name\":\"index\",\"type\":\"int\",\"value\":\"1\"},{\"access\":\"read-write\",\"comment\":\"\",\"display\":\"Name\",\"filter\":\"^.{1,32}$\",\"name\":\"name\",\"type\":\"string\",\"value\":\"def_nssai\"},{\"access\":\"read-write\",\"comment\":\"\",\"display\":\"Supported Features\",\"filter\":\"^[0-9a-fA-F]{8}$\",\"name\":\"supportedFeatures\",\"type\":\"regex\",\"value\":\"00000001\"},{\"access\":\"read-write\",\"comment\":\"\",\"display\":\"Default Single NSSAIs\",\"filter\":\"\",\"name\":\"defaultSingleNSSAIs\",\"type\":\"string\",\"value\":\"1-000001\"},{\"access\":\"read-write\",\"comment\":\"\",\"display\":\"Single NSSAIs\",\"filter\":\"\",\"name\":\"singleNssais\",\"type\":\"string\",\"value\":\"1-000002\"}]}');
@@ -113,5 +107,11 @@ INSERT INTO `param_config` VALUES (1641, 'UDM', '', 'cxServer', 'Cx Server', '',
 INSERT INTO `param_config` VALUES (1642, 'IMS', '', 'system', 'System', '', '{\"list\":[{\"access\":\"read-write\",\"comment\":\"\",\"display\":\"Label\",\"filter\":\"\",\"name\":\"label\",\"type\":\"string\",\"value\":\"ims-core\"},{\"access\":\"read-only\",\"comment\":\"\",\"display\":\"HPLMN MCC\",\"filter\":\"\",\"name\":\"hplmnMCC\",\"type\":\"string\",\"value\":\"001\"},{\"access\":\"read-only\",\"comment\":\"\",\"display\":\"HPLMN MNC\",\"filter\":\"\",\"name\":\"hplmnMNC\",\"type\":\"string\",\"value\":\"01\"},{\"access\":\"read-write\",\"comment\":\"\",\"display\":\"Local Network IPv4\",\"filter\":\"\",\"name\":\"LocalNetworkIPv4\",\"type\":\"ipv4\",\"value\":\"172.16.5.110\"},{\"access\":\"read-write\",\"comment\":\"\",\"display\":\"Public Network IPv4\",\"filter\":\"\",\"name\":\"serviceIP\",\"type\":\"ipv4\",\"value\":\"172.16.5.110\"},{\"access\":\"read-write\",\"comment\":\"\",\"display\":\"Public Network IPv6\",\"filter\":\"\",\"name\":\"serviceIPv6\",\"type\":\"ipv6\",\"value\":\"\"},{\"access\":\"read-only\",\"comment\":\"\",\"display\":\"Domain Name 1\",\"filter\":\"\",\"name\":\"domainName1\",\"type\":\"string\",\"value\":\"ims.mnc001.mcc001.3gppnetwork.org\"},{\"access\":\"read-only\",\"comment\":\"\",\"display\":\"Domain Name 2\",\"filter\":\"\",\"name\":\"domainName2\",\"type\":\"string\",\"value\":\"\"},{\"access\":\"read-only\",\"comment\":\"\",\"display\":\"Domain Name 3\",\"filter\":\"\",\"name\":\"domainName3\",\"type\":\"string\",\"value\":\"\"},{\"access\":\"read-only\",\"comment\":\"\",\"display\":\"Domain Name 4\",\"filter\":\"\",\"name\":\"domainName4\",\"type\":\"string\",\"value\":\"\"},{\"access\":\"read-write\",\"comment\":\"\",\"display\":\"MultiDomain Indicator\",\"filter\":\"false;true;\",\"name\":\"multiDomainInd\",\"type\":\"bool\",\"value\":\"false\"},{\"access\":\"read-write\",\"comment\":\"\",\"display\":\"Transcode Indicator\",\"filter\":\"false;true;\",\"name\":\"transcodeInd\",\"type\":\"bool\",\"value\":\"false\"},{\"access\":\"read-write\",\"comment\":\"\",\"display\":\"MultiIPStack Indicator\",\"filter\":\"false;true;\",\"name\":\"multiIPStackInd\",\"type\":\"bool\",\"value\":\"false\"},{\"access\":\"read-write\",\"comment\":\"\",\"display\":\"Register Timer\",\"filter\":\"120-1000000\",\"name\":\"registerTimer\",\"type\":\"int\",\"value\":\"7200\"},{\"access\":\"read-write\",\"comment\":\"\",\"display\":\"Max Call Duration\",\"filter\":\"1800-1000000\",\"name\":\"maxCallDuration\",\"type\":\"int\",\"value\":\"43200\"},{\"access\":\"read-write\",\"comment\":\"\",\"display\":\"Dispatch System Indicator\",\"filter\":\"false;true;\",\"name\":\"dispatchSystemInd\",\"type\":\"bool\",\"value\":\"false\"},{\"access\":\"read-write\",\"comment\":\"\",\"display\":\"Dispatch System IPv4\",\"filter\":\"\",\"name\":\"dispatchSystemIP\",\"type\":\"ipv4\",\"value\":\"\"},{\"access\":\"read-write\",\"comment\":\"\",\"display\":\"Internal SMS Indicator\",\"filter\":\"false;true;\",\"name\":\"internalSMSInd\",\"type\":\"bool\",\"value\":\"false\"},{\"access\":\"read-write\",\"comment\":\"\",\"display\":\"Internal CDR Indicator\",\"filter\":\"false;true;\",\"name\":\"internalCDRInd\",\"type\":\"bool\",\"value\":\"false\"},{\"access\":\"read-write\",\"comment\":\"\",\"display\":\"Internal KPI Indicator\",\"filter\":\"false;true;\",\"name\":\"internalKPIInd\",\"type\":\"bool\",\"value\":\"false\"},{\"access\":\"read-write\",\"comment\":\"\",\"display\":\"PCF IP Address\",\"filter\":\"\",\"name\":\"pcfIP\",\"type\":\"ipv4\",\"value\":\"172.16.5.140\"}]}');
 INSERT INTO `param_config` VALUES (1643, 'IMS', '', 'plmn', 'PLMN List', '', '{\"array\":[{\"access\":\"read-only\",\"comment\":\"0~15\",\"display\":\"Index\",\"filter\":\"0~15\",\"name\":\"index\",\"type\":\"int\",\"value\":\"0\"},{\"access\":\"read-write\",\"comment\":\"\",\"display\":\"MCC\",\"filter\":\"^[0-9]{3}$\",\"name\":\"mcc\",\"type\":\"regex\",\"value\":\"001\"},{\"access\":\"read-write\",\"comment\":\"\",\"display\":\"MNC\",\"filter\":\"^[0-9]{2,3}$\",\"name\":\"mnc\",\"type\":\"regex\",\"value\":\"01\"},{\"access\":\"read-only\",\"comment\":\"\",\"display\":\"Domain\",\"filter\":\"0~128\",\"name\":\"domain\",\"type\":\"string\",\"value\":\"ims.mnc001.mcc001.3gppnetwork.org\"}]}');
 INSERT INTO `param_config` VALUES (1644, 'IMS', '', 'mmtel_dialplan', 'MMTEL Dialplan', '', '{\"array\":[{\"access\":\"read-only\",\"comment\":\"0~15\",\"display\":\"Index\",\"filter\":\"0~15\",\"name\":\"index\",\"type\":\"int\",\"value\":\"0\"},{\"access\":\"read-only\",\"comment\":\"\",\"display\":\"NaName\",\"filter\":\"0~128\",\"name\":\"naName\",\"type\":\"string\",\"value\":\"\"},{\"access\":\"read-write\",\"comment\":\"\",\"display\":\"Title\",\"filter\":\"0~128\",\"name\":\"title\",\"type\":\"string\",\"value\":\"\"},{\"access\":\"read-write\",\"comment\":\"\",\"display\":\"Method\",\"filter\":\"0-2\",\"name\":\"method\",\"type\":\"string\",\"value\":\"0\"},{\"access\":\"read-write\",\"comment\":\"\",\"display\":\"Prefix\",\"filter\":\"0~128\",\"name\":\"prefix\",\"type\":\"string\",\"value\":\"\"},{\"access\":\"read-write\",\"comment\":\"\",\"display\":\"Start\",\"filter\":\"0~128\",\"name\":\"start\",\"type\":\"string\",\"value\":\"\"},{\"access\":\"read-write\",\"comment\":\"\",\"display\":\"End\",\"filter\":\"0~128\",\"name\":\"end\",\"type\":\"string\",\"value\":\"\"},{\"access\":\"read-write\",\"comment\":\"\",\"display\":\"Attrib\",\"filter\":\"0~128\",\"name\":\"attrib\",\"type\":\"string\",\"value\":\"\"},{\"access\":\"read-write\",\"comment\":\"\",\"display\":\"Number Len\",\"filter\":\"0~128\",\"name\":\"numberLen\",\"type\":\"string\",\"value\":\"\"},{\"access\":\"read-write\",\"comment\":\"\",\"display\":\"Rsc\",\"filter\":\"0~128\",\"name\":\"rsc\",\"type\":\"string\",\"value\":\"\"},{\"access\":\"read-write\",\"comment\":\"\",\"display\":\"E164 Nai\",\"filter\":\"0~128\",\"name\":\"e164Nai\",\"type\":\"string\",\"value\":\"\"},{\"access\":\"read-write\",\"comment\":\"\",\"display\":\"E164 Delete\",\"filter\":\"0~128\",\"name\":\"e164Delete\",\"type\":\"string\",\"value\":\"\"},{\"access\":\"read-write\",\"comment\":\"\",\"display\":\"E164 Insert\",\"filter\":\"0~128\",\"name\":\"e164Insert\",\"type\":\"string\",\"value\":\"\"},{\"access\":\"read-write\",\"comment\":\"Enable: 0,Close 1,Open\",\"display\":\"Admin State\",\"enum\":[0,1],\"filter\":\"0~1\",\"name\":\"adminState\",\"type\":\"int\",\"value\":0}]}');
+INSERT INTO `param_config` VALUES (1645, 'SMF', '', 'smfSystem', 'SMF System Config', '', '{\"list\":[{\"access\":\"read-write\",\"comment\":\"\",\"display\":\"SBI IP\",\"filter\":\"\",\"name\":\"sbiIpAddr\",\"type\":\"string\",\"value\":\"172.16.5.150\"},{\"access\":\"read-write\",\"comment\":\"0~65535\",\"display\":\"SBI Port\",\"filter\":\"0~65535\",\"name\":\"sbiPort\",\"type\":\"int\",\"value\":\"8080\"},{\"access\":\"read-write\",\"comment\":\"\",\"display\":\"SBI Scheme\",\"filter\":\"{\\\"0\\\":\\\"http\\\", \\\"1\\\":\\\"https\\\"}\",\"name\":\"sbiScheme\",\"type\":\"enum\",\"value\":\"http\"},{\"access\":\"read-write\",\"comment\":\"\",\"display\":\"N4 IPv4\",\"filter\":\"\",\"name\":\"n4Ipv4\",\"type\":\"ipv4\",\"value\":\"172.16.5.150\"},{\"access\":\"read-write\",\"comment\":\"\",\"display\":\"N4 IPv6\",\"filter\":\"\",\"name\":\"n4Ipv6\",\"type\":\"ipv6\",\"value\":\"\"},{\"access\":\"read-write\",\"comment\":\"\",\"display\":\"N4U IPv4\",\"filter\":\"\",\"name\":\"n4UIpv4\",\"type\":\"ipv4\",\"value\":\"\"},{\"access\":\"read-write\",\"comment\":\"\",\"display\":\"N4U IPv6\",\"filter\":\"\",\"name\":\"n4UIpv6\",\"type\":\"ipv6\",\"value\":\"\"},{\"access\":\"read-write\",\"comment\":\"\",\"display\":\"AMF URI\",\"filter\":\"\",\"name\":\"amfUri\",\"type\":\"string\",\"value\":\"http://172.16.5.120:8080\"},{\"access\":\"read-write\",\"comment\":\"\",\"display\":\"PCF Enable\",\"filter\":\"\",\"name\":\"pcfEnable\",\"type\":\"bool\",\"value\":\"true\"},{\"access\":\"read-write\",\"comment\":\"\",\"display\":\"PCF URI\",\"filter\":\"\",\"name\":\"pcfUri\",\"type\":\"string\",\"value\":\"http://172.16.5.160:8080\"},{\"access\":\"read-write\",\"comment\":\"\",\"display\":\"UDM URI\",\"filter\":\"\",\"name\":\"udmUri\",\"type\":\"string\",\"value\":\"http://172.16.5.140:8080\"},{\"access\":\"read-write\",\"display\":\"5G Charging Enable\",\"filter\":\"{\\\"0\\\":\\\"false\\\", \\\"1\\\":\\\"true\\\"}\",\"name\":\"chfEnable\",\"type\":\"bool\",\"value\":\"false\"},{\"access\":\"read-write\",\"comment\":\"\",\"display\":\"CHF Primary URI\",\"filter\":\"\",\"name\":\"chfPrimaryUri\",\"type\":\"string\",\"value\":\"http://172.16.5.240:8080\"},{\"access\":\"read-write\",\"comment\":\"\",\"display\":\"CHF Secondary URI\",\"filter\":\"\",\"name\":\"chfSecondaryUri\",\"type\":\"string\",\"value\":\"\"},{\"access\":\"read-write\",\"comment\":\"\",\"display\":\"NRF Enable\",\"filter\":\"{\\\"0\\\":\\\"false\\\", \\\"1\\\":\\\"true\\\"}\",\"name\":\"nrfEnable\",\"type\":\"bool\",\"value\":\"false\"},{\"access\":\"read-write\",\"comment\":\"\",\"display\":\"NRF URI\",\"filter\":\"\",\"name\":\"nrfUri\",\"type\":\"string\",\"value\":\"http://172.16.5.180:8080\"},{\"access\":\"read-write\",\"comment\":\"\",\"display\":\"Primary DNS IPv4\",\"filter\":\"\",\"name\":\"primaryDnsIpv4\",\"type\":\"ipv4\",\"value\":\"114.114.114.114\"},{\"access\":\"read-write\",\"comment\":\"\",\"display\":\"Secondary DNS IPv4\",\"filter\":\"\",\"name\":\"secondaryDnsIpv4\",\"type\":\"ipv4\",\"value\":\"\"},{\"access\":\"read-write\",\"comment\":\"\",\"display\":\"Primary DNS IPv6\",\"filter\":\"\",\"name\":\"primaryDnsIpv6\",\"type\":\"ipv6\",\"value\":\"\"},{\"access\":\"read-write\",\"comment\":\"\",\"display\":\"Secondary DNS IPv6\",\"filter\":\"\",\"name\":\"secondaryDnsIpv6\",\"type\":\"ipv6\",\"value\":\"\"},{\"access\":\"read-write\",\"comment\":\"\",\"display\":\"Primary PCSCF IPv4\",\"filter\":\"\",\"name\":\"primaryPcscfIpv4\",\"type\":\"ipv4\",\"value\":\"172.16.5.110\"},{\"access\":\"read-write\",\"comment\":\"\",\"display\":\"Secondary PCSCF IPv4\",\"filter\":\"\",\"name\":\"secondaryPcscfIpv4\",\"type\":\"ipv4\",\"value\":\"\"},{\"access\":\"read-write\",\"comment\":\"\",\"display\":\"Primary PCSCF IPv6\",\"filter\":\"\",\"name\":\"primaryPcscfIpv6\",\"type\":\"ipv6\",\"value\":\"\"},{\"access\":\"read-write\",\"comment\":\"\",\"display\":\"Secondary PCSCF IPv6\",\"filter\":\"\",\"name\":\"secondaryPcscfIpv6\",\"type\":\"ipv6\",\"value\":\"\"},{\"access\":\"read-write\",\"comment\":\"\",\"display\":\"UE MTU\",\"filter\":\"0~65535\",\"name\":\"ueMtu\",\"type\":\"int\",\"value\":\"\"}]}');
+INSERT INTO `param_config` VALUES (1646, 'SMF', '', 'spgwSystem', 'SPGW Sytem Config', '', '{\"list\":[{\"access\":\"read-write\",\"comment\":\"\",\"display\":\"Local S11 IP\",\"filter\":\"\",\"name\":\"s11Ip\",\"type\":\"string\",\"value\":\"172.16.5.150\"},{\"access\":\"read-write\",\"comment\":\"\",\"display\":\"Local Diameter IP\",\"filter\":\"\",\"name\":\"localDiameterIp\",\"type\":\"string\",\"value\":\"172.16.5.150\"},{\"access\":\"read-write\",\"comment\":\"\",\"display\":\"Local Diameter Host Name\",\"filter\":\"\",\"name\":\"localDiameterHostName\",\"type\":\"string\",\"value\":\"smf.mnc001.mcc001.3gppnetwork.org\"},{\"access\":\"read-write\",\"comment\":\"\",\"display\":\"Local Diameter Realm Name\",\"filter\":\"\",\"name\":\"localDiameterRealmName\",\"type\":\"string\",\"value\":\"mnc001.mcc001.3gppnetwork.org\"},{\"access\":\"read-write\",\"comment\":\"\",\"display\":\"Gy Enable\",\"filter\":\"false;true;\",\"name\":\"peerGyEnable\",\"type\":\"bool\",\"value\":\"false\"},{\"access\":\"read-write\",\"comment\":\"\",\"display\":\"Primary Remote Gy IP\",\"filter\":\"\",\"name\":\"primaryPeerGyIp\",\"type\":\"string\",\"value\":\"\"},{\"access\":\"read-write\",\"comment\":\"0~65535\",\"display\":\"Primary Remote Gy Port\",\"filter\":\"0~65535\",\"name\":\"primaryPeerGyPort\",\"type\":\"int\",\"value\":\"3868\"},{\"access\":\"read-write\",\"comment\":\"\",\"display\":\"Secondary Remote Gy IP\",\"filter\":\"\",\"name\":\"secondaryPeerGyIp\",\"type\":\"string\",\"value\":\"\"},{\"access\":\"read-write\",\"comment\":\"0~65535\",\"display\":\"Secondary Remote Gy Port\",\"filter\":\"0~65535\",\"name\":\"secondaryPeerGyPort\",\"type\":\"int\",\"value\":\"3868\"},{\"access\":\"read-write\",\"comment\":\"\",\"display\":\"Gx Enable\",\"filter\":\"false;true;\",\"name\":\"peerGxEnable\",\"type\":\"bool\",\"value\":\"false\"},{\"access\":\"read-write\",\"comment\":\"\",\"display\":\"Gx Charging Enable\",\"filter\":\"false;true;\",\"name\":\"gxChargingEnable\",\"type\":\"bool\",\"value\":\"false\"},{\"access\":\"read-write\",\"comment\":\"\",\"display\":\"Primary Remote Gx IP\",\"filter\":\"\",\"name\":\"primaryPeerGxIp\",\"type\":\"string\",\"value\":\"\"},{\"access\":\"read-write\",\"comment\":\"0~65535\",\"display\":\"Primary Remote Gx Port\",\"filter\":\"0~65535\",\"name\":\"primaryPeerGxPort\",\"type\":\"int\",\"value\":\"3868\"},{\"access\":\"read-write\",\"comment\":\"\",\"display\":\"Secondary Remote Gx IP\",\"filter\":\"\",\"name\":\"secondaryPeerGxIp\",\"type\":\"string\",\"value\":\"\"},{\"access\":\"read-write\",\"comment\":\"0~65535\",\"display\":\"Secondary Remote Gx Port\",\"filter\":\"0~65535\",\"name\":\"secondaryPeerGxPort\",\"type\":\"int\",\"value\":\"3868\"}]}');
+INSERT INTO `param_config` VALUES (1647, 'SMF', '', 'upfConfig', 'UPF Config', '', '{\"array\":[{\"access\":\"read-only\",\"comment\":\"\",\"display\":\"Index\",\"filter\":\"0~2047\",\"name\":\"index\",\"type\":\"int\",\"value\":\"\"},{\"access\":\"read-write\",\"comment\":\"\",\"display\":\"UPF ID\",\"filter\":\"1~64\",\"name\":\"id\",\"type\":\"string\",\"value\":\"\"},{\"access\":\"read-write\",\"comment\":\"e.g. ip:port\",\"display\":\"Address\",\"filter\":\"7~45\",\"name\":\"addr\",\"type\":\"string\",\"value\":\"\"},{\"access\":\"read-write\",\"comment\":\"IPv4,IPv6,IPv4v6\",\"display\":\"Ip Pool Type\",\"filter\":\"\",\"name\":\"ipPoolType\",\"type\":\"string\",\"value\":\"IPv4v6\"},{\"access\":\"read-write\",\"comment\":\"CIDR format, e.g. 192.168.1.0/24\",\"display\":\"IPv4 Pools\",\"filter\":\"10~256\",\"name\":\"ipv4Pools\",\"type\":\"string\",\"value\":\"\"},{\"access\":\"read-write\",\"comment\":\"CIDR format, e.g. fe80::20c:29ff:fee4:dab7/50\",\"display\":\"IPv6 Pools\",\"filter\":\"5~512\",\"name\":\"ipv6Pools\",\"type\":\"string\",\"value\":\"\"},{\"access\":\"read-write\",\"comment\":\"\",\"display\":\"Static IPv4 Enable\",\"filter\":\"{\\\"0\\\":\\\"false\\\", \\\"1\\\":\\\"true\\\"}\",\"name\":\"staticIpv4Enable\",\"type\":\"bool\",\"value\":\"\"},{\"access\":\"read-write\",\"comment\":\"ipv4 format\",\"display\":\"Static IPv4 Start\",\"filter\":\"\",\"name\":\"staticIpv4Start\",\"type\":\"ipv4\",\"value\":\"\"},{\"access\":\"read-write\",\"comment\":\"ipv4 format\",\"display\":\"Static IPv4 End\",\"filter\":\"\",\"name\":\"staticIpv4End\",\"type\":\"ipv4\",\"value\":\"\"},{\"access\":\"read-write\",\"comment\":\"\",\"display\":\"Static IPv6 Enable\",\"filter\":\"{\\\"0\\\":\\\"false\\\", \\\"1\\\":\\\"true\\\"}\",\"name\":\"staticIpv6Enable\",\"type\":\"bool\",\"value\":\"\"},{\"access\":\"read-write\",\"comment\":\"ipv6 format\",\"display\":\"Static IPv6 Start\",\"filter\":\"\",\"name\":\"staticIpv6Start\",\"type\":\"ipv6\",\"value\":\"\"},{\"access\":\"read-write\",\"comment\":\"ipv6 format\",\"display\":\"Static IPv6 End\",\"filter\":\"\",\"name\":\"staticIpv6End\",\"type\":\"ipv6\",\"value\":\"\"},{\"array\":[{\"access\":\"read-only\",\"comment\":\"\",\"display\":\"Index\",\"filter\":\"0~2047\",\"name\":\"index\",\"type\":\"int\",\"value\":\"\"},{\"access\":\"read-write\",\"comment\":\"\",\"display\":\"DNN\",\"filter\":\"1~64\",\"name\":\"dnn\",\"type\":\"string\",\"value\":\"\"},{\"access\":\"read-write\",\"comment\":\"IPv4,IPv6,IPv4v6\",\"display\":\"Ip Pool Type\",\"filter\":\"\",\"name\":\"ipPoolType\",\"type\":\"string\",\"value\":\"IPv4v6\"},{\"access\":\"read-write\",\"comment\":\"CIDR format, e.g. 192.168.1.0/24\",\"display\":\"IPv4 Pools\",\"filter\":\"10~256\",\"name\":\"ipv4Pools\",\"type\":\"string\",\"value\":\"\"},{\"access\":\"read-write\",\"comment\":\"CIDR format, e.g. fe80::20c:29ff:fee4:dab7/50\",\"display\":\"IPv6 Pools\",\"filter\":\"5~512\",\"name\":\"ipv6Pools\",\"type\":\"string\",\"value\":\"\"},{\"access\":\"read-write\",\"comment\":\"\",\"display\":\"Static IPv4 Enable\",\"filter\":\"{\\\"0\\\":\\\"false\\\", \\\"1\\\":\\\"true\\\"}\",\"name\":\"staticIpv4Enable\",\"type\":\"bool\",\"value\":\"\"},{\"access\":\"read-write\",\"comment\":\"ipv4 format\",\"display\":\"Static IPv4 Start\",\"filter\":\"\",\"name\":\"staticIpv4Start\",\"type\":\"ipv4\",\"value\":\"\"},{\"access\":\"read-write\",\"comment\":\"ipv4 format\",\"display\":\"Static IPv4 End\",\"filter\":\"\",\"name\":\"staticIpv4End\",\"type\":\"ipv4\",\"value\":\"\"},{\"access\":\"read-write\",\"comment\":\"\",\"display\":\"Static IPv6 Enable\",\"filter\":\"{\\\"0\\\":\\\"false\\\", \\\"1\\\":\\\"true\\\"}\",\"name\":\"staticIpv6Enable\",\"type\":\"bool\",\"value\":\"\"},{\"access\":\"read-write\",\"comment\":\"ipv6 format\",\"display\":\"Static IPv6 Start\",\"filter\":\"\",\"name\":\"staticIpv6Start\",\"type\":\"ipv6\",\"value\":\"\"},{\"access\":\"read-write\",\"comment\":\"ipv6 format\",\"display\":\"Static IPv6 End\",\"filter\":\"\",\"name\":\"staticIpv6End\",\"type\":\"ipv6\",\"value\":\"\"}],\"display\":\"UE DNN IP Pool\",\"name\":\"ueDnnIpPool\"}]}');
+INSERT INTO `param_config` VALUES (1648, 'SMF', '', 'dnnSelectUpf', 'DNN Select UPF', '', '{\"array\":[{\"access\":\"read-only\",\"comment\":\"\",\"display\":\"Index\",\"filter\":\"0~65535\",\"name\":\"index\",\"type\":\"int\",\"value\":\"0\"},{\"access\":\"read-write\",\"comment\":\"\",\"display\":\"DNN\",\"filter\":\"1~64\",\"name\":\"dnn\",\"type\":\"string\",\"value\":\"\"},{\"access\":\"read-write\",\"comment\":\"\",\"display\":\"UPF ID\",\"filter\":\"1~64\",\"name\":\"upfId\",\"type\":\"string\",\"value\":\"\"}]}');
+INSERT INTO `param_config` VALUES (1649, 'SMF', '', 'dnnTaiSelectUpf', 'DNN TAI Select UPF', '', '{\"array\":[{\"access\":\"read-only\",\"comment\":\"\",\"display\":\"Index\",\"filter\":\"0~65535\",\"name\":\"index\",\"type\":\"int\",\"value\":\"\"},{\"access\":\"read-write\",\"comment\":\"\",\"display\":\"DNN\",\"filter\":\"1~64\",\"name\":\"dnn\",\"type\":\"string\",\"value\":\"\"},{\"access\":\"read-write\",\"comment\":\"MCC+MNC+TAC\",\"display\":\"TAI\",\"filter\":\"1~64\",\"name\":\"tai\",\"type\":\"string\",\"value\":\"\"},{\"access\":\"read-write\",\"comment\":\"\",\"display\":\"UPF ID\",\"filter\":\"1~64\",\"name\":\"upfId\",\"type\":\"string\",\"value\":\"upf2-Id\"}]}');
+INSERT INTO `param_config` VALUES (1650, 'SMF', '', 'snssaiSelectUpf', 'SNSSAI Select UPF', '', '{\"array\":[{\"access\":\"read-only\",\"comment\":\"\",\"display\":\"Index\",\"filter\":\"0~65535\",\"name\":\"index\",\"type\":\"int\",\"value\":\"\"},{\"access\":\"read-write\",\"display\":\"Enable\",\"filter\":\"false;true;\",\"name\":\"enable\",\"type\":\"bool\",\"value\":\"true\"},{\"access\":\"read-write\",\"comment\":\"sst1-sd1;sst2-sd2;sst3-sd3\",\"display\":\"SNSSAI\",\"filter\":\"1~64\",\"name\":\"snssai\",\"type\":\"string\",\"value\":\"1-000001\"},{\"access\":\"read-write\",\"comment\":\"upf1-id;upf2-id;upf3-id\",\"display\":\"UPF ID\",\"filter\":\"1~64\",\"name\":\"upfId\",\"type\":\"string\",\"value\":\"upf1-Id\"}]}');

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

 SET FOREIGN_KEY_CHECKS = 1;
--- a/database/install/sys_dict_data2_i18n_en.sql
+++ b/database/install/sys_dict_data2_i18n_en.sql
@@ -661,5 +661,6 @@ INSERT INTO `sys_dict_data` VALUES (4134, 4134, 'dictData.ne_version_status.0',
 INSERT INTO `sys_dict_data` VALUES (4135, 4135, 'dictData.ne_version_status.1', 'Current', 'i18n_en', '', '', '1', 'supervisor', 1705550000000, '', 0, '');
 INSERT INTO `sys_dict_data` VALUES (4136, 4136, 'dictData.ne_version_status.2', 'Previous', 'i18n_en', '', '', '1', 'supervisor', 1705550000000, '', 0, '');
 INSERT INTO `sys_dict_data` VALUES (4137, 4137, 'dictData.ne_version_status.3', 'Has New', 'i18n_en', '', '', '1', 'supervisor', 1705550000000, '', 0, '');
+INSERT INTO `sys_dict_data` VALUES (4138, 4138, 'menu.fault.event', 'Event Notification', 'i18n_en', '', '', '1', 'supervisor', 1705550000000, '', 0, '');

 SET FOREIGN_KEY_CHECKS = 1;
--- a/database/install/sys_menu.sql
+++ b/database/install/sys_menu.sql
@@ -11,7 +11,7 @@
 Target Server Version : 100338 (10.3.38-MariaDB)
 File Encoding         : 65001

- Date: 11/05/2024 16:51:57
+ Date: 30/05/2024 16:52:39
 */

 SET NAMES utf8mb4;
@@ -185,5 +185,6 @@ INSERT INTO `sys_menu` VALUES (2143, 'menu.config.neLicense', 4, 20, 'neLicense'
 INSERT INTO `sys_menu` VALUES (2144, 'menu.config.neSoftware', 4, 23, 'neSoftware', 'ne/neSoftware/index', '1', '0', 'M', '1', '1', 'ne:neSoftware:list', 'icon-fuzhidaima', 'supervisor', 1708580000000, '', 0, '');
 INSERT INTO `sys_menu` VALUES (2145, 'menu.config.neVersion', 4, 26, 'neVersion', 'ne/neVersion/index', '1', '0', 'M', '1', '1', 'ne:neVersion:list', 'icon-fuzhidaima', 'supervisor', 1708580000000, '', 0, '');
 INSERT INTO `sys_menu` VALUES (2146, 'menu.ne.neConfPara5G', 4, 8, 'neConfPara5G', 'ne/neConfPara5G/index', '1', '0', 'M', '1', '1', 'ne:neConfPara5G:list', 'icon-wofaqi', 'supervisor', 1708580000000, '', 0, '');
+INSERT INTO `sys_menu` VALUES (2147, 'menu.fault.event', 2129, 3, 'event', 'faultManage/event/index', '1', '0', 'M', '1', '1', 'faultManage:event:index', 'icon-tubiaoku', 'supervisor', 1717051993146, '', 0, '');

 SET FOREIGN_KEY_CHECKS = 1;
--- a/database/install/sys_role_menu.sql
+++ b/database/install/sys_role_menu.sql
@@ -1,33 +1,31 @@
-- 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
+/*
+ Navicat Premium Data Transfer

-/*!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 */;
+ Source Server         : local_mariadb
+ Source Server Type    : MariaDB
+ Source Server Version : 100338 (10.3.38-MariaDB)
+ Source Host           : localhost:33066
+ Source Schema         : omc_db

--
-- Table structure for table `sys_role_menu`
--
+ Target Server Type    : MariaDB
+ Target Server Version : 100338 (10.3.38-MariaDB)
+ File Encoding         : 65001

+ Date: 30/05/2024 17:22:32
+*/
+
+SET NAMES utf8mb4;
+SET FOREIGN_KEY_CHECKS = 0;
+
+-- ----------------------------
+-- Table structure for sys_role_menu
+-- ----------------------------
 DROP TABLE IF EXISTS `sys_role_menu`;
-/*!40101 SET @saved_cs_client     = @@character_set_client */;
-/*!40101 SET character_set_client = utf8 */;
-CREATE TABLE `sys_role_menu` (
+CREATE TABLE `sys_role_menu`  (
  `role_id` bigint(20) NOT NULL COMMENT '角色ID',
  `menu_id` bigint(20) NOT NULL COMMENT '菜单ID',
-  PRIMARY KEY (`role_id`,`menu_id`) USING BTREE
-) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_general_ci ROW_FORMAT=DYNAMIC COMMENT='角色和菜单关联表';
-/*!40101 SET character_set_client = @saved_cs_client */;
+  PRIMARY KEY (`role_id`, `menu_id`) USING BTREE
+) ENGINE = InnoDB CHARACTER SET = utf8mb4 COLLATE = utf8mb4_general_ci COMMENT = '角色和菜单关联表' ROW_FORMAT = Dynamic;

 --
 -- Dumping data for table `sys_role_menu`
@@ -35,247 +33,250 @@ CREATE TABLE `sys_role_menu` (

 LOCK TABLES `sys_role_menu` WRITE;
 /*!40000 ALTER TABLE `sys_role_menu` DISABLE KEYS */;
-INSERT INTO `sys_role_menu` VALUES (2, 1);
-INSERT INTO `sys_role_menu` VALUES (2, 4);
-INSERT INTO `sys_role_menu` VALUES (2, 5);
-INSERT INTO `sys_role_menu` VALUES (2, 100);
-INSERT INTO `sys_role_menu` VALUES (2, 101);
-INSERT INTO `sys_role_menu` VALUES (2, 102);
-INSERT INTO `sys_role_menu` VALUES (2, 103);
-INSERT INTO `sys_role_menu` VALUES (2, 104);
-INSERT INTO `sys_role_menu` VALUES (2, 105);
-INSERT INTO `sys_role_menu` VALUES (2, 108);
-INSERT INTO `sys_role_menu` VALUES (2, 111);
-INSERT INTO `sys_role_menu` VALUES (2, 112);
-INSERT INTO `sys_role_menu` VALUES (2, 115);
-INSERT INTO `sys_role_menu` VALUES (2, 116);
-INSERT INTO `sys_role_menu` VALUES (2, 117);
-INSERT INTO `sys_role_menu` VALUES (2, 500);
-INSERT INTO `sys_role_menu` VALUES (2, 501);
-INSERT INTO `sys_role_menu` VALUES (2, 1000);
-INSERT INTO `sys_role_menu` VALUES (2, 1001);
-INSERT INTO `sys_role_menu` VALUES (2, 1002);
-INSERT INTO `sys_role_menu` VALUES (2, 1003);
-INSERT INTO `sys_role_menu` VALUES (2, 1004);
-INSERT INTO `sys_role_menu` VALUES (2, 1005);
-INSERT INTO `sys_role_menu` VALUES (2, 1006);
-INSERT INTO `sys_role_menu` VALUES (2, 1007);
-INSERT INTO `sys_role_menu` VALUES (2, 1008);
-INSERT INTO `sys_role_menu` VALUES (2, 1009);
-INSERT INTO `sys_role_menu` VALUES (2, 1010);
-INSERT INTO `sys_role_menu` VALUES (2, 1011);
-INSERT INTO `sys_role_menu` VALUES (2, 1012);
-INSERT INTO `sys_role_menu` VALUES (2, 1013);
-INSERT INTO `sys_role_menu` VALUES (2, 1014);
-INSERT INTO `sys_role_menu` VALUES (2, 1015);
-INSERT INTO `sys_role_menu` VALUES (2, 1016);
-INSERT INTO `sys_role_menu` VALUES (2, 1017);
-INSERT INTO `sys_role_menu` VALUES (2, 1018);
-INSERT INTO `sys_role_menu` VALUES (2, 1019);
-INSERT INTO `sys_role_menu` VALUES (2, 1020);
-INSERT INTO `sys_role_menu` VALUES (2, 1021);
-INSERT INTO `sys_role_menu` VALUES (2, 1022);
-INSERT INTO `sys_role_menu` VALUES (2, 1023);
-INSERT INTO `sys_role_menu` VALUES (2, 1024);
-INSERT INTO `sys_role_menu` VALUES (2, 1030);
-INSERT INTO `sys_role_menu` VALUES (2, 1031);
-INSERT INTO `sys_role_menu` VALUES (2, 1032);
-INSERT INTO `sys_role_menu` VALUES (2, 1033);
-INSERT INTO `sys_role_menu` VALUES (2, 1034);
-INSERT INTO `sys_role_menu` VALUES (2, 1039);
-INSERT INTO `sys_role_menu` VALUES (2, 1040);
-INSERT INTO `sys_role_menu` VALUES (2, 1041);
-INSERT INTO `sys_role_menu` VALUES (2, 1042);
-INSERT INTO `sys_role_menu` VALUES (2, 1043);
-INSERT INTO `sys_role_menu` VALUES (2, 1044);
-INSERT INTO `sys_role_menu` VALUES (2, 1045);
-INSERT INTO `sys_role_menu` VALUES (2, 1048);
-INSERT INTO `sys_role_menu` VALUES (2, 1049);
-INSERT INTO `sys_role_menu` VALUES (2, 1050);
-INSERT INTO `sys_role_menu` VALUES (2, 1051);
-INSERT INTO `sys_role_menu` VALUES (2, 1052);
-INSERT INTO `sys_role_menu` VALUES (2, 1053);
-INSERT INTO `sys_role_menu` VALUES (2, 1054);
-INSERT INTO `sys_role_menu` VALUES (2, 1055);
-INSERT INTO `sys_role_menu` VALUES (2, 1056);
-INSERT INTO `sys_role_menu` VALUES (2, 2009);
-INSERT INTO `sys_role_menu` VALUES (2, 2010);
-INSERT INTO `sys_role_menu` VALUES (2, 2075);
-INSERT INTO `sys_role_menu` VALUES (2, 2078);
-INSERT INTO `sys_role_menu` VALUES (2, 2079);
-INSERT INTO `sys_role_menu` VALUES (2, 2080);
-INSERT INTO `sys_role_menu` VALUES (2, 2081);
-INSERT INTO `sys_role_menu` VALUES (2, 2082);
-INSERT INTO `sys_role_menu` VALUES (2, 2083);
-INSERT INTO `sys_role_menu` VALUES (2, 2084);
-INSERT INTO `sys_role_menu` VALUES (2, 2085);
-INSERT INTO `sys_role_menu` VALUES (2, 2086);
-INSERT INTO `sys_role_menu` VALUES (2, 2087);
-INSERT INTO `sys_role_menu` VALUES (2, 2088);
-INSERT INTO `sys_role_menu` VALUES (2, 2089);
-INSERT INTO `sys_role_menu` VALUES (2, 2091);
-INSERT INTO `sys_role_menu` VALUES (2, 2092);
-INSERT INTO `sys_role_menu` VALUES (2, 2094);
-INSERT INTO `sys_role_menu` VALUES (2, 2097);
-INSERT INTO `sys_role_menu` VALUES (2, 2098);
-INSERT INTO `sys_role_menu` VALUES (2, 2099);
-INSERT INTO `sys_role_menu` VALUES (2, 2100);
-INSERT INTO `sys_role_menu` VALUES (2, 2101);
-INSERT INTO `sys_role_menu` VALUES (2, 2102);
-INSERT INTO `sys_role_menu` VALUES (2, 2103);
-INSERT INTO `sys_role_menu` VALUES (2, 2104);
-INSERT INTO `sys_role_menu` VALUES (2, 2105);
-INSERT INTO `sys_role_menu` VALUES (2, 2106);
-INSERT INTO `sys_role_menu` VALUES (2, 2107);
-INSERT INTO `sys_role_menu` VALUES (2, 2108);
-INSERT INTO `sys_role_menu` VALUES (2, 2109);
-INSERT INTO `sys_role_menu` VALUES (2, 2111);
-INSERT INTO `sys_role_menu` VALUES (2, 2112);
-INSERT INTO `sys_role_menu` VALUES (2, 2113);
-INSERT INTO `sys_role_menu` VALUES (2, 2114);
-INSERT INTO `sys_role_menu` VALUES (2, 2118);
-INSERT INTO `sys_role_menu` VALUES (2, 2119);
-INSERT INTO `sys_role_menu` VALUES (2, 2120);
-INSERT INTO `sys_role_menu` VALUES (2, 2121);
-INSERT INTO `sys_role_menu` VALUES (2, 2122);
-INSERT INTO `sys_role_menu` VALUES (2, 2123);
-INSERT INTO `sys_role_menu` VALUES (2, 2124);
-INSERT INTO `sys_role_menu` VALUES (2, 2125);
-INSERT INTO `sys_role_menu` VALUES (2, 2126);
-INSERT INTO `sys_role_menu` VALUES (2, 2128);
-INSERT INTO `sys_role_menu` VALUES (2, 2129);
-INSERT INTO `sys_role_menu` VALUES (2, 2130);
-INSERT INTO `sys_role_menu` VALUES (2, 2131);
-INSERT INTO `sys_role_menu` VALUES (2, 2132);
-INSERT INTO `sys_role_menu` VALUES (2, 2133);
-INSERT INTO `sys_role_menu` VALUES (2, 2137);
-INSERT INTO `sys_role_menu` VALUES (2, 2138);
-INSERT INTO `sys_role_menu` VALUES (2, 2140);
-INSERT INTO `sys_role_menu` VALUES (2, 2141);
-INSERT INTO `sys_role_menu` VALUES (2, 2142);
-INSERT INTO `sys_role_menu` VALUES (2, 2143);
-INSERT INTO `sys_role_menu` VALUES (2, 2144);
-INSERT INTO `sys_role_menu` VALUES (2, 2145);
-INSERT INTO `sys_role_menu` VALUES (2, 2146);
-INSERT INTO `sys_role_menu` VALUES (3, 1);
-INSERT INTO `sys_role_menu` VALUES (3, 4);
-INSERT INTO `sys_role_menu` VALUES (3, 5);
-INSERT INTO `sys_role_menu` VALUES (3, 108);
-INSERT INTO `sys_role_menu` VALUES (3, 112);
-INSERT INTO `sys_role_menu` VALUES (3, 115);
-INSERT INTO `sys_role_menu` VALUES (3, 500);
-INSERT INTO `sys_role_menu` VALUES (3, 501);
-INSERT INTO `sys_role_menu` VALUES (3, 1030);
-INSERT INTO `sys_role_menu` VALUES (3, 1031);
-INSERT INTO `sys_role_menu` VALUES (3, 1032);
-INSERT INTO `sys_role_menu` VALUES (3, 1034);
-INSERT INTO `sys_role_menu` VALUES (3, 1039);
-INSERT INTO `sys_role_menu` VALUES (3, 1042);
-INSERT INTO `sys_role_menu` VALUES (3, 1048);
-INSERT INTO `sys_role_menu` VALUES (3, 2009);
-INSERT INTO `sys_role_menu` VALUES (3, 2010);
-INSERT INTO `sys_role_menu` VALUES (3, 2075);
-INSERT INTO `sys_role_menu` VALUES (3, 2078);
-INSERT INTO `sys_role_menu` VALUES (3, 2080);
-INSERT INTO `sys_role_menu` VALUES (3, 2081);
-INSERT INTO `sys_role_menu` VALUES (3, 2082);
-INSERT INTO `sys_role_menu` VALUES (3, 2083);
-INSERT INTO `sys_role_menu` VALUES (3, 2084);
-INSERT INTO `sys_role_menu` VALUES (3, 2085);
-INSERT INTO `sys_role_menu` VALUES (3, 2086);
-INSERT INTO `sys_role_menu` VALUES (3, 2087);
-INSERT INTO `sys_role_menu` VALUES (3, 2088);
-INSERT INTO `sys_role_menu` VALUES (3, 2089);
-INSERT INTO `sys_role_menu` VALUES (3, 2091);
-INSERT INTO `sys_role_menu` VALUES (3, 2092);
-INSERT INTO `sys_role_menu` VALUES (3, 2094);
-INSERT INTO `sys_role_menu` VALUES (3, 2097);
-INSERT INTO `sys_role_menu` VALUES (3, 2098);
-INSERT INTO `sys_role_menu` VALUES (3, 2099);
-INSERT INTO `sys_role_menu` VALUES (3, 2100);
-INSERT INTO `sys_role_menu` VALUES (3, 2101);
-INSERT INTO `sys_role_menu` VALUES (3, 2102);
-INSERT INTO `sys_role_menu` VALUES (3, 2103);
-INSERT INTO `sys_role_menu` VALUES (3, 2104);
-INSERT INTO `sys_role_menu` VALUES (3, 2105);
-INSERT INTO `sys_role_menu` VALUES (3, 2106);
-INSERT INTO `sys_role_menu` VALUES (3, 2107);
-INSERT INTO `sys_role_menu` VALUES (3, 2108);
-INSERT INTO `sys_role_menu` VALUES (3, 2109);
-INSERT INTO `sys_role_menu` VALUES (3, 2111);
-INSERT INTO `sys_role_menu` VALUES (3, 2112);
-INSERT INTO `sys_role_menu` VALUES (3, 2113);
-INSERT INTO `sys_role_menu` VALUES (3, 2118);
-INSERT INTO `sys_role_menu` VALUES (3, 2119);
-INSERT INTO `sys_role_menu` VALUES (3, 2120);
-INSERT INTO `sys_role_menu` VALUES (3, 2123);
-INSERT INTO `sys_role_menu` VALUES (3, 2124);
-INSERT INTO `sys_role_menu` VALUES (3, 2125);
-INSERT INTO `sys_role_menu` VALUES (3, 2126);
-INSERT INTO `sys_role_menu` VALUES (3, 2127);
-INSERT INTO `sys_role_menu` VALUES (3, 2128);
-INSERT INTO `sys_role_menu` VALUES (3, 2129);
-INSERT INTO `sys_role_menu` VALUES (3, 2130);
-INSERT INTO `sys_role_menu` VALUES (3, 2131);
-INSERT INTO `sys_role_menu` VALUES (3, 2132);
-INSERT INTO `sys_role_menu` VALUES (3, 2133);
-INSERT INTO `sys_role_menu` VALUES (3, 2138);
-INSERT INTO `sys_role_menu` VALUES (3, 2140);
-INSERT INTO `sys_role_menu` VALUES (3, 2141);
-INSERT INTO `sys_role_menu` VALUES (4, 1);
-INSERT INTO `sys_role_menu` VALUES (4, 5);
-INSERT INTO `sys_role_menu` VALUES (4, 112);
-INSERT INTO `sys_role_menu` VALUES (4, 115);
-INSERT INTO `sys_role_menu` VALUES (4, 500);
-INSERT INTO `sys_role_menu` VALUES (4, 501);
-INSERT INTO `sys_role_menu` VALUES (4, 1039);
-INSERT INTO `sys_role_menu` VALUES (4, 1041);
-INSERT INTO `sys_role_menu` VALUES (4, 1042);
-INSERT INTO `sys_role_menu` VALUES (4, 1044);
-INSERT INTO `sys_role_menu` VALUES (4, 1048);
-INSERT INTO `sys_role_menu` VALUES (4, 2080);
-INSERT INTO `sys_role_menu` VALUES (4, 2081);
-INSERT INTO `sys_role_menu` VALUES (4, 2082);
-INSERT INTO `sys_role_menu` VALUES (4, 2083);
-INSERT INTO `sys_role_menu` VALUES (4, 2084);
-INSERT INTO `sys_role_menu` VALUES (4, 2085);
-INSERT INTO `sys_role_menu` VALUES (4, 2086);
-INSERT INTO `sys_role_menu` VALUES (4, 2087);
-INSERT INTO `sys_role_menu` VALUES (4, 2088);
-INSERT INTO `sys_role_menu` VALUES (4, 2089);
-INSERT INTO `sys_role_menu` VALUES (4, 2091);
-INSERT INTO `sys_role_menu` VALUES (4, 2092);
-INSERT INTO `sys_role_menu` VALUES (4, 2094);
-INSERT INTO `sys_role_menu` VALUES (4, 2097);
-INSERT INTO `sys_role_menu` VALUES (4, 2098);
-INSERT INTO `sys_role_menu` VALUES (4, 2099);
-INSERT INTO `sys_role_menu` VALUES (4, 2101);
-INSERT INTO `sys_role_menu` VALUES (4, 2104);
-INSERT INTO `sys_role_menu` VALUES (4, 2113);
-INSERT INTO `sys_role_menu` VALUES (4, 2119);
-INSERT INTO `sys_role_menu` VALUES (4, 2120);
-INSERT INTO `sys_role_menu` VALUES (4, 2124);
-INSERT INTO `sys_role_menu` VALUES (4, 2125);
-INSERT INTO `sys_role_menu` VALUES (4, 2126);
-INSERT INTO `sys_role_menu` VALUES (4, 2127);
-INSERT INTO `sys_role_menu` VALUES (4, 2128);
-INSERT INTO `sys_role_menu` VALUES (4, 2129);
-INSERT INTO `sys_role_menu` VALUES (4, 2130);
-INSERT INTO `sys_role_menu` VALUES (4, 2131);
-INSERT INTO `sys_role_menu` VALUES (4, 2132);
-INSERT INTO `sys_role_menu` VALUES (4, 2133);
-INSERT INTO `sys_role_menu` VALUES (4, 2138);
-INSERT INTO `sys_role_menu` VALUES (4, 2140);
-INSERT INTO `sys_role_menu` VALUES (4, 2141);
-INSERT INTO `sys_role_menu` VALUES (5, 1);
-INSERT INTO `sys_role_menu` VALUES (5, 5);
-INSERT INTO `sys_role_menu` VALUES (5, 112);
-INSERT INTO `sys_role_menu` VALUES (5, 2080);
-INSERT INTO `sys_role_menu` VALUES (5, 2081);
-INSERT INTO `sys_role_menu` VALUES (5, 2082);
-INSERT INTO `sys_role_menu` VALUES (5, 2087);
-INSERT INTO `sys_role_menu` VALUES (5, 2131);
-INSERT INTO `sys_role_menu` VALUES (5, 2132);
+INSERT IGNORE INTO `sys_role_menu` VALUES (2, 1);
+INSERT IGNORE INTO `sys_role_menu` VALUES (2, 4);
+INSERT IGNORE INTO `sys_role_menu` VALUES (2, 5);
+INSERT IGNORE INTO `sys_role_menu` VALUES (2, 100);
+INSERT IGNORE INTO `sys_role_menu` VALUES (2, 101);
+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, 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, 115);
+INSERT IGNORE INTO `sys_role_menu` VALUES (2, 116);
+INSERT IGNORE INTO `sys_role_menu` VALUES (2, 117);
+INSERT IGNORE INTO `sys_role_menu` VALUES (2, 500);
+INSERT IGNORE INTO `sys_role_menu` VALUES (2, 501);
+INSERT IGNORE INTO `sys_role_menu` VALUES (2, 1000);
+INSERT IGNORE INTO `sys_role_menu` VALUES (2, 1001);
+INSERT IGNORE INTO `sys_role_menu` VALUES (2, 1002);
+INSERT IGNORE INTO `sys_role_menu` VALUES (2, 1003);
+INSERT IGNORE INTO `sys_role_menu` VALUES (2, 1004);
+INSERT IGNORE INTO `sys_role_menu` VALUES (2, 1005);
+INSERT IGNORE INTO `sys_role_menu` VALUES (2, 1006);
+INSERT IGNORE INTO `sys_role_menu` VALUES (2, 1007);
+INSERT IGNORE INTO `sys_role_menu` VALUES (2, 1008);
+INSERT IGNORE INTO `sys_role_menu` VALUES (2, 1009);
+INSERT IGNORE INTO `sys_role_menu` VALUES (2, 1010);
+INSERT IGNORE INTO `sys_role_menu` VALUES (2, 1011);
+INSERT IGNORE INTO `sys_role_menu` VALUES (2, 1012);
+INSERT IGNORE INTO `sys_role_menu` VALUES (2, 1013);
+INSERT IGNORE INTO `sys_role_menu` VALUES (2, 1014);
+INSERT IGNORE INTO `sys_role_menu` VALUES (2, 1015);
+INSERT IGNORE INTO `sys_role_menu` VALUES (2, 1016);
+INSERT IGNORE INTO `sys_role_menu` VALUES (2, 1017);
+INSERT IGNORE INTO `sys_role_menu` VALUES (2, 1018);
+INSERT IGNORE INTO `sys_role_menu` VALUES (2, 1019);
+INSERT IGNORE INTO `sys_role_menu` VALUES (2, 1020);
+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, 1030);
+INSERT IGNORE INTO `sys_role_menu` VALUES (2, 1031);
+INSERT IGNORE INTO `sys_role_menu` VALUES (2, 1032);
+INSERT IGNORE INTO `sys_role_menu` VALUES (2, 1033);
+INSERT IGNORE INTO `sys_role_menu` VALUES (2, 1034);
+INSERT IGNORE INTO `sys_role_menu` VALUES (2, 1039);
+INSERT IGNORE INTO `sys_role_menu` VALUES (2, 1040);
+INSERT IGNORE INTO `sys_role_menu` VALUES (2, 1041);
+INSERT IGNORE INTO `sys_role_menu` VALUES (2, 1042);
+INSERT IGNORE INTO `sys_role_menu` VALUES (2, 1043);
+INSERT IGNORE INTO `sys_role_menu` VALUES (2, 1044);
+INSERT IGNORE INTO `sys_role_menu` VALUES (2, 1045);
+INSERT IGNORE INTO `sys_role_menu` VALUES (2, 1048);
+INSERT IGNORE INTO `sys_role_menu` VALUES (2, 1049);
+INSERT IGNORE INTO `sys_role_menu` VALUES (2, 1050);
+INSERT IGNORE INTO `sys_role_menu` VALUES (2, 1051);
+INSERT IGNORE INTO `sys_role_menu` VALUES (2, 1052);
+INSERT IGNORE INTO `sys_role_menu` VALUES (2, 1053);
+INSERT IGNORE INTO `sys_role_menu` VALUES (2, 1054);
+INSERT IGNORE INTO `sys_role_menu` VALUES (2, 1055);
+INSERT IGNORE INTO `sys_role_menu` VALUES (2, 1056);
+INSERT IGNORE INTO `sys_role_menu` VALUES (2, 2009);
+INSERT IGNORE INTO `sys_role_menu` VALUES (2, 2010);
+INSERT IGNORE INTO `sys_role_menu` VALUES (2, 2075);
+INSERT IGNORE INTO `sys_role_menu` VALUES (2, 2078);
+INSERT IGNORE INTO `sys_role_menu` VALUES (2, 2079);
+INSERT IGNORE INTO `sys_role_menu` VALUES (2, 2080);
+INSERT IGNORE INTO `sys_role_menu` VALUES (2, 2081);
+INSERT IGNORE INTO `sys_role_menu` VALUES (2, 2082);
+INSERT IGNORE INTO `sys_role_menu` VALUES (2, 2083);
+INSERT IGNORE INTO `sys_role_menu` VALUES (2, 2084);
+INSERT IGNORE INTO `sys_role_menu` VALUES (2, 2085);
+INSERT IGNORE INTO `sys_role_menu` VALUES (2, 2086);
+INSERT IGNORE INTO `sys_role_menu` VALUES (2, 2087);
+INSERT IGNORE INTO `sys_role_menu` VALUES (2, 2088);
+INSERT IGNORE INTO `sys_role_menu` VALUES (2, 2089);
+INSERT IGNORE INTO `sys_role_menu` VALUES (2, 2091);
+INSERT IGNORE INTO `sys_role_menu` VALUES (2, 2092);
+INSERT IGNORE INTO `sys_role_menu` VALUES (2, 2094);
+INSERT IGNORE INTO `sys_role_menu` VALUES (2, 2097);
+INSERT IGNORE INTO `sys_role_menu` VALUES (2, 2098);
+INSERT IGNORE INTO `sys_role_menu` VALUES (2, 2099);
+INSERT IGNORE INTO `sys_role_menu` VALUES (2, 2100);
+INSERT IGNORE INTO `sys_role_menu` VALUES (2, 2101);
+INSERT IGNORE INTO `sys_role_menu` VALUES (2, 2102);
+INSERT IGNORE INTO `sys_role_menu` VALUES (2, 2103);
+INSERT IGNORE INTO `sys_role_menu` VALUES (2, 2104);
+INSERT IGNORE INTO `sys_role_menu` VALUES (2, 2105);
+INSERT IGNORE INTO `sys_role_menu` VALUES (2, 2106);
+INSERT IGNORE INTO `sys_role_menu` VALUES (2, 2107);
+INSERT IGNORE INTO `sys_role_menu` VALUES (2, 2108);
+INSERT IGNORE INTO `sys_role_menu` VALUES (2, 2109);
+INSERT IGNORE INTO `sys_role_menu` VALUES (2, 2111);
+INSERT IGNORE INTO `sys_role_menu` VALUES (2, 2112);
+INSERT IGNORE INTO `sys_role_menu` VALUES (2, 2113);
+INSERT IGNORE INTO `sys_role_menu` VALUES (2, 2114);
+INSERT IGNORE INTO `sys_role_menu` VALUES (2, 2118);
+INSERT IGNORE INTO `sys_role_menu` VALUES (2, 2119);
+INSERT IGNORE INTO `sys_role_menu` VALUES (2, 2120);
+INSERT IGNORE INTO `sys_role_menu` VALUES (2, 2121);
+INSERT IGNORE INTO `sys_role_menu` VALUES (2, 2122);
+INSERT IGNORE INTO `sys_role_menu` VALUES (2, 2123);
+INSERT IGNORE INTO `sys_role_menu` VALUES (2, 2124);
+INSERT IGNORE INTO `sys_role_menu` VALUES (2, 2125);
+INSERT IGNORE INTO `sys_role_menu` VALUES (2, 2126);
+INSERT IGNORE INTO `sys_role_menu` VALUES (2, 2128);
+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);
+INSERT IGNORE INTO `sys_role_menu` VALUES (3, 108);
+INSERT IGNORE INTO `sys_role_menu` VALUES (3, 112);
+INSERT IGNORE INTO `sys_role_menu` VALUES (3, 115);
+INSERT IGNORE INTO `sys_role_menu` VALUES (3, 500);
+INSERT IGNORE INTO `sys_role_menu` VALUES (3, 501);
+INSERT IGNORE INTO `sys_role_menu` VALUES (3, 1030);
+INSERT IGNORE INTO `sys_role_menu` VALUES (3, 1031);
+INSERT IGNORE INTO `sys_role_menu` VALUES (3, 1032);
+INSERT IGNORE INTO `sys_role_menu` VALUES (3, 1034);
+INSERT IGNORE INTO `sys_role_menu` VALUES (3, 1039);
+INSERT IGNORE INTO `sys_role_menu` VALUES (3, 1042);
+INSERT IGNORE INTO `sys_role_menu` VALUES (3, 1048);
+INSERT IGNORE INTO `sys_role_menu` VALUES (3, 2009);
+INSERT IGNORE INTO `sys_role_menu` VALUES (3, 2010);
+INSERT IGNORE INTO `sys_role_menu` VALUES (3, 2075);
+INSERT IGNORE INTO `sys_role_menu` VALUES (3, 2078);
+INSERT IGNORE INTO `sys_role_menu` VALUES (3, 2080);
+INSERT IGNORE INTO `sys_role_menu` VALUES (3, 2081);
+INSERT IGNORE INTO `sys_role_menu` VALUES (3, 2082);
+INSERT IGNORE INTO `sys_role_menu` VALUES (3, 2083);
+INSERT IGNORE INTO `sys_role_menu` VALUES (3, 2084);
+INSERT IGNORE INTO `sys_role_menu` VALUES (3, 2085);
+INSERT IGNORE INTO `sys_role_menu` VALUES (3, 2086);
+INSERT IGNORE INTO `sys_role_menu` VALUES (3, 2087);
+INSERT IGNORE INTO `sys_role_menu` VALUES (3, 2088);
+INSERT IGNORE INTO `sys_role_menu` VALUES (3, 2089);
+INSERT IGNORE INTO `sys_role_menu` VALUES (3, 2091);
+INSERT IGNORE INTO `sys_role_menu` VALUES (3, 2092);
+INSERT IGNORE INTO `sys_role_menu` VALUES (3, 2094);
+INSERT IGNORE INTO `sys_role_menu` VALUES (3, 2097);
+INSERT IGNORE INTO `sys_role_menu` VALUES (3, 2098);
+INSERT IGNORE INTO `sys_role_menu` VALUES (3, 2099);
+INSERT IGNORE INTO `sys_role_menu` VALUES (3, 2100);
+INSERT IGNORE INTO `sys_role_menu` VALUES (3, 2101);
+INSERT IGNORE INTO `sys_role_menu` VALUES (3, 2102);
+INSERT IGNORE INTO `sys_role_menu` VALUES (3, 2103);
+INSERT IGNORE INTO `sys_role_menu` VALUES (3, 2104);
+INSERT IGNORE INTO `sys_role_menu` VALUES (3, 2105);
+INSERT IGNORE INTO `sys_role_menu` VALUES (3, 2106);
+INSERT IGNORE INTO `sys_role_menu` VALUES (3, 2107);
+INSERT IGNORE INTO `sys_role_menu` VALUES (3, 2108);
+INSERT IGNORE INTO `sys_role_menu` VALUES (3, 2109);
+INSERT IGNORE INTO `sys_role_menu` VALUES (3, 2111);
+INSERT IGNORE INTO `sys_role_menu` VALUES (3, 2112);
+INSERT IGNORE INTO `sys_role_menu` VALUES (3, 2113);
+INSERT IGNORE INTO `sys_role_menu` VALUES (3, 2118);
+INSERT IGNORE INTO `sys_role_menu` VALUES (3, 2119);
+INSERT IGNORE INTO `sys_role_menu` VALUES (3, 2120);
+INSERT IGNORE INTO `sys_role_menu` VALUES (3, 2123);
+INSERT IGNORE INTO `sys_role_menu` VALUES (3, 2124);
+INSERT IGNORE INTO `sys_role_menu` VALUES (3, 2125);
+INSERT IGNORE INTO `sys_role_menu` VALUES (3, 2126);
+INSERT IGNORE INTO `sys_role_menu` VALUES (3, 2127);
+INSERT IGNORE INTO `sys_role_menu` VALUES (3, 2128);
+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);
+INSERT IGNORE INTO `sys_role_menu` VALUES (4, 115);
+INSERT IGNORE INTO `sys_role_menu` VALUES (4, 500);
+INSERT IGNORE INTO `sys_role_menu` VALUES (4, 501);
+INSERT IGNORE INTO `sys_role_menu` VALUES (4, 1039);
+INSERT IGNORE INTO `sys_role_menu` VALUES (4, 1041);
+INSERT IGNORE INTO `sys_role_menu` VALUES (4, 1042);
+INSERT IGNORE INTO `sys_role_menu` VALUES (4, 1044);
+INSERT IGNORE INTO `sys_role_menu` VALUES (4, 1048);
+INSERT IGNORE INTO `sys_role_menu` VALUES (4, 2080);
+INSERT IGNORE INTO `sys_role_menu` VALUES (4, 2081);
+INSERT IGNORE INTO `sys_role_menu` VALUES (4, 2082);
+INSERT IGNORE INTO `sys_role_menu` VALUES (4, 2083);
+INSERT IGNORE INTO `sys_role_menu` VALUES (4, 2084);
+INSERT IGNORE INTO `sys_role_menu` VALUES (4, 2085);
+INSERT IGNORE INTO `sys_role_menu` VALUES (4, 2086);
+INSERT IGNORE INTO `sys_role_menu` VALUES (4, 2087);
+INSERT IGNORE INTO `sys_role_menu` VALUES (4, 2088);
+INSERT IGNORE INTO `sys_role_menu` VALUES (4, 2089);
+INSERT IGNORE INTO `sys_role_menu` VALUES (4, 2091);
+INSERT IGNORE INTO `sys_role_menu` VALUES (4, 2092);
+INSERT IGNORE INTO `sys_role_menu` VALUES (4, 2094);
+INSERT IGNORE INTO `sys_role_menu` VALUES (4, 2097);
+INSERT IGNORE INTO `sys_role_menu` VALUES (4, 2098);
+INSERT IGNORE INTO `sys_role_menu` VALUES (4, 2099);
+INSERT IGNORE INTO `sys_role_menu` VALUES (4, 2101);
+INSERT IGNORE INTO `sys_role_menu` VALUES (4, 2104);
+INSERT IGNORE INTO `sys_role_menu` VALUES (4, 2113);
+INSERT IGNORE INTO `sys_role_menu` VALUES (4, 2119);
+INSERT IGNORE INTO `sys_role_menu` VALUES (4, 2120);
+INSERT IGNORE INTO `sys_role_menu` VALUES (4, 2124);
+INSERT IGNORE INTO `sys_role_menu` VALUES (4, 2125);
+INSERT IGNORE INTO `sys_role_menu` VALUES (4, 2126);
+INSERT IGNORE INTO `sys_role_menu` VALUES (4, 2127);
+INSERT IGNORE INTO `sys_role_menu` VALUES (4, 2128);
+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);
+INSERT IGNORE INTO `sys_role_menu` VALUES (5, 2080);
+INSERT IGNORE INTO `sys_role_menu` VALUES (5, 2081);
+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);
 /*!40000 ALTER TABLE `sys_role_menu` ENABLE KEYS */;
 UNLOCK TABLES;
 /*!40103 SET TIME_ZONE=@OLD_TIME_ZONE */;
--- a/database/upgrade/upg_alarm_event.sql
+++ b/database/upgrade/upg_alarm_event.sql
@@ -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;
--- a/database/upgrade/upg_sys_dict_data1_i18n_zh.sql
+++ b/database/upgrade/upg_sys_dict_data1_i18n_zh.sql
@@ -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;
--- a/database/upgrade/upg_sys_dict_data2_i18n_en.sql
+++ b/database/upgrade/upg_sys_dict_data2_i18n_en.sql
@@ -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;
--- a/database/upgrade/upg_sys_role_menu.sql
+++ b/database/upgrade/upg_sys_role_menu.sql
@@ -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;
--- a/database/upgvue3/upg_alarm_event.sql
+++ b/database/upgvue3/upg_alarm_event.sql
@@ -59,4 +59,79 @@ CREATE TABLE IF NOT EXISTS `alarm_event`  (
  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;

+-- 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;
--- a/database/upgvue3/upg_sys_dict_data1_i18n_zh.sql
+++ b/database/upgvue3/upg_sys_dict_data1_i18n_zh.sql
--- a/database/upgvue3/upg_sys_dict_data2_i18n_en.sql
+++ b/database/upgvue3/upg_sys_dict_data2_i18n_en.sql
--- a/database/upgvue3/upg_sys_menu.sql
+++ b/database/upgvue3/upg_sys_menu.sql
@@ -1145,4 +1145,47 @@ WHERE

 -- end: remove 

+INSERT IGNORE INTO
+    `omc_db`.`sys_menu` (
+        `menu_id`,
+        `menu_name`,
+        `parent_id`,
+        `menu_sort`,
+        `path`,
+        `component`,
+        `is_frame`,
+        `is_cache`,
+        `menu_type`,
+        `visible`,
+        `status`,
+        `perms`,
+        `icon`,
+        `create_by`,
+        `create_time`,
+        `update_by`,
+        `update_time`,
+        `remark`
+    )
+VALUES (
+        2144,
+        'menu.fault.event',
+        2129,
+        3,
+        'event',
+        'faultManage/event/index',
+        '1',
+        '0',
+        'M',
+        '1',
+        '1',
+        'faultManage:event:index',
+        'icon-tubiaoku',
+        'supervisor',
+        1717051993146,
+        'supervisor',
+        1717052106943,
+        ''
+    );
+
+
 SET FOREIGN_KEY_CHECKS = 1;
--- a/database/upgvue3/upg_sys_role_menu.sql
+++ b/database/upgvue3/upg_sys_role_menu.sql
@@ -304,52 +304,22 @@ 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, 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);

-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);
+-- alarm event to role
+INSERT IGNORE INTO `omc_db`.`sys_role_menu` (`role_id`, `menu_id`) VALUES (2, 2144);
+INSERT IGNORE INTO `omc_db`.`sys_role_menu` (`role_id`, `menu_id`) VALUES (3, 2144);
+INSERT IGNORE INTO `omc_db`.`sys_role_menu` (`role_id`, `menu_id`) VALUES (4, 2144);

 SET FOREIGN_KEY_CHECKS = 1;
--- a/2
+++ b/2
@@ -3,7 +3,7 @@
 ProjectL = omc
 ProjectU = OMC
 PROJECT = $(ProjectL)
-VERSION = 2.2405.3
+VERSION = 2.2405.4
 RelDate = `date +%Y%m%d`
 Release = $(RelDate)
 RelVer = $(VERSION)-$(RelDate)
--- a/mkpkg.sh
+++ b/mkpkg.sh
@@ -2,7 +2,7 @@

 ProcList="restagent crontask sshsvc captrace data2html"
 ProjectL=omc
-VERSION=2.2405.3
+VERSION=2.2405.4
 RelDate=`date +%Y%m%d`
 Release=${RelDate}
 RelVer=${VERSION}-${RelDate}
--- a/restagent/makefile
+++ b/restagent/makefile
@@ -1,7 +1,7 @@
 # Makefile for rest agent project

 PROJECT = OMC
-VERSION = 2.2405.3
+VERSION = 2.2405.4
 PLATFORM = amd64
 ARMPLATFORM = aarch64
 BUILDDIR = ../../build
--- a/src/framework/config/config/config.default.yaml
+++ b/src/framework/config/config/config.default.yaml
@@ -1,7 +1,7 @@
 # 项目信息
 framework:
  name: "CN EMS"
-  version: "2.2405.3"
+  version: "2.2405.4"

 # 应用服务配置
 server:
--- a/sshsvc/makefile
+++ b/sshsvc/makefile
@@ -1,7 +1,7 @@
 # Makefile for OMC-OMC-crontask project

 PROJECT = OMC
-VERSION = 2.2405.3
+VERSION = 2.2405.4
 LIBDIR = be.ems/lib
 BINNAME = sshsvc