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

captrace/makefile

@@ -1,7 +1,7 @@
 # Makefile for rest agent project
 
 PROJECT = OMC
-VERSION = 2.2404.6
+VERSION = 2.2405.1
 PLATFORM = amd64
 ARMPLATFORM = aarch64
 BUILDDIR = ../../build

config/param/smf_param_config.yaml

@@ -1,6 +1,6 @@
 smf:
   smfSystem:
-    display: "SMF System"
+    display: "SMF System Config"
     list:
     - name: "sbiIpAddr"
       type: "string"
@@ -83,14 +83,14 @@ smf:
       value: "http://172.16.5.240:8080"
       access: "read-write"
       filter: ''
-      display: "CHF PRIMARY URI"
+      display: "CHF Primary URI"
       comment: "" 
     - name: "chfSecondaryUri"
       type: "string"
       value: ""
       access: "read-write"
       filter: ''
-      display: "CHF SECONDARY URI"
+      display: "CHF Secondary URI"
       comment: "" 
     - name: "nrfEnable"
       type: "bool"
@@ -169,6 +169,114 @@ smf:
       filter: "0~65535"
       display: "UE MTU"
       comment: ""
+  spgwSystem:
+    display: "SPGW Sytem Config"
+    list:
+    - name: "s11Ip"
+      type: "string"
+      value: "172.16.5.150"
+      access: "read-write"
+      filter: ''
+      display: "Local S11 IP"
+      comment: ""
+    - name: "localDiameterIp"
+      type: "string"
+      value: "172.16.5.150"
+      access: "read-write"
+      filter: ''
+      display: "Local Diameter IP"
+      comment: ""
+    - name: "localDiameterHostName"
+      type: "string"
+      value: "smf.mnc001.mcc001.3gppnetwork.org"
+      access: "read-write"
+      filter: ''
+      display: "Local Diameter Host Name"
+      comment: ""
+    - name: "localDiameterRealmName"
+      type: "string"
+      value: "mnc001.mcc001.3gppnetwork.org"
+      access: "read-write"
+      filter: ''
+      display: "Local Diameter Realm Name"
+      comment: ""
+    - name: "peerGyEnable"
+      type: "bool"
+      value: 'false'
+      access: "read-write"
+      filter: 'false;true;'
+      display: "Gy Enable"
+      comment: "" 
+    - name: "primaryPeerGyIp"
+      type: "string"
+      value: ""
+      access: "read-write"
+      filter: ''
+      display: "Primary Remote Gy IP"
+      comment: ""
+    - name: "primaryPeerGyPort"
+      type: "int"
+      value: "3868"
+      access: "read-write"
+      filter: "0~65535"
+      display: "Primary Remote Gy Port"
+      comment: "0~65535"
+    - name: "secondaryPeerGyIp"
+      type: "string"
+      value: ""
+      access: "read-write"
+      filter: ''
+      display: "Secondary Remote Gy IP"
+      comment: ""
+    - name: "secondaryPeerGyPort"
+      type: "int"
+      value: "3868"
+      access: "read-write"
+      filter: "0~65535"
+      display: "Secondary Remote Gy Port"
+      comment: "0~65535"
+    - name: "peerGxEnable"
+      type: "bool"
+      value: 'false'
+      access: "read-write"
+      filter: 'false;true;'
+      display: "Gx Enable"
+      comment: "" 
+    - name: "gxChargingEnable"
+      type: "bool"
+      value: 'false'
+      access: "read-write"
+      filter: 'false;true;'
+      display: "Gx Charging Enable"
+      comment: "" 
+    - name: "primaryPeerGxIp"
+      type: "string"
+      value: ""
+      access: "read-write"
+      filter: ''
+      display: "Primary Remote Gx IP"
+      comment: ""
+    - name: "primaryPeerGxPort"
+      type: "int"
+      value: "3868"
+      access: "read-write"
+      filter: "0~65535"
+      display: "Primary Remote Gx Port"
+      comment: "0~65535"
+    - name: "secondaryPeerGxIp"
+      type: "string"
+      value: ""
+      access: "read-write"
+      filter: ''
+      display: "Secondary Remote Gx IP"
+      comment: ""
+    - name: "secondaryPeerGxPort"
+      type: "int"
+      value: "3868"
+      access: "read-write"
+      filter: "0~65535"
+      display: "Secondary Remote Gx Port"
+      comment: "0~65535"
   upfConfig:
     display: "UPF Config"
     array:

config/param/smsc_param_config.yaml

@@ -0,0 +1,208 @@
+smsc:
+  system:
+    display: "System"
+    list:
+    - name: "cdrFlag"
+      type: "bool"
+      value: "1"
+      access: "read-write"
+      filter: '{"0":"false","1":"true"}'
+      display: "CDR Flag"
+      comment: ""
+    - name: "smValidity"
+      type: "int"
+      value: "259200"
+      access: "read-write"
+      filter: '0-2147483647'
+      display: "SM Validity"
+      comment: ""
+    - name: "logFlag"
+      type: "bool"
+      value: "1"
+      access: "read-write"
+      filter: '{"0":"false","1":"true"}'
+      display: "Log Flag"
+      comment: ""
+    - name: "localPollingFlag"
+      type: "bool"
+      value: "1"
+      access: "read-write"
+      filter: '{"0":"false","1":"true"}'
+      display: "Local Polling Flag"
+      comment: "Enable or disable resend pending SMS to unattainable local users."
+    - name: "localRoamingOutPollingFlag"
+      type: "bool"
+      value: "1"
+      access: "read-write"
+      filter: '{"0":"false","1":"true"}'
+      display: "Local Roaming Out Polling Flag"
+      comment: "Enable or disable resend pending SMS to unattainable outbound roaming users."
+    - name: "visitorRoamingInPollingFlag"
+      type: "bool"
+      value: "1"
+      access: "read-write"
+      filter: '{"0":"false","1":"true"}'
+      display: "Visitor Roaming In Polling Flag"
+      comment: "Enable or disable resend pending SMS to unattainable inbound roaming users."
+    - name: "otherPollingFlag"
+      type: "bool"
+      value: "1"
+      access: "read-write"
+      filter: '{"0":"false","1":"true"}'
+      display: "Other Polling Flag"
+      comment: "Enable or disable resend pending SMS to other unattainable users."
+    - name: "pollingNumber"
+      type: "int"
+      value: "64"
+      access: "read-write"
+      filter: '0-64'
+      display: "Polling Number"
+      comment: "Define the maximum port number that the queue of pending SMS may grow to."
+    - name: "priorityFlag"
+      type: "bool"
+      value: "1"
+      access: "read-write"
+      filter: '{"0":"false","1":"true"}'
+      display: "Priority Flag"
+      comment: "Specify the priority parameter of SM_RP_PRI. true = High; false = Low."
+    - name: "tpReplyPathFlag"
+      type: "bool"
+      value: "1"
+      access: "read-write"
+      filter: '{"0":"false","1":"true"}'
+      display: "TP Reply Path Flag"
+      comment: "Enable or disable TP-Reply-Path parameter in the SMS-DELIVER data unit."
+    - name: "smscDomain"
+      type: "string"
+      value: "0.0.0.0"
+      access: "read-write"
+      filter: '0~16'
+      display: "SMSC Domain"
+      comment: ""
+    - name: "csfbVolteFlag"
+      type: "bool"
+      value: "1"
+      access: "read-write"
+      filter: '{"0":"false","1":"true"}'
+      display: "CSFB VoLTE Flag"
+      comment: ""
+    - name: "camelFlag"
+      type: "bool"
+      value: "0"
+      access: "read-write"
+      filter: '{"0":"false","1":"true"}'
+      display: "Camel Flag"
+      comment: ""
+    - name: "scfAddress"
+      type: "string"
+      value: "0.0.0.0"
+      access: "read-write"
+      filter: '0~16'
+      display: "SCF Address"
+      comment: ""
+  msisdnsegment:
+    display: "MSISDN Segment List"
+    method: "put"
+    array:
+    - name: "index"
+      type: "int"
+      value: "0"
+      access: "read-only"
+      filter: '0~15'
+      display: "Index"
+      comment: "0~15"
+    - name: "startMSISDN"
+      type: "string"
+      value: "0"
+      access: "read-write"
+      filter: '0~32'
+      display: "Start MSISDN"
+      comment: ""
+    - name: "endMSISDN"
+      type: "string"
+      value: "0"
+      access: "read-write"
+      filter: '0~32'
+      display: "End MSISDN"
+      comment: ""
+  smpplink:
+    display: "SMPP Link List"
+    array:
+    - name: "index"
+      type: "int"
+      value: "0"
+      access: "read-only"
+      filter: '0~63'
+      display: "Index"
+      comment: "0~63"
+    - name: "linkAlias"
+      type: "string"
+      value: "0"
+      access: "read-write"
+      filter: '0~32'
+      display: "Link Alias"
+      comment: ""
+    - name: "sessionType"
+      type: "enum"
+      value: "0"
+      access: "read-write"
+      filter: '{"0":"bindTX","1":"bindRX","2":"bindTRX"}'
+      display: "Session Type"
+      comment: ""
+    - name: "serviceNumber"
+      type: "string"
+      value: "0"
+      access: "read-write"
+      filter: '0~32'
+      display: "Service Number"
+      comment: ""
+    - name: "dataCodingScheme"
+      type: "enum"
+      value: "0"
+      access: "read-write"
+      filter: '{"0":"smpp7def7","1":"smpp8dcs4def7","2":"smpp8dcs0def7","16":"smpp7def8","17":"smpp8dcs4def8","18":"smpp8dcs0def8"}'
+      display: "Data Coding Scheme"
+      comment: ""
+    - name: "platformNum"
+      type: "enum"
+      value: "0"
+      access: "read-write"
+      filter: '{"0":"plat0","1":"plat1","2":"ignore"}'
+      display: "Platform Num"
+      comment: ""
+    - name: "timeToLive"
+      type: "int"
+      value: "604800"
+      access: "read-write"
+      filter: '0-2147483647'
+      display: "Time To Live"
+      comment: ""
+    - name: "manipulationFlag"
+      type: "bool"
+      value: "1"
+      access: "read-write"
+      filter: '{"0":"false","1":"true"}'
+      display: "Manipulation Flag"
+      comment: ""
+    - name: "ton"
+      type: "enum"
+      value: "0"
+      access: "read-write"
+      filter: '{"0":"unknown","1":"international","2":"national","3":"networkSpecific","4":"subscriberNumber","5":"alphanumeric","6":"abbreviated"}'
+      display: "Type of Number"
+      comment: ""
+    - name: "npi"
+      type: "enum"
+      value: "0"
+      access: "read-write"
+      filter: '{"0":"unknown","1":"isdn","3":"data","4":"telex","6":"landMobile","8":"national","9":"private","10":"ermes","14":"internet","18":"wapClientID"}'
+      display: "Number Plan Indicator"
+      comment: ""
+    - name: "roleType"
+      type: "enum"
+      value: "0"
+      access: "read-write"
+      filter: '{"0":"server","1":"client"}'
+      display: "Role Type"
+      comment: ""
+

crontask/makefile

@@ -1,7 +1,7 @@
 # Makefile for OMC-OMC-crontask project
 
 PROJECT = OMC
-VERSION = 2.2404.4
+VERSION = 2.2405.1
 LIBDIR = be.ems/lib
 BINNAME = crontask
 

data2html/makefile

@@ -1,7 +1,7 @@
 # Makefile for rest agent project
 
 PROJECT = OMC
-VERSION = 2.2404.6
+VERSION = 2.2405.1
 RelDate = `date +%Y%m%d`
 Release = $(RelDate)
 RelVer = $(VERSION)-$(RelDate)

database/backup/omc-tips.sql

@@ -0,0 +1,182 @@
+select count(*) from kpi_report_upf
+
+
+CREATE VIEW kpi_report_all AS
+SELECT * FROM kpi_report_udm
+UNION ALL
+SELECT * FROM kpi_report_amf
+UNION ALL
+SELECT * FROM kpi_report_upf;
+
+
+select DISTINCT(ne_type) from kpi_title 
+
+SELECT DISTINCT LOWER(ne_type) FROM kpi_title
+
+SELECT JSON_EXTRACT(kpi_values, CONCAT('$[', @path, '].', @key_to_search)) AS value FROM kpi_report_upf where `date`="2024-04-26";
+
+
+SELECT JSON_EXTRACT(JSON_CONTAINS(kpi_values, '{"kpi_id": "UPF.01"}') FROM kpi_report_upf where `date`="2024-04-26";
+
+
+SELECT
+JSON_EXTRACT(kpi_values, CONCAT('$[', JSON_UNQUOTE(JSON_SEARCH(kpi_values, 'kpi_id', 'UPF.01')), '].value')) AS value_UPF01,
+JSON_EXTRACT(kpi_values, CONCAT('$[', JSON_UNQUOTE(JSON_SEARCH(kpi_values, 'kpi_id', 'UPF.03')), '].value')) AS value_UPF03
+FROM
+kpi_report_upf
+WHERE
+JSON_SEARCH(kpi_values, 'kpi_id', 'UPF.01') IS NOT NULL
+AND JSON_SEARCH(kpi_values, 'kpi_id', 'UPF.03') IS NOT NULL;
+
+
+SELECT
+JSON_EXTRACT(kpi_values, CONCAT('$[', JSON_UNQUOTE(JSON_SEARCH(kpi_values, 'all', 'UPF.01')), '].value')) AS value_UPF01
+FROM
+kpi_report_upf
+WHERE
+JSON_CONTAINS(kpi_values, '{"kpi_id": "UPF.01"}');
+
+
+SELECT
+COALESCE(JSON_EXTRACT(kpi_values, CONCAT('$[', JSON_UNQUOTE(JSON_SEARCH(kpi_values, 'all', 'UPF.01')), '].value')), 0) AS value_UPF01
+FROM
+kpi_report_upf
+WHERE
+JSON_CONTAINS(kpi_values, '{"kpi_id": "UPF.01"}');
+
+SELECT
+	CONCAT(
+		DATE_FORMAT( gk.start_time, '%H:' ),
+		LPAD( FLOOR( MINUTE ( gk.start_time ) / 15 ) * 15, 2, '0' ) 
+	) AS timeGroup,
+	min( CASE WHEN gk.INDEX != '' THEN gk.INDEX ELSE 0 END ) AS startIndex,
+	min( CASE WHEN gk.ne_name != '' THEN gk.ne_name ELSE 0 END ) AS neName,
+	sum( CASE WHEN JSON_CONTAINS(kpi_values,JSON_OBJECT('kpi_id', "UPF.01")) THEN gk.kpi_values->'$[*].value ELSE 0 END ) AS 'UPF.01',
+	sum( CASE WHEN JSON_CONTAINS(kpi_values,JSON_OBJECT('kpi_id', "UPF.02")) THEN gk.kpi_values->'$[*].value ELSE 0 END ) AS 'UPF.02',
+	sum( CASE WHEN gk.kpi_id = 'UPF.03' THEN gk.VALUE ELSE 0 END ) AS 'UPF.03',
+	sum( CASE WHEN gk.kpi_id = 'UPF.04' THEN gk.VALUE ELSE 0 END ) AS 'UPF.04',
+	sum( CASE WHEN gk.kpi_id = 'UPF.05' THEN gk.VALUE ELSE 0 END ) AS 'UPF.05',
+	sum( CASE WHEN gk.kpi_id = 'UPF.06' THEN gk.VALUE ELSE 0 END ) AS 'UPF.06',
+	sum( CASE WHEN gk.kpi_id = 'UPF.07' THEN gk.VALUE ELSE 0 END ) AS 'UPF.07',
+	sum( CASE WHEN gk.kpi_id = 'UPF.08' THEN gk.VALUE ELSE 0 END ) AS 'UPF.08',
+	sum( CASE WHEN gk.kpi_id = 'UPF.09' THEN gk.VALUE ELSE 0 END ) AS 'UPF.09',
+	sum( CASE WHEN gk.kpi_id = 'UPF.10' THEN gk.VALUE ELSE 0 END ) AS 'UPF.10',
+	sum( CASE WHEN gk.kpi_id = 'UPF.14' THEN gk.VALUE ELSE 0 END ) AS 'UPF.14',
+	sum( CASE WHEN gk.kpi_id = 'UPF.11' THEN gk.VALUE ELSE 0 END ) AS 'UPF.11',
+	sum( CASE WHEN gk.kpi_id = 'UPF.12' THEN gk.VALUE ELSE 0 END ) AS 'UPF.12',
+	sum( CASE WHEN gk.kpi_id = 'UPF.13' THEN gk.VALUE ELSE 0 END ) AS 'UPF.13',
+	sum( CASE WHEN gk.kpi_id = 'UPF.15' THEN gk.VALUE ELSE 0 END ) AS 'UPF.15' 
+FROM
+	kpi_report_upf gk 
+WHERE
+	gk.rm_uid = '4400HX1UPF001'
+	AND gk.date = "2024-04-26"
+	AND gk.start_time >= '00:00:00' 
+	AND gk.start_time <= '23:59:59' 
+GROUP BY
+	timeGroup 
+ORDER BY
+	timeGroup DESC
+
+
+
+SELECT
+	CONCAT(
+		DATE_FORMAT( gk.start_time, '%H:' ),
+		LPAD( FLOOR( MINUTE ( gk.start_time ) / 15 ) * 15, 2, '0' ) 
+	) AS timeGroup,
+	min( CASE WHEN gk.INDEX != '' THEN gk.INDEX ELSE 0 END ) AS startIndex,
+	min( CASE WHEN gk.ne_name != '' THEN gk.ne_name ELSE 0 END ) AS neName,
+	SUM(CASE WHEN JSON_EXTRACT(gk.kpi_values, '$[0].kpi_id') = "UPF.01" THEN JSON_EXTRACT(gk.kpi_values, '$[0].value') ELSE 0 END) AS 'UPF.01',
+	SUM(CASE WHEN JSON_EXTRACT(gk.kpi_values, '$[1].kpi_id') = "UPF.02" THEN JSON_EXTRACT(gk.kpi_values, '$[1].value') ELSE 0 END) AS 'UPF.02',
+	SUM(CASE WHEN JSON_EXTRACT(gk.kpi_values, '$[2].kpi_id') = "UPF.03" THEN JSON_EXTRACT(gk.kpi_values, '$[2].value') ELSE 0 END) AS 'UPF.03'
+FROM
+	kpi_report_upf gk 
+WHERE
+	gk.rm_uid = '4400HX1UPF001'
+	AND gk.date = "2024-05-08"
+	AND gk.start_time >= '10:55:00' 
+	AND gk.start_time <= '23:59:59' 
+GROUP BY
+	timeGroup 
+ORDER BY
+	timeGroup DESC
+
+
+SELECT
+	CONCAT(
+		DATE_FORMAT( gk.start_time, '%H:' ),
+		LPAD( FLOOR( MINUTE ( gk.start_time ) / 15 ) * 15, 2, '0' ) 
+	) AS timeGroup,
+	min( CASE WHEN gk.INDEX != '' THEN gk.INDEX ELSE 0 END ) AS startIndex,
+	min( CASE WHEN gk.ne_name != '' THEN gk.ne_name ELSE 0 END ) AS neName,
+	SUM(JSON_EXTRACT(gk.kpi_values, '$[0].`UPF.01`')) AS 'UPF.01',
+	SUM(JSON_EXTRACT(gk.kpi_values, '$[1].`UPF.02`')) AS 'UPF.02',
+	SUM(JSON_EXTRACT(gk.kpi_values, '$[2].`UPF.03`')) AS 'UPF.03'
+FROM
+	kpi_report_upf gk 
+WHERE
+	gk.rm_uid = '4400HX1UPF001'
+	AND gk.date = "2024-05-08"
+	AND gk.start_time >= '10:53:00' 
+	AND gk.start_time <= '10:59:59' 
+GROUP BY
+	timeGroup 
+ORDER BY
+	timeGroup DESC
+	
+
+SELECT
+	min( CASE WHEN gk.INDEX != '' THEN gk.INDEX ELSE 0 END ) AS startIndex,
+	min( CASE WHEN gk.ne_name != '' THEN gk.ne_name ELSE 0 END ) AS neName,
+	SUM(CASE WHEN JSON_EXTRACT(gk.kpi_values, '$[*].kpi_id') = 'UPF.01' THEN JSON_EXTRACT(gk.kpi_values, '$[*].value') ELSE 0 END) AS 'UPF.01',
+	SUM(CASE WHEN JSON_EXTRACT(gk.kpi_values, '$[*].kpi_id') = 'UPF.02' THEN JSON_EXTRACT(gk.kpi_values, '$[*].value') ELSE 0 END) AS 'UPF.02',
+	SUM(CASE WHEN JSON_EXTRACT(gk.kpi_values, '$[*].kpi_id') = 'UPF.03' THEN JSON_EXTRACT(gk.kpi_values, '$[*].value') ELSE 0 END) AS 'UPF.03'
+FROM
+	kpi_report_upf gk 
+WHERE
+	gk.rm_uid = '4400HX1UPF001'
+	AND gk.date = "2024-05-03"
+	AND gk.start_time >= '00:00:00' 
+	AND gk.start_time <= '23:59:59' 
+
+
+SELECT 
+	CONCAT( DATE_FORMAT(CONCAT(gk.`date`, " ", gk.start_time), '%Y-%m-%d %H:'), LPAD(FLOOR(MINUTE(gk.start_time) / 15) * 15, 2, '0') ) AS timeGroup,
+	min(CASE WHEN gk.index != '' THEN gk.index ELSE 0 END) AS startIndex,
+	min(CASE WHEN gk.ne_type != '' THEN gk.ne_type ELSE 0 END) AS neType,
+	min(CASE WHEN gk.ne_name != '' THEN gk.ne_name ELSE 0 END) AS neName,
+	sum(CASE WHEN JSON_EXTRACT(gk.kpi_values, '$[0].kpi_id') = 'UPF.01' THEN JSON_EXTRACT(gk.kpi_values, '$[0].value') ELSE 0 END) AS 'UPF.01',
+	sum(CASE WHEN JSON_EXTRACT(gk.kpi_values, '$[1].kpi_id') = 'UPF.02' THEN JSON_EXTRACT(gk.kpi_values, '$[1].value') ELSE 0 END) AS 'UPF.02',
+	sum(CASE WHEN JSON_EXTRACT(gk.kpi_values, '$[2].kpi_id') = 'UPF.03' THEN JSON_EXTRACT(gk.kpi_values, '$[2].value') ELSE 0 END) AS 'UPF.03',
+	sum(CASE WHEN JSON_EXTRACT(gk.kpi_values, '$[3].kpi_id') = 'UPF.04' THEN JSON_EXTRACT(gk.kpi_values, '$[3].value') ELSE 0 END) AS 'UPF.04',
+	sum(CASE WHEN JSON_EXTRACT(gk.kpi_values, '$[4].kpi_id') = 'UPF.05' THEN JSON_EXTRACT(gk.kpi_values, '$[4].value') ELSE 0 END) AS 'UPF.05',
+	sum(CASE WHEN JSON_EXTRACT(gk.kpi_values, '$[5].kpi_id') = 'UPF.06' THEN JSON_EXTRACT(gk.kpi_values, '$[5].value') ELSE 0 END) AS 'UPF.06',
+	sum(CASE WHEN JSON_EXTRACT(gk.kpi_values, '$[6].kpi_id') = 'UPF.07' THEN JSON_EXTRACT(gk.kpi_values, '$[6].value') ELSE 0 END) AS 'UPF.07',
+	sum(CASE WHEN JSON_EXTRACT(gk.kpi_values, '$[7].kpi_id') = 'UPF.08' THEN JSON_EXTRACT(gk.kpi_values, '$[7].value') ELSE 0 END) AS 'UPF.08',
+	sum(CASE WHEN JSON_EXTRACT(gk.kpi_values, '$[8].kpi_id') = 'UPF.09' THEN JSON_EXTRACT(gk.kpi_values, '$[8].value') ELSE 0 END) AS 'UPF.09',
+	sum(CASE WHEN JSON_EXTRACT(gk.kpi_values, '$[9].kpi_id') = 'UPF.10' THEN JSON_EXTRACT(gk.kpi_values, '$[9].value') ELSE 0 END) AS 'UPF.10' 
+FROM kpi_report_upf gk 
+where gk.rm_uid = '4400HX1UPF001' and gk.ne_type = 'UPF' and CONCAT(gk.`date`, " ", gk.start_time) >= '2024-05-08 10:00:00' and CONCAT(gk.`date`, " ", gk.start_time) <= '2024-05-08 23:59:59' 
+GROUP BY timeGroup order by timeGroup desc
+
+
+
+DELETE t1
+FROM ne_state t1
+JOIN (
+SELECT `timestamp`
+FROM ne_state where ne_type='upf'
+ORDER BY id DESC
+LIMIT 999999 OFFSET 3
+) t2 ON t1.`timestamp` = t2.`timestamp` and ne_type='upf';
+
+
+select count(1) from ne_state where ne_type='upf'
+
+
+CREATE TABLE IF NOT EXISTS kpi_report_test AS SELECT * FROM kpi_report WHERE 1=0;ALTER TABLE kpi_report_test MODIFY COLUMN `id` int(11) NOT NULL AUTO_INCREMENT FIRST,ADD PRIMARY KEY IF NOT EXISTS (`id`);
+
+ALTER TABLE kpi_report_ims MODIFY COLUMN `id` int(11) NOT NULL AUTO_INCREMENT FIRST,ADD PRIMARY KEY IF NOT EXISTS (`id`)
+
+SELECT * FROM kpi_report WHERE 1=0

database/common/param_config.sql

@@ -11,7 +11,7 @@
  Target Server Version : 100338 (10.3.38-MariaDB)
  File Encoding         : 65001
 
- Date: 19/04/2024 15:56:21
+ Date: 11/05/2024 11:21:59
 */
 
 SET NAMES utf8mb4;
@@ -27,16 +27,16 @@ CREATE TABLE `param_config`  (
   `ne_id` varchar(32) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL,
   `top_tag` varchar(32) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL,
   `top_display` varchar(40) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL,
-  `method` varchar(64) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL COMMENT 'method allow: \"get\", \"get,post,put\", \"delete\"',
+  `method` varchar(64) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT '' COMMENT 'method allow: \"get\", \"get,post,put\", \"delete\"',
   `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 = 1564 CHARACTER SET = utf8mb4 COLLATE = utf8mb4_general_ci ROW_FORMAT = Dynamic;
+) ENGINE = InnoDB AUTO_INCREMENT = 1603 CHARACTER SET = utf8mb4 COLLATE = utf8mb4_general_ci ROW_FORMAT = Dynamic;
 
 -- ----------------------------
 -- Records of param_config
 -- ----------------------------
-INSERT INTO `param_config` VALUES (595, 'N3IWF', '', 'system', 'System', NULL, '{\"list\":[{\"access\":\"read-write\",\"comment\":\"\",\"display\":\"IKEBindAddress\",\"filter\":\"\",\"name\":\"ikeBindAddr\",\"type\":\"string\",\"value\":\"192.168.12.160\"},{\"access\":\"read-write\",\"comment\":\"\",\"display\":\"GTPBindAddress\",\"filter\":\"\",\"name\":\"gtpBindAddr\",\"type\":\"string\",\"value\":\"192.168.12.161\"},{\"access\":\"read-write\",\"comment\":\"\",\"display\":\"FQDN\",\"filter\":\"\",\"name\":\"fqdn\",\"type\":\"string\",\"value\":\"n3iwf.5gc.mnc00.mcc460.pub.3gppnetwork.org\"},{\"access\":\"read-write\",\"comment\":\"\",\"display\":\"InternalIP\",\"filter\":\"\",\"name\":\"internalIP\",\"type\":\"string\",\"value\":\"172.16.1.190\"},{\"access\":\"read-write\",\"comment\":\"\",\"display\":\"UdmIPAddrPort\",\"filter\":\"\",\"name\":\"udmAddr\",\"type\":\"string\",\"value\":\"172.16.1.140:8080\"},{\"access\":\"read-write\",\"comment\":\"\",\"display\":\"SmfIPAddress\",\"filter\":\"\",\"name\":\"smfIPAddr\",\"type\":\"string\",\"value\":\"172.16.1.150\"},{\"access\":\"read-write\",\"comment\":\"\",\"display\":\"N3IPAddress\",\"filter\":\"\",\"name\":\"n3IPAddr\",\"type\":\"string\",\"value\":\"192.168.1.160\"},{\"access\":\"read-write\",\"comment\":\"\",\"display\":\"N6IPAddress\",\"filter\":\"\",\"name\":\"n6IPAddr\",\"type\":\"string\",\"value\":\"192.168.1.161\"}]}');
+INSERT INTO `param_config` VALUES (595, 'N3IWF', '', 'system', 'System', '', '{\"list\":[{\"access\":\"read-write\",\"comment\":\"\",\"display\":\"IKEBindAddress\",\"filter\":\"\",\"name\":\"ikeBindAddr\",\"type\":\"string\",\"value\":\"192.168.12.160\"},{\"access\":\"read-write\",\"comment\":\"\",\"display\":\"GTPBindAddress\",\"filter\":\"\",\"name\":\"gtpBindAddr\",\"type\":\"string\",\"value\":\"192.168.12.161\"},{\"access\":\"read-write\",\"comment\":\"\",\"display\":\"FQDN\",\"filter\":\"\",\"name\":\"fqdn\",\"type\":\"string\",\"value\":\"n3iwf.5gc.mnc00.mcc460.pub.3gppnetwork.org\"},{\"access\":\"read-write\",\"comment\":\"\",\"display\":\"InternalIP\",\"filter\":\"\",\"name\":\"internalIP\",\"type\":\"string\",\"value\":\"172.16.1.190\"},{\"access\":\"read-write\",\"comment\":\"\",\"display\":\"UdmIPAddrPort\",\"filter\":\"\",\"name\":\"udmAddr\",\"type\":\"string\",\"value\":\"172.16.1.140:8080\"},{\"access\":\"read-write\",\"comment\":\"\",\"display\":\"SmfIPAddress\",\"filter\":\"\",\"name\":\"smfIPAddr\",\"type\":\"string\",\"value\":\"172.16.1.150\"},{\"access\":\"read-write\",\"comment\":\"\",\"display\":\"N3IPAddress\",\"filter\":\"\",\"name\":\"n3IPAddr\",\"type\":\"string\",\"value\":\"192.168.1.160\"},{\"access\":\"read-write\",\"comment\":\"\",\"display\":\"N6IPAddress\",\"filter\":\"\",\"name\":\"n6IPAddr\",\"type\":\"string\",\"value\":\"192.168.1.161\"}]}');
 INSERT INTO `param_config` VALUES (1106, 'AUSF', '', 'system', 'System', '', '{\"list\":[{\"access\":\"read-write\",\"comment\":\"\",\"display\":\"Service IP\",\"filter\":\"\",\"name\":\"serviceIP\",\"type\":\"ipv4\",\"value\":\"172.16.5.130\"},{\"access\":\"read-write\",\"comment\":\"\",\"display\":\"Service Port\",\"filter\":\"0~65535\",\"name\":\"servicePort\",\"type\":\"int\",\"value\":\"8080\"},{\"access\":\"read-write\",\"comment\":\"\",\"display\":\"Scheme\",\"filter\":\"{\\\"0\\\":\\\"HTTP\\\", \\\"1\\\":\\\"HTTPS\\\"}\",\"name\":\"scheme\",\"type\":\"enum\",\"value\":\"http\"},{\"access\":\"read-write\",\"comment\":\"\",\"display\":\"NRF URI\",\"filter\":\"\",\"name\":\"nrfUri\",\"type\":\"string\",\"value\":\"http://172.16.5.180:8080\"},{\"access\":\"read-write\",\"comment\":\"\",\"display\":\"UDM URI\",\"filter\":\"\",\"name\":\"udmUri\",\"type\":\"string\",\"value\":\"http://172.16.5.140:8080\"},{\"access\":\"read-write\",\"comment\":\"\",\"display\":\"Group ID\",\"filter\":\"\",\"name\":\"groupId\",\"type\":\"string\",\"value\":\"0\"}]}');
 INSERT INTO `param_config` VALUES (1107, 'NRF', '', 'system', 'System', '', '{\"list\":[{\"access\":\"read-write\",\"comment\":\"\",\"display\":\"Service IP\",\"filter\":\"\",\"name\":\"serviceIP\",\"type\":\"ipv4\",\"value\":\"172.16.5.180\"},{\"access\":\"read-write\",\"comment\":\"\",\"display\":\"Service Port\",\"filter\":\"0~65535\",\"name\":\"servicePort\",\"type\":\"int\",\"value\":\"8080\"},{\"access\":\"read-write\",\"comment\":\"\",\"display\":\"Scheme\",\"filter\":\"{\\\"0\\\":\\\"HTTP\\\", \\\"1\\\":\\\"HTTPS\\\"}\",\"name\":\"scheme\",\"type\":\"enum\",\"value\":\"0\"}]}');
 INSERT INTO `param_config` VALUES (1108, 'NRF', '', 'registeredNFs', 'Registered NFs', 'get', '{\"array\":[{\"access\":\"read-only\",\"comment\":\"\",\"display\":\"Index\",\"filter\":\"1~256\",\"name\":\"index\",\"type\":\"int\",\"value\":\"1\"},{\"access\":\"read-only\",\"comment\":\"\",\"display\":\"NF Type\",\"filter\":\"^.{1,128}$\",\"name\":\"nfType\",\"type\":\"string\",\"value\":\"\"},{\"access\":\"read-only\",\"comment\":\"\",\"display\":\"Status\",\"filter\":\"^.{1,128}$\",\"name\":\"status\",\"type\":\"string\",\"value\":\"\"},{\"access\":\"read-only\",\"comment\":\"\",\"display\":\"NF ID\",\"filter\":\"^.{1,128}$\",\"name\":\"nfId\",\"type\":\"string\",\"value\":\"\"},{\"access\":\"read-only\",\"comment\":\"\",\"display\":\"IP Address\",\"filter\":\"^.{1,128}$\",\"name\":\"ipAddress\",\"type\":\"string\",\"value\":\"\"}]}');
@@ -61,10 +61,6 @@ INSERT INTO `param_config` VALUES (1277, 'UPF', '', 'networkControlDnsServerList
 INSERT INTO `param_config` VALUES (1278, 'UPF', '', 'dpiCommon', 'DPI Common', '', '{\"list\":[{\"access\":\"read-write\",\"comment\":\"\",\"display\":\"Max Detect Packet Num\",\"filter\":\"\",\"name\":\"maxDetectPacketNum\",\"type\":\"int\",\"value\":\"20\"},{\"access\":\"read-write\",\"comment\":\"\",\"display\":\"HTTP Proto Enabled\",\"filter\":\"0~1\",\"name\":\"httpProtoEnabled\",\"type\":\"int\",\"value\":\"0\"},{\"access\":\"read-write\",\"comment\":\"\",\"display\":\"HTTPS Proto Enabled\",\"filter\":\"0~1\",\"name\":\"httpsProtoEnabled\",\"type\":\"int\",\"value\":\"0\"}]}');
 INSERT INTO `param_config` VALUES (1279, 'UPF', '', 'dpiHeaderEnrichInfoList', 'DPI Header Enrich Info List', '', '{\"array\":[{\"access\":\"read-only\",\"comment\":\"1~32\",\"display\":\"Index\",\"filter\":\"1~32\",\"name\":\"index\",\"type\":\"int\",\"value\":\"1\"},{\"access\":\"read-write\",\"comment\":\"\",\"display\":\"Type\",\"filter\":\"\",\"name\":\"type\",\"type\":\"int\",\"value\":\"0\"},{\"access\":\"read-write\",\"comment\":\"\",\"display\":\"Name\",\"filter\":\"\",\"name\":\"name\",\"type\":\"string\",\"value\":\"\"},{\"access\":\"read-write\",\"comment\":\"\",\"display\":\"Value\",\"filter\":\"\",\"name\":\"value\",\"type\":\"string\",\"value\":\"\"}]}');
 INSERT INTO `param_config` VALUES (1280, 'UPF', '', 'dpiAppList', 'DPI APP List', '', '{\"array\":[{\"access\":\"read-write\",\"comment\":\"1~32\",\"display\":\"Index\",\"filter\":\"1~32\",\"name\":\"index\",\"type\":\"int\",\"value\":\"1\"},{\"access\":\"read-write\",\"comment\":\"\",\"display\":\"APP Name\",\"filter\":\"\",\"name\":\"appName\",\"type\":\"string\",\"value\":\"\"},{\"access\":\"read-write\",\"comment\":\"\",\"display\":\"Proxy Enabled\",\"filter\":\"0~1\",\"name\":\"proxyEnabled\",\"type\":\"int\",\"value\":\"0\"},{\"access\":\"read-write\",\"comment\":\"\",\"display\":\"Force Check Type\",\"filter\":\"0~1\",\"name\":\"forceCheckType\",\"type\":\"int\",\"value\":\"0\"},{\"access\":\"read-write\",\"comment\":\"\",\"display\":\"N3 Interface ID\",\"filter\":\"0~32\",\"name\":\"n3InterfaceId\",\"type\":\"int\",\"value\":\"0\"},{\"access\":\"read-write\",\"comment\":\"\",\"display\":\"N6 Interface ID\",\"filter\":\"0~32\",\"name\":\"n6InterfaceId\",\"type\":\"int\",\"value\":\"0\"},{\"access\":\"read-write\",\"array\":[{\"access\":\"read-only\",\"comment\":\"1~32\",\"display\":\"Index\",\"filter\":\"1~32\",\"name\":\"index\",\"type\":\"int\",\"value\":\"1\"},{\"access\":\"read-write\",\"comment\":\"\",\"display\":\"Rule ID\",\"filter\":\"\",\"name\":\"ruleId\",\"type\":\"int\",\"value\":\"\"},{\"access\":\"read-write\",\"comment\":\"\",\"display\":\"REGEX Match\",\"filter\":\"\",\"name\":\"regexMatch\",\"type\":\"string\",\"value\":\"\"},{\"access\":\"read-write\",\"comment\":\"\",\"display\":\"Flow Description\",\"filter\":\"\",\"name\":\"flowDescription\",\"type\":\"string\",\"value\":\"\"},{\"access\":\"read-write\",\"comment\":\"\",\"display\":\"Custom Name\",\"filter\":\"\",\"name\":\"customName\",\"type\":\"string\",\"value\":\"\"}],\"comment\":\"\",\"display\":\"Rule List\",\"filter\":\"0~32\",\"name\":\"ruleList\",\"type\":\"int\",\"value\":\"1\"}]}');
-INSERT INTO `param_config` VALUES (1408, 'SMF', '', 'smfSystem', 'SMF System', '', '{\"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 Charing Enable\",\"filter\":\"{\\\"0\\\":\\\"false\\\", \\\"1\\\":\\\"true\\\"}\",\"name\":\"chgEnable5G\",\"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 (1409, '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 (1410, '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 (1411, '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 (1473, 'AMF', '', 'system', 'System Config', '', '{\"list\":[{\"access\":\"read-write\",\"comment\":\"\",\"display\":\"AMF Name\",\"filter\":\"0~64\",\"name\":\"amfName\",\"type\":\"string\",\"value\":\"AMF\"},{\"access\":\"read-write\",\"comment\":\"0~255\",\"display\":\"Relative Capacity\",\"filter\":\"0~255\",\"name\":\"relativeCapacity\",\"type\":\"int\",\"value\":\"255\"},{\"access\":\"read-write\",\"comment\":\"\",\"display\":\"SBI Scheme\",\"filter\":\"{\\\"0\\\":\\\"http\\\",\\\"1\\\":\\\"https\\\"}\",\"name\":\"sbiScheme\",\"type\":\"enum\",\"value\":\"0\"},{\"access\":\"read-write\",\"comment\":\"\",\"display\":\"SBI Server IP\",\"filter\":\"0~64\",\"name\":\"sbiServerIp\",\"type\":\"string\",\"value\":\"192.168.1.183\"},{\"access\":\"read-write\",\"comment\":\"0~65535\",\"display\":\"SBI Server Port\",\"filter\":\"0~65535\",\"name\":\"sbiServerPort\",\"type\":\"int\",\"value\":\"8080\"},{\"access\":\"read-write\",\"comment\":\"\",\"display\":\"NRF Enabled\",\"filter\":\"{\\\"0\\\":\\\"false\\\",\\\"1\\\":\\\"true\\\"}\",\"name\":\"nrfEnabled\",\"type\":\"bool\",\"value\":\"0\"},{\"access\":\"read-write\",\"comment\":\"\",\"display\":\"NRF URI\",\"filter\":\"0~64\",\"name\":\"nrfUri\",\"type\":\"string\",\"value\":\"http://172.16.5.180:8080\"},{\"access\":\"read-write\",\"comment\":\"\",\"display\":\"AUSF URI\",\"filter\":\"0~64\",\"name\":\"ausfUri\",\"type\":\"string\",\"value\":\"http://172.16.5.130:8080\"},{\"access\":\"read-write\",\"comment\":\"\",\"display\":\"UDM URI\",\"filter\":\"0~64\",\"name\":\"udmUri\",\"type\":\"string\",\"value\":\"http://172.16.5.140:8080\"},{\"access\":\"read-write\",\"comment\":\"\",\"display\":\"SMF URI\",\"filter\":\"0~64\",\"name\":\"smfUri\",\"type\":\"string\",\"value\":\"http://172.16.5.150:8080\"},{\"access\":\"read-write\",\"comment\":\"\",\"display\":\"PCF URI\",\"filter\":\"0~64\",\"name\":\"pcfUri\",\"type\":\"string\",\"value\":\"http://172.16.5.160:8080\"},{\"access\":\"read-write\",\"comment\":\"\",\"display\":\"LMF URI\",\"filter\":\"0~64\",\"name\":\"lmfUri\",\"type\":\"string\",\"value\":\"http://172.16.5.200:8080\"},{\"access\":\"read-write\",\"comment\":\"\",\"display\":\"NEF URI\",\"filter\":\"0~64\",\"name\":\"nefUri\",\"type\":\"string\",\"value\":\"http://172.16.5.210:8080\"},{\"access\":\"read-write\",\"comment\":\"\",\"display\":\"DNN Correction Enabled\",\"filter\":\"{\\\"0\\\":\\\"false\\\",\\\"1\\\":\\\"true\\\"}\",\"name\":\"dnnCorrectionEnabled\",\"type\":\"bool\",\"value\":\"0\"},{\"access\":\"read-write\",\"comment\":\"\",\"display\":\"Default DNN\",\"filter\":\"0~64\",\"name\":\"defaultDnn\",\"type\":\"string\",\"value\":\"internet\"},{\"access\":\"read-write\",\"comment\":\"\",\"display\":\"Integrity Algorithm\",\"filter\":\"{\\\"0\\\":\\\"NIA0\\\",\\\"1\\\":\\\"NIA1\\\",\\\"2\\\":\\\"NIA2\\\",\\\"3\\\":\\\"NIA3\\\"}\",\"name\":\"integrityAlgorithm\",\"type\":\"enum\",\"value\":\"2\"},{\"access\":\"read-write\",\"comment\":\"\",\"display\":\"Ciphering Algorithm\",\"filter\":\"{\\\"0\\\":\\\"NEA0\\\",\\\"1\\\":\\\"NEA1\\\",\\\"2\\\":\\\"NEA2\\\",\\\"3\\\":\\\"NEA3\\\"}\",\"name\":\"cipheringAlgorithm\",\"type\":\"enum\",\"value\":\"0\"},{\"access\":\"read-write\",\"comment\":\"\",\"display\":\"T3502\",\"filter\":\"1~65535\",\"name\":\"t3502\",\"type\":\"int\",\"value\":\"720\"},{\"access\":\"read-write\",\"comment\":\"\",\"display\":\"T3512\",\"filter\":\"1~65535\",\"name\":\"t3512\",\"type\":\"int\",\"value\":\"3600\"},{\"access\":\"read-write\",\"comment\":\"\",\"display\":\"T3513\",\"filter\":\"1~65535\",\"name\":\"t3513\",\"type\":\"int\",\"value\":\"2\"},{\"access\":\"read-write\",\"comment\":\"\",\"display\":\"T3522\",\"filter\":\"1~65535\",\"name\":\"t3522\",\"type\":\"int\",\"value\":\"6\"},{\"access\":\"read-write\",\"comment\":\"\",\"display\":\"T3550\",\"filter\":\"1~65535\",\"name\":\"t3550\",\"type\":\"int\",\"value\":\"6\"},{\"access\":\"read-write\",\"comment\":\"\",\"display\":\"T3555\",\"filter\":\"1~65535\",\"name\":\"t3555\",\"type\":\"int\",\"value\":\"6\"},{\"access\":\"read-write\",\"comment\":\"\",\"display\":\"T3560\",\"filter\":\"1~65535\",\"name\":\"t3560\",\"type\":\"int\",\"value\":\"6\"},{\"access\":\"read-write\",\"comment\":\"\",\"display\":\"T3565\",\"filter\":\"1~65535\",\"name\":\"t3565\",\"type\":\"int\",\"value\":\"6\"},{\"access\":\"read-write\",\"comment\":\"\",\"display\":\"T3570\",\"filter\":\"1~65535\",\"name\":\"t3570\",\"type\":\"int\",\"value\":\"6\"}]}');
 INSERT INTO `param_config` VALUES (1474, 'AMF', '', 'association', 'TNL Association List', '', '{\"array\":[{\"access\":\"read-only\",\"comment\":\"0~15\",\"display\":\"Index\",\"filter\":\"0~15\",\"name\":\"index\",\"type\":\"int\",\"value\":\"0\"},{\"access\":\"read-write\",\"comment\":\"\",\"display\":\"NGAP IP\",\"filter\":\"0~64\",\"name\":\"ngapIp\",\"type\":\"string\",\"value\":\"192.168.1.183\"},{\"access\":\"read-write\",\"comment\":\"0~65535\",\"display\":\"NGAP SCTP Port\",\"filter\":\"0~65535\",\"name\":\"ngapSctpPort\",\"type\":\"int\",\"value\":\"38412\"},{\"access\":\"read-write\",\"comment\":\"0~255\",\"display\":\"Weight\",\"filter\":\"0~255\",\"name\":\"weightFactor\",\"type\":\"int\",\"value\":\"255\"}]}');
 INSERT INTO `param_config` VALUES (1475, 'AMF', '', 'guami', 'GUAMI List', '', '{\"array\":[{\"access\":\"read-only\",\"comment\":\"0~15\",\"display\":\"Index\",\"filter\":\"0~15\",\"name\":\"index\",\"type\":\"int\",\"value\":\"0\"},{\"access\":\"read-write\",\"comment\":\"\",\"display\":\"PLMN ID\",\"filter\":\"^[0-9]{5,6}$\",\"name\":\"plmnId\",\"type\":\"regex\",\"value\":\"00101\"},{\"access\":\"read-write\",\"comment\":\"0~255\",\"display\":\"Region ID\",\"filter\":\"0~255\",\"name\":\"regionId\",\"type\":\"int\",\"value\":\"1\"},{\"access\":\"read-write\",\"comment\":\"0~1023\",\"display\":\"Set ID\",\"filter\":\"0~1023\",\"name\":\"setId\",\"type\":\"int\",\"value\":\"1\"},{\"access\":\"read-write\",\"comment\":\"0~63\",\"display\":\"Pointer\",\"filter\":\"0~63\",\"name\":\"pointer\",\"type\":\"int\",\"value\":\"1\"}]}');
@@ -108,5 +104,13 @@ INSERT INTO `param_config` VALUES (1560, 'UDM', '', 'scscfSet', 'SCSCF Set', '',
 INSERT INTO `param_config` VALUES (1561, 'UDM', '', 'triggerPoint', 'Trigger Point', '', '{\"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_snssai\"},{\"access\":\"read-write\",\"comment\":\"\",\"display\":\"Condition Type CNF\",\"filter\":\"0~1\",\"name\":\"conditionTypeCNF\",\"type\":\"int\",\"value\":\"0\"},{\"access\":\"read-only\",\"array\":[{\"access\":\"read-only\",\"comment\":\"\",\"display\":\"Index\",\"filter\":\"1~4\",\"name\":\"index\",\"type\":\"int\",\"value\":\"1\"},{\"access\":\"read-write\",\"comment\":\"\",\"display\":\"Disable\",\"filter\":\"\",\"name\":\"disable\",\"type\":\"bool\",\"value\":\"false\"},{\"access\":\"read-write\",\"comment\":\"\",\"display\":\"Condition Negated\",\"filter\":\"0~1\",\"name\":\"conditionNegated\",\"type\":\"int\",\"value\":\"0\"},{\"access\":\"read-write\",\"comment\":\"\",\"display\":\"Group\",\"filter\":\"0~4096\",\"name\":\"group\",\"type\":\"int\",\"value\":\"1\"},{\"access\":\"read-write\",\"comment\":\"\",\"display\":\"Method\",\"filter\":\"^.{0,32}$\",\"name\":\"method\",\"type\":\"string\",\"value\":\"\"},{\"access\":\"read-write\",\"comment\":\"\",\"display\":\"SIP Header\",\"filter\":\"^.{0,64}$\",\"name\":\"sipHeader\",\"type\":\"string\",\"value\":\"\"},{\"access\":\"read-write\",\"comment\":\"\",\"display\":\"SIP Content\",\"filter\":\"^.{0,64}$\",\"name\":\"sipContent\",\"type\":\"string\",\"value\":\"\"}],\"comment\":\"\",\"display\":\"SPT List\",\"filter\":\"1~4\",\"name\":\"sptList\",\"type\":\"int\",\"value\":\"1\"}]}');
 INSERT INTO `param_config` VALUES (1562, 'UDM', '', 's6aServer', 'S6a Server', '', '{\"list\":[{\"access\":\"read-write\",\"comment\":\"\",\"display\":\"Enable\",\"filter\":\"false;true;\",\"name\":\"enable\",\"type\":\"bool\",\"value\":\"true\"},{\"access\":\"read-write\",\"comment\":\"\",\"display\":\"Link Type\",\"filter\":\"{\\\"0\\\":\\\"TCP\\\",\\\"1\\\":\\\"SCTP\\\"}\",\"name\":\"netType\",\"type\":\"enum\",\"value\":\"1\"},{\"access\":\"read-write\",\"comment\":\"\",\"display\":\"Address\",\"filter\":\"\",\"name\":\"addr\",\"type\":\"string\",\"value\":\"172.16.5.140:3868\"},{\"access\":\"read-write\",\"comment\":\"\",\"display\":\"Host\",\"filter\":\"^.{1,127}$\",\"name\":\"host\",\"type\":\"string\",\"value\":\"hss.ims.mnc001.mcc001.3gppnetwork.org\"},{\"access\":\"read-write\",\"comment\":\"\",\"display\":\"Realm\",\"filter\":\"^.{1,127}$\",\"name\":\"realm\",\"type\":\"string\",\"value\":\"ims.mnc001.mcc001.3gppnetwork.org\"}]}');
 INSERT INTO `param_config` VALUES (1563, 'UDM', '', 'cxServer', 'Cx Server', '', '{\"list\":[{\"access\":\"read-write\",\"comment\":\"\",\"display\":\"Enable\",\"filter\":\"false;true;\",\"name\":\"enable\",\"type\":\"bool\",\"value\":\"true\"},{\"access\":\"read-write\",\"comment\":\"\",\"display\":\"Link Type\",\"filter\":\"{\\\"0\\\":\\\"TCP\\\",\\\"1\\\":\\\"SCTP\\\"}\",\"name\":\"netType\",\"type\":\"enum\",\"value\":\"0\"},{\"access\":\"read-write\",\"comment\":\"\",\"display\":\"Address\",\"filter\":\"\",\"name\":\"addr\",\"type\":\"string\",\"value\":\"172.16.5.140:3868\"},{\"access\":\"read-write\",\"comment\":\"\",\"display\":\"Host\",\"filter\":\"^.{1,127}$\",\"name\":\"host\",\"type\":\"string\",\"value\":\"hss.ims.mnc001.mcc001.3gppnetwork.org\"},{\"access\":\"read-write\",\"comment\":\"\",\"display\":\"Realm\",\"filter\":\"^.{1,127}$\",\"name\":\"realm\",\"type\":\"string\",\"value\":\"ims.mnc001.mcc001.3gppnetwork.org\"}]}');
+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 (1598, '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 Charing Enable\",\"filter\":\"{\\\"0\\\":\\\"false\\\", \\\"1\\\":\\\"true\\\"}\",\"name\":\"chgEnable5G\",\"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 (1599, '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 (1600, '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 (1601, '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 (1602, '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\"}]}');
 
 SET FOREIGN_KEY_CHECKS = 1;

database/install/sys_dict_data0.sql

@@ -162,5 +162,8 @@ INSERT INTO `sys_dict_data` VALUES (118, 0, 'dictData.ne_info_status.0', '0', 'n
 INSERT INTO `sys_dict_data` VALUES (119, 1, 'dictData.ne_info_status.1', '1', 'ne_info_status', '', 'error', '1', 'supervisor', 1706620000000, 'supervisor', 1709642164831, '');
 INSERT INTO `sys_dict_data` VALUES (120, 2, 'dictData.ne_info_status.2', '2', 'ne_info_status', '', '', '1', 'supervisor', 1706620000000, '', 0, '');
 INSERT INTO `sys_dict_data` VALUES (121, 3, 'dictData.ne_info_status.3', '3', 'ne_info_status', '', 'warning', '1', 'supervisor', 1706620000000, 'supervisor', 1709642169871, '');
+INSERT INTO `sys_dict_data` VALUES (122, 0, 'ne_license_status.0', '0', 'ne_license_status', '', 'warning', '1', 'supervisor', 1706620000000, 'supervisor', 1712720196537, '');
+INSERT INTO `sys_dict_data` VALUES (123, 1, 'ne_license_status.1', '1', 'ne_license_status', '', 'processing', '1', 'supervisor', 1706620000000, 'supervisor', 1712720201349, '');
+INSERT INTO `sys_dict_data` VALUES (124, 2, 'dictData.ne_host_authMode.2', '2', 'ne_host_authMode', '', '', '1', 'supervisor', 1706620000000, '', 0, '');
 
 SET FOREIGN_KEY_CHECKS = 1;

database/install/sys_dict_data1_i18n_zh.sql

@@ -655,6 +655,8 @@ INSERT INTO `sys_dict_data` VALUES (2128, 2128, 'menu.monitor.cdr', '话单', 'i
 INSERT INTO `sys_dict_data` VALUES (2129, 2129, 'menu.monitor.event', '事件', 'i18n_zh', '', '', '1', 'supervisor', 1705550000000, '', 0, '');
 INSERT INTO `sys_dict_data` VALUES (2130, 2130, 'post.export.time', '创建时间', 'i18n_zh', '', '', '1', 'supervisor', 1705550000000, '', 0, '');
 INSERT INTO `sys_dict_data` VALUES (2131, 2131, 'role.export.time', '创建时间', 'i18n_zh', '', '', '1', 'supervisor', 1705550000000, '', 0, '');
+INSERT INTO `sys_dict_data` VALUES (2132, 2132, 'dictData.ne_host_authMode.2', '免密认证', 'i18n_zh', '', '', '1', 'supervisor', 1705550000000, '', 0, '');
+INSERT INTO `sys_dict_data` VALUES (2133, 2133, 'menu.ne.neConfPara5G', '网元公共配置', 'i18n_zh', '', '', '1', 'supervisor', 1705550000000, '', 0, '');
 
 
 SET FOREIGN_KEY_CHECKS = 1;

database/install/sys_dict_data2_i18n_en.sql

@@ -655,5 +655,7 @@ INSERT INTO `sys_dict_data` VALUES (4128, 4128, 'menu.monitor.cdr', 'CDR', 'i18n
 INSERT INTO `sys_dict_data` VALUES (4129, 4129, 'menu.monitor.event', 'Event', 'i18n_en', '', '', '1', 'supervisor', 1705550000000, '', 0, '');
 INSERT INTO `sys_dict_data` VALUES (4130, 4130, 'post.export.time', 'Creation Time', 'i18n_en', '', '', '1', 'supervisor', 1705550000000, '', 0, '');
 INSERT INTO `sys_dict_data` VALUES (4131, 4131, 'role.export.time', 'Creation Time', 'i18n_en', '', '', '1', 'supervisor', 1705550000000, '', 0, '');
+INSERT INTO `sys_dict_data` VALUES (4132, 4132, 'dictData.ne_host_authMode.2', 'Confidentiality Auth Mode', 'i18n_en', '', '', '1', 'supervisor', 1705550000000, '', 0, '');
+INSERT INTO `sys_dict_data` VALUES (4133, 4133, 'menu.ne.neConfPara5G', 'NE Config Public 5G', 'i18n_en', '', '', '1', 'supervisor', 1705550000000, '', 0, '');
 
 SET FOREIGN_KEY_CHECKS = 1;

database/install/sys_menu.sql

@@ -11,7 +11,7 @@
  Target Server Version : 100338 (10.3.38-MariaDB)
  File Encoding         : 65001
 
- Date: 16/04/2024 09:54:16
+ Date: 10/05/2024 17:25:35
 */
 
 SET NAMES utf8mb4;
@@ -47,20 +47,8 @@ CREATE TABLE `sys_menu`  (
 -- Records of sys_menu
 -- ----------------------------
 INSERT INTO `sys_menu` VALUES (1, 'menu.system', 0, 16, 'system', NULL, '1', '1', 'D', '1', '1', NULL, 'icon-xiangmu', 'supervisor', 1700000000000, NULL, 0, 'menu.systemRemark');
-INSERT INTO `sys_menu` VALUES (2, 'menu.monitor', 0, 2, 'monitor', NULL, '1', '1', 'D', '0', '0', NULL, 'icon-wenjian', 'supervisor', 1700000000000, NULL, 0, 'menu.monitorRemark');
-INSERT INTO `sys_menu` VALUES (3, 'menu.tools', 0, 15, 'tool', NULL, '1', '1', 'D', '1', '1', NULL, 'icon-wenjian', 'supervisor', 1700000000000, NULL, 0, 'menu.toolsRemark');
 INSERT INTO `sys_menu` VALUES (4, 'menu.config', 0, 3, 'configManage', NULL, '1', '0', 'D', '1', '1', NULL, 'icon-huizhiguize', 'supervisor', 1700000000000, NULL, 0, 'menu.configRemark');
 INSERT INTO `sys_menu` VALUES (5, 'menu.ueUser', 0, 7, 'neUser', NULL, '1', '0', 'D', '1', '1', NULL, 'icon-wocanyu', 'supervisor', 1700000000000, NULL, 0, 'menu.ueUserRemark');
-INSERT INTO `sys_menu` VALUES (6, '故障管理', 0, 50, 'page', NULL, '1', '0', 'D', '0', '1', 'page', 'fa fa-home', 'admin', 1690000000000, 'admin', 1690000000000, '故障管理');
-INSERT INTO `sys_menu` VALUES (7, '配置管理', 0, 550, 'page', NULL, '1', '0', 'D', '0', '1', 'page', 'fa fa-home', 'admin', 1690000000000, 'admin', 0, '配置管理');
-INSERT INTO `sys_menu` VALUES (8, '性能管理', 0, 551, 'page', NULL, '1', '0', 'D', '0', '1', 'page', 'fa fa-home', 'admin', 1690000000000, 'admin', 0, '性能管理');
-INSERT INTO `sys_menu` VALUES (9, '操作维护', 0, 552, 'page', NULL, '1', '0', 'D', '0', '1', 'page', 'fa fa-home', 'admin', 1690000000000, 'admin', 0, '操作维护');
-INSERT INTO `sys_menu` VALUES (10, '跟踪管理', 0, 553, 'page', NULL, '1', '0', 'D', '0', '1', 'page', 'fa fa-home', 'admin', 1690000000000, 'admin', 1690000000000, '跟踪管理');
-INSERT INTO `sys_menu` VALUES (11, '日志管理', 0, 554, 'page', NULL, '1', '0', 'D', '0', '1', 'page', 'fa fa-home', 'admin', 1690000000000, 'admin', 0, '日志管理');
-INSERT INTO `sys_menu` VALUES (12, '安全管理', 0, 555, 'page', NULL, '1', '0', 'D', '0', '1', 'page', 'fa fa-home', 'admin', 1690000000000, 'admin', 0, '安全管理');
-INSERT INTO `sys_menu` VALUES (13, '北向管理', 0, 556, 'page', NULL, '1', '0', 'D', '0', '0', 'page', 'fa fa-home', 'admin', 1690000000000, 'admin', 1690000000000, '北向管理');
-INSERT INTO `sys_menu` VALUES (14, '系统管理', 0, 557, 'page', NULL, '1', '0', 'D', '0', '1', 'page', 'fa fa-home', 'admin', 1690000000000, 'admin', 0, '系统管理');
-INSERT INTO `sys_menu` VALUES (15, '拓扑管理', 0, 558, 'page', NULL, '1', '0', 'D', '0', '0', 'page', 'fa fa-home', 'admin', 1690000000000, 'admin', 0, '拓扑管理');
 INSERT INTO `sys_menu` VALUES (100, 'menu.security.user', 2113, 1, 'user', 'system/user/index', '1', '1', 'M', '1', '1', 'system:user:list', 'icon-wocanyu', 'supervisor', 1700000000000, NULL, 0, 'menu.security.userRemark');
 INSERT INTO `sys_menu` VALUES (101, 'menu.security.role', 2113, 3, 'role', 'system/role/index', '1', '1', 'M', '1', '1', 'system:role:list', 'icon-anzhuo', 'supervisor', 1700000000000, NULL, 0, 'menu.security.roleRemark');
 INSERT INTO `sys_menu` VALUES (102, 'menu.security.roleUser', 2113, 3, 'role/inline/auth-user/:roleId', 'system/role/auth-user', '1', '1', 'M', '0', '1', 'system:role:auth', '#', 'supervisor', 1700000000000, NULL, 0, 'menu.security.roleUserRemark');
@@ -77,7 +65,6 @@ INSERT INTO `sys_menu` VALUES (114, 'menu.system.cache', 1, 3, 'cache', 'monitor
 INSERT INTO `sys_menu` VALUES (115, 'menu.security.onlineUser', 2113, 2, 'online', 'monitor/online/index', '1', '1', 'M', '1', '1', 'monitor:online:list', 'icon-xiangmuchengyuan', 'supervisor', 1700000000000, NULL, 0, 'menu.security.onlineUserRemark');
 INSERT INTO `sys_menu` VALUES (116, 'menu.system.job', 1, 1, 'job', 'monitor/job/index', '1', '1', 'M', '1', '1', 'monitor:job:list', 'icon-lishi', 'supervisor', 1700000000000, NULL, 0, 'menu.system.jobRemark');
 INSERT INTO `sys_menu` VALUES (117, 'menu.system.jobLog', 1, 2, '/system/job/inline/log/:jobId', 'monitor/job/log', '1', '1', 'M', '0', '1', 'monitor:job:log', '#', 'supervisor', 1700000000000, NULL, 0, 'menu.system.jobLogRemark');
-INSERT INTO `sys_menu` VALUES (118, 'menu.tools.help', 3, 1, 'help', 'tool/help/index', '1', '1', 'M', '1', '1', 'tool:help:list', '#', 'supervisor', 1700000000000, 'supervisor', 1708480983482, 'menu.tools.helpRemark');
 INSERT INTO `sys_menu` VALUES (500, 'menu.log.operat', 2089, 1, 'operate', 'system/log/operate/index', '1', '1', 'M', '1', '1', 'system:log:operate:list', 'icon-fuzhidaima', 'supervisor', 1700000000000, NULL, 0, 'menu.log.operatRemark');
 INSERT INTO `sys_menu` VALUES (501, 'menu.log.login', 2089, 2, 'login', 'system/log/login/index', '1', '1', 'M', '1', '1', 'system:log:login:list', 'icon-fuzhidaima', 'supervisor', 1700000000000, NULL, 0, 'menu.log.loginRemark');
 INSERT INTO `sys_menu` VALUES (1000, 'menu.common.query', 100, 1, NULL, NULL, '1', '1', 'B', '1', '1', 'system:user:query', '#', 'supervisor', 1700000000000, NULL, 0, NULL);
@@ -135,69 +122,7 @@ INSERT INTO `sys_menu` VALUES (1055, 'menu.common.edit', 116, 5, '#', NULL, '1',
 INSERT INTO `sys_menu` VALUES (1056, 'menu.common.export', 116, 6, '#', NULL, '1', '1', 'B', '1', '1', 'monitor:job:export', '#', 'supervisor', 1700000000000, NULL, 0, NULL);
 INSERT INTO `sys_menu` VALUES (2009, 'menu.ueUser.authUDM', 5, 1, 'auth', 'neUser/auth/index', '1', '1', 'M', '1', '1', 'neUser:auth:index', 'icon-xiangmuchengyuan', 'supervisor', 1700000000000, NULL, 0, 'menu.ueUser.authUDMRemark');
 INSERT INTO `sys_menu` VALUES (2010, 'menu.ueUser.subUDM', 5, 2, 'sub', 'neUser/sub/index', '1', '1', 'M', '1', '1', 'neUser:sub:index', 'icon-xiangmuchengyuan', 'supervisor', 1700000000000, NULL, 0, 'menu.ueUser.subUDMRemark');
-INSERT INTO `sys_menu` VALUES (2011, '活动告警', 6, 1, NULL, 'page/alarm/alarmListDown.html', '1', '0', 'M', '1', '1', 'page', '#', 'admin', 1690000000000, 'admin', 1690000000000, '活动告警');
-INSERT INTO `sys_menu` VALUES (2012, '历史告警', 6, 2, NULL, 'page/alarm/AlarmListHistory.html', '1', '0', 'M', '1', '1', 'page', '#', 'admin', 1690000000000, 'admin', 0, '历史告警');
-INSERT INTO `sys_menu` VALUES (2013, '故障通用设置', 6, 3, NULL, 'page/alarm/alarmInfoConfig.html', '1', '0', 'M', '1', '1', 'page', '#', 'admin', 1690000000000, 'admin', 0, '故障通用设置');
-INSERT INTO `sys_menu` VALUES (2014, '定时同步设置', 6, 4, NULL, 'page/alarm/synchronous.html', '1', '0', 'M', '1', '0', 'page', '#', 'admin', 1690000000000, 'admin', 1690000000000, '定时同步设置');
-INSERT INTO `sys_menu` VALUES (2015, '健康状态检查', 6, 5, NULL, 'page/alarm/healthCheck.html', '1', '0', 'M', '1', '0', 'page', '#', 'admin', 1690000000000, 'admin', 1690000000000, '健康状态检查');
-INSERT INTO `sys_menu` VALUES (2016, '告警前转', 6, 6, NULL, 'page/alarm/alarmForwarding.html', '1', '0', 'M', '1', '1', 'page', '#', 'admin', 1690000000000, 'admin', 0, '告警前转');
-INSERT INTO `sys_menu` VALUES (2017, '网元管理', 7, 1, NULL, 'page/nfManage/list.html', '1', '0', 'M', '1', '1', 'page', '#', 'admin', 1690000000000, 'admin', 0, '网元管理');
-INSERT INTO `sys_menu` VALUES (2018, '参数配置', 7, 2, NULL, 'page/configParam/list.html', '1', '0', 'M', '1', '1', 'page', '#', 'admin', 1690000000000, 'admin', 0, '参数配置');
-INSERT INTO `sys_menu` VALUES (2019, '软件管理', 7, 3, NULL, 'page/softwareManage/softwareManage.html', '1', '0', 'M', '1', '1', 'page', '#', 'admin', 1690000000000, 'admin', 0, '软件管理');
-INSERT INTO `sys_menu` VALUES (2020, '备份管理', 7, 5, NULL, 'page/softwareManage/backupManage.html', '1', '0', 'M', '1', '1', 'page', '#', 'admin', 1690000000000, 'admin', 0, '备份管理');
-INSERT INTO `sys_menu` VALUES (2021, '配置参数设置', 7, 6, NULL, 'page/configParam/configParamSet.html', '1', '0', 'M', '1', '1', 'page', '#', 'admin', 1690000000000, 'admin', 0, '配置参数设置');
-INSERT INTO `sys_menu` VALUES (2022, '任务管理', 8, 1, NULL, 'page/task/list.html', '1', '0', 'M', '1', '1', 'page', '#', 'admin', 1690000000000, 'admin', 0, '任务管理');
-INSERT INTO `sys_menu` VALUES (2023, '性能数据', 8, 2, NULL, 'page/repair/list.html', '1', '0', 'M', '1', '1', 'page', '#', 'admin', 1690000000000, 'admin', 0, '性能数据');
-INSERT INTO `sys_menu` VALUES (2024, '性能报表', 8, 3, NULL, 'page/task/perfReport.html', '1', '0', 'M', '1', '1', 'page', '#', 'admin', 1690000000000, 'admin', 0, '性能报表');
-INSERT INTO `sys_menu` VALUES (2025, '性能门限', 8, 4, NULL, 'page/task/threshold.html', '1', '0', 'M', '1', '1', 'page', '#', 'admin', 1690000000000, 'admin', 0, '性能门限');
-INSERT INTO `sys_menu` VALUES (2026, '黄金指标', 8, 5, NULL, 'page/gold/list.html', '1', '0', 'M', '1', '1', 'page', '#', 'admin', 1690000000000, 'admin', 0, '黄金指标');
-INSERT INTO `sys_menu` VALUES (2027, '性能通用设置', 8, 7, NULL, 'page/task/perfReportSet.html', '1', '0', 'M', '0', '0', 'page', '#', 'admin', 1690000000000, 'admin', 0, '性能通用设置');
-INSERT INTO `sys_menu` VALUES (2028, '自定义指标', 8, 8, NULL, 'page/indicators/list.html', '1', '0', 'M', '1', '1', 'page', '#', 'admin', 1690000000000, 'admin', 0, '自定义指标');
-INSERT INTO `sys_menu` VALUES (2029, '对象模板', 8, 8, NULL, 'page/objectTemplate/list.html', '1', '0', 'M', '1', '0', 'page', '#', 'admin', 1690000000000, 'admin', 1690000000000, '对象模板');
-INSERT INTO `sys_menu` VALUES (2030, '自定义测量数据', 8, 9, NULL, 'page/indicators/measuringData.html', '1', '0', 'M', '1', '0', 'page', '#', 'admin', 1690000000000, 'admin', 1690000000000, '自定义测量数据');
-INSERT INTO `sys_menu` VALUES (2031, '拓扑视图', 15, 1, NULL, 'page/topology/topologyList.html', '1', '0', 'M', '1', '0', 'page', '#', 'admin', 1690000000000, 'admin', 0, '拓扑视图');
-INSERT INTO `sys_menu` VALUES (2032, '系统维护', 14, 1, NULL, 'page/systemManage/systemOperation.html', '1', '0', 'M', '1', '1', 'page', '#', 'admin', 1690000000000, 'admin', 0, '系统维护');
-INSERT INTO `sys_menu` VALUES (2033, '稳定性事件列表', 14, 2, NULL, 'page/systemManage/stabilityEvents.html', '1', '0', 'M', '1', '0', 'page', '#', 'admin', 1690000000000, 'admin', 1690000000000, '稳定性事件列表');
-INSERT INTO `sys_menu` VALUES (2034, '稳定性统计报告', 14, 3, NULL, 'page/systemManage/stabilityReports.html', '1', '0', 'M', '1', '0', 'page', '#', 'admin', 1690000000000, 'admin', 1690000000000, '稳定性统计报告');
-INSERT INTO `sys_menu` VALUES (2035, '系统备份', 14, 4, NULL, 'page/systemManage/systemBackup.html', '1', '0', 'M', '1', '0', 'page', '#', 'admin', 1690000000000, 'admin', 1690000000000, '系统备份');
-INSERT INTO `sys_menu` VALUES (2036, '系统可扩展', 14, 5, NULL, 'page/systemManage/systemExtended.html', '1', '0', 'M', '1', '0', 'page', '#', 'admin', 1690000000000, 'admin', 1690000000000, '\"系统可扩展');
-INSERT INTO `sys_menu` VALUES (2037, '证书管理', 14, 6, NULL, 'page/systemManage/certificateManage.html', '1', '0', 'M', '1', '0', 'page', '#', 'admin', 1690000000000, 'admin', 1690000000000, '证书管理');
-INSERT INTO `sys_menu` VALUES (2038, '北向操作日志', 13, 0, NULL, 'page/log/nbiOperLogList.html', '1', '0', 'M', '0', '0', 'page', '#', 'admin', 1690000000000, 'admin', 0, '北向操作日志');
-INSERT INTO `sys_menu` VALUES (2039, '北向告警日志', 13, 2, NULL, 'page/log/nbiAlarmLog.html', '1', '0', 'M', '0', '0', 'page', '#', 'admin', 1690000000000, 'admin', 1690000000000, '北向告警日志');
-INSERT INTO `sys_menu` VALUES (2040, '北向通用设置', 13, 3, NULL, 'page/log/nbiSet.html', '1', '0', 'M', '0', '0', 'page', '#', 'admin', 1690000000000, 'admin', 0, '北向通用设置');
-INSERT INTO `sys_menu` VALUES (2041, '用户管理', 12, 1, NULL, 'page/user/list.html', '1', '0', 'M', '0', '1', 'page', '#', 'admin', 1690000000000, 'admin', 0, '用户管理');
-INSERT INTO `sys_menu` VALUES (2042, '在线状态', 12, 2, NULL, 'page/user/online.html', '1', '0', 'M', '0', '1', 'page', '#', 'admin', 1690000000000, 'admin', 0, '在线状态');
-INSERT INTO `sys_menu` VALUES (2043, '用户组管理', 12, 2, NULL, 'page/group/list.html', '1', '0', 'M', '0', '0', 'page', '#', 'admin', 1690000000000, 'admin', 1690000000000, '用户组管理');
-INSERT INTO `sys_menu` VALUES (2044, '安全策略', 12, 3, NULL, 'page/user/securityPolicy.html', '1', '0', 'M', '0', '0', 'page', '#', 'admin', 1690000000000, 'admin', 1690000000000, '安全策略');
-INSERT INTO `sys_menu` VALUES (2045, '操作日志', 11, 1, NULL, 'page/log/operLogList.html', '1', '0', 'M', '0', '1', 'page', '#', 'admin', 1690000000000, 'admin', 0, '操作日志');
-INSERT INTO `sys_menu` VALUES (2046, 'mml操作日志', 11, 2, NULL, 'page/log/mmlOperLogList.html', '1', '0', 'M', '0', '1', 'page', '#', 'admin', 1690000000000, 'admin', 0, 'mml操作日志');
-INSERT INTO `sys_menu` VALUES (2047, '告警日志', 11, 3, NULL, 'page/log/alarmLogList.html', '1', '0', 'M', '0', '1', 'page', '#', 'admin', 1690000000000, 'admin', 0, '告警日志');
-INSERT INTO `sys_menu` VALUES (2048, '安全日志', 11, 4, NULL, 'page/log/securityLogList.html', '1', '0', 'M', '0', '1', 'page', '#', 'admin', 1690000000000, 'admin', 0, '安全日志');
-INSERT INTO `sys_menu` VALUES (2049, '告警前转日志', 11, 7, NULL, 'page/log/forwardingLog.html', '1', '0', 'M', '0', '1', 'page', '#', 'admin', 1690000000000, 'admin', 0, '告警前转日志');
-INSERT INTO `sys_menu` VALUES (2050, '日志通用管理', 11, 8, NULL, 'page/log/logSet.html', '1', '0', 'M', '0', '1', 'page', '#', 'admin', 1690000000000, 'admin', 0, '日志通用管理');
-INSERT INTO `sys_menu` VALUES (2051, '系统日志', 11, 9, NULL, 'page/log/systemLog.html', '1', '0', 'M', '0', '1', 'page', '#', 'admin', 1690000000000, 'admin', 0, '系统日志');
-INSERT INTO `sys_menu` VALUES (2052, '跟踪任务', 10, 1, NULL, 'page/trace/taskList.html', '1', '0', 'M', '0', '1', 'page', '#', 'admin', 1690000000000, 'admin', 1690000000000, '跟踪任务');
-INSERT INTO `sys_menu` VALUES (2053, '信令分析', 10, 2, NULL, 'page/trace/traceShow.html', '1', '0', 'M', '0', '1', 'page', '#', 'admin', 1690000000000, 'admin', 1690000000000, '信令分析');
-INSERT INTO `sys_menu` VALUES (2054, '核心网池', 9, 0, NULL, 'page/mml/poolList.html', '1', '0', 'M', '0', '0', 'page', '#', 'admin', 1690000000000, 'admin', 1690000000000, '核心网池');
-INSERT INTO `sys_menu` VALUES (2055, '操作维护MML', 9, 1, NULL, 'page/mml/omcList.html', '1', '0', 'M', '0', '1', 'page', '#', 'admin', 1690000000000, 'admin', 0, '操作维护MML');
-INSERT INTO `sys_menu` VALUES (2056, '网元操作MML', 9, 3, NULL, 'page/mml/list.html', '1', '0', 'M', '0', '1', 'page', '#', 'admin', 1690000000000, 'admin', 0, '网元操作MML');
-INSERT INTO `sys_menu` VALUES (2057, '用户数据MML', 9, 4, NULL, 'page/mml/udmList.html', '1', '0', 'M', '0', '1', 'page', '#', 'admin', 1690000000000, 'admin', 0, '用户数据MML');
-INSERT INTO `sys_menu` VALUES (2058, '操作维护设置', 9, 5, NULL, 'page/mml/mmlSet.html', '1', '0', 'M', '0', '1', 'page', '#', 'admin', 1690000000000, 'admin', 0, '操作维护设置');
-INSERT INTO `sys_menu` VALUES (2059, '角色管理', 12, 6, NULL, 'page/role/list.html', '1', '0', 'M', '0', '1', 'page', '#', 'admin', 1690000000000, 'admin', 0, '角色管理');
-INSERT INTO `sys_menu` VALUES (2060, '菜单管理', 12, 7, NULL, 'page/menu/list.html', '1', '0', 'M', '0', '1', 'page', '#', 'admin', 1690000000000, 'admin', 0, '菜单管理');
-INSERT INTO `sys_menu` VALUES (2065, '数据库URL查询', 0, 10011, NULL, NULL, '1', '1', 'B', '0', '0', 'page', '#', 'admin', 1690000000000, 'admin', 0, '数据库查询操作');
-INSERT INTO `sys_menu` VALUES (2066, '数据库URL新增', 0, 10012, NULL, NULL, '1', '1', 'B', '0', '0', 'page', '#', 'admin', 1690000000000, 'admin', 0, '数据库URL新增');
-INSERT INTO `sys_menu` VALUES (2067, '数据库URL更新', 0, 10013, NULL, NULL, '1', '1', 'B', '0', '0', 'page', '#', 'admin', 1690000000000, 'admin', 0, '数据库URL更新');
-INSERT INTO `sys_menu` VALUES (2068, '数据库URL删除', 0, 10014, NULL, NULL, '1', '1', 'B', '0', '0', 'page', '#', 'admin', 1690000000000, 'admin', 0, '数据库URL删除');
-INSERT INTO `sys_menu` VALUES (2069, '用户信息', 0, 559, 'page', NULL, '1', '0', 'D', '0', '1', 'page', 'fa fa-home', 'admin', 1690000000000, 'admin', 1690000000000, NULL);
-INSERT INTO `sys_menu` VALUES (2070, 'UDM鉴权用户', 2069, 1, NULL, 'page/nfUserInfo/authList.html', '1', '0', 'M', '1', '1', 'page', '#', 'admin', 1690000000000, 'admin', 1690000000000, NULL);
-INSERT INTO `sys_menu` VALUES (2071, '5G基站信息', 2069, 4, NULL, 'page/nfUserInfo/5gBase.html', '1', '0', 'M', '1', '1', 'page', '#', 'admin', 1690000000000, 'admin', 1690000000000, NULL);
-INSERT INTO `sys_menu` VALUES (2072, 'IMS在线用户', 2069, 3, NULL, 'page/baseInfo/imsOnline.html', '1', '0', 'M', '1', '1', 'page', '#', 'admin', 1690000000000, 'admin', 1690000000000, NULL);
-INSERT INTO `sys_menu` VALUES (2073, 'UDM签约用户', 2069, 2, NULL, 'page/nfUserInfo/subsList.html', '1', '0', 'M', '1', '1', 'page', '#', 'admin', 1690000000000, 'admin', 1690000000000, NULL);
-INSERT INTO `sys_menu` VALUES (2074, 'UE在线信息', 2069, 4, NULL, 'page/baseInfo/ueInfoList.html', '1', '0', 'M', '1', '1', 'page', '#', 'admin', 1690000000000, 'admin', 1690000000000, NULL);
 INSERT INTO `sys_menu` VALUES (2075, 'menu.config.neManage', 4, 1, 'neManage', 'configManage/neManage/index', '1', '0', 'M', '1', '1', 'configManage:neManage:index', 'icon-biaoqing', 'supervisor', 1700000000000, NULL, 0, 'menu.config.neManageRemark');
-INSERT INTO `sys_menu` VALUES (2076, 'menu.config.configNE', 4, 2, 'configParam', 'configManage/configParam/index', '1', '0', 'M', '1', '1', 'configManage:configParam:index', 'icon-piliang', 'supervisor', 1700000000000, NULL, 0, 'menu.config.configNERemark');
-INSERT INTO `sys_menu` VALUES (2077, '信令抓包', 10, 3, NULL, 'page/trace/pcap.html', '1', '0', 'M', '1', '1', 'page', '#', 'admin', 1690000000000, 'admin', 0, 'tcpdump抓包pcap文件');
 INSERT INTO `sys_menu` VALUES (2078, 'menu.config.backupManage', 4, 3, 'backupManage', 'configManage/backupManage/index', '1', '0', 'M', '1', '1', 'configManage:backupManage:index', 'icon-soutubiao', 'supervisor', 1700000000000, NULL, 0, 'menu.config.backupManageRemark');
 INSERT INTO `sys_menu` VALUES (2079, 'menu.config.softwareManage', 4, 4, 'softwareManage', 'configManage/softwareManage/index', '1', '0', 'M', '1', '1', 'configManage:softwareManage:index', 'icon-huidingbu', 'supervisor', 1700000000000, NULL, 0, 'menu.config.softwareManageRemark');
 INSERT INTO `sys_menu` VALUES (2080, 'menu.ueUser.onlineIMS', 5, 4, 'ims', 'neUser/ims/index', '1', '0', 'M', '1', '1', 'neUser:ims:index', 'icon-xiangmuchengyuan', 'supervisor', 1700000000000, NULL, 0, 'menu.ueUser.onlineIMSRemark');
@@ -210,20 +135,17 @@ INSERT INTO `sys_menu` VALUES (2086, 'menu.trace.pcap', 2083, 3, 'pcap', 'traceM
 INSERT INTO `sys_menu` VALUES (2087, 'menu.fault', 0, 2, 'faultManage', NULL, '1', '0', 'D', '1', '1', NULL, 'icon-jinggao', 'supervisor', 1700000000000, NULL, 0, 'menu.faultRemark');
 INSERT INTO `sys_menu` VALUES (2088, 'menu.fault.active', 2129, 1, 'active-alarm', 'faultManage/active-alarm/index', '1', '1', 'M', '1', '1', 'faultManage:active-alarm:index', 'icon-wenjian', 'supervisor', 1700000000000, NULL, 0, 'menu.fault.activemRemark');
 INSERT INTO `sys_menu` VALUES (2089, 'menu.log', 0, 9, 'logManage', NULL, '1', '0', 'D', '1', '1', NULL, 'icon-fuzhidaima', 'supervisor', 1700000000000, NULL, 0, 'menu.logRemark');
-INSERT INTO `sys_menu` VALUES (2090, 'menu.log.operatOld', 2089, 1, 'operation', 'logManage/operation/index', '1', '0', 'M', '0', '0', 'logManage:operation:index', 'icon-fuzhidaima', 'supervisor', 1700000000000, NULL, 0, 'menu.log.operatOldRemark');
 INSERT INTO `sys_menu` VALUES (2091, 'menu.log.mml', 2089, 2, 'mml', 'logManage/mml/index', '1', '1', 'M', '1', '1', 'logManage:mml:index', 'icon-wocanyu', 'supervisor', 1700000000000, NULL, 0, 'menu.log.mmlRemark');
 INSERT INTO `sys_menu` VALUES (2092, 'menu.log.alarm', 2089, 3, 'alarm-log', 'logManage/alarm/index', '1', '0', 'M', '1', '1', 'logManage:alarm:index', 'icon-fuzhidaima', 'supervisor', 1700000000000, NULL, 0, 'menu.log.alarmRemark');
-INSERT INTO `sys_menu` VALUES (2093, 'menu.log.securityOld', 2089, 6, 'security-log', 'logManage/security/index', '1', '0', 'M', '0', '0', 'logManage/security/index', 'icon-gongnengjieshao', 'supervisor', 1700000000000, NULL, 0, 'menu.log.securityOldRemark');
 INSERT INTO `sys_menu` VALUES (2094, 'menu.log.forwarding', 2089, 7, 'forwarding', 'logManage/forwarding/index', '1', '0', 'M', '1', '1', 'logManage:forwarding:index', 'icon-huizhiguize', 'supervisor', 1700000000000, NULL, 0, 'menu.log.forwardingRemark');
-INSERT INTO `sys_menu` VALUES (2095, 'menu.log.set', 2089, 15, 'logSet', 'logManage/logSet/index', '1', '0', 'M', '1', '1', 'logManage:logSet:index', 'icon-you', 'supervisor', 1700000000000, NULL, 0, 'menu.log.setRemark');
+INSERT INTO `sys_menu` VALUES (2095, 'menu.log.set', 2089, 15, 'logSet', 'logManage/logSet/index', '1', '0', 'M', '0', '0', 'logManage:logSet:index', 'icon-you', 'supervisor', 1700000000000, 'supervisor', 1715332370830, 'menu.log.setRemark');
-INSERT INTO `sys_menu` VALUES (2096, 'menu.monitor.sessionUser', 2, 10, 'session', 'monitor/session/index', '1', '0', 'M', '0', '0', 'monitor:session:index', 'icon-gerenzhanghu', 'supervisor', 1700000000000, NULL, 0, 'menu.monitor.sessionUserRemark');
 INSERT INTO `sys_menu` VALUES (2097, 'menu.fault.history', 2129, 2, 'history-alarm', 'faultManage/history-alarm/index', '1', '1', 'M', '1', '1', 'faultManage/history-alarm/index', 'icon-huizhiguize', 'supervisor', 1700000000000, NULL, 0, 'menu.fault.historyRemark');
 INSERT INTO `sys_menu` VALUES (2098, 'menu.fault.set', 2129, 100, 'fault-setting', 'faultManage/fault-setting/index', '1', '0', 'M', '1', '1', 'faultManage/fault-setting/index', 'icon-gonggaodayi', 'supervisor', 1700000000000, NULL, 0, 'menu.fault.setRemark');
 INSERT INTO `sys_menu` VALUES (2099, 'menu.perf', 0, 5, 'perfManage', NULL, '1', '0', 'D', '1', '1', NULL, 'icon-soutubiao', 'supervisor', 1700000000000, NULL, 0, 'menu.perfRemark');
 INSERT INTO `sys_menu` VALUES (2100, 'menu.perf.task', 2099, 1, 'taskManage', 'perfManage/taskManage/index', '1', '1', 'M', '0', '1', 'perfManage:taskManage:index', 'icon-wofaqi', 'supervisor', 1700000000000, 'admin', 1713177036412, 'menu.perf.taskRemark');
 INSERT INTO `sys_menu` VALUES (2101, 'menu.perf.data', 2099, 2, 'perfData', 'perfManage/perfData/index', '1', '1', 'M', '0', '1', 'perfManage:perfData:index', 'icon-soutubiao', 'supervisor', 1700000000000, 'admin', 1713177042915, 'menu.perf.dataRemark');
 INSERT INTO `sys_menu` VALUES (2102, 'menu.perf.report', 2099, 3, 'perfReport', 'perfManage/perfReport/index', '1', '0', 'M', '0', '0', 'perfManage:perfReport:index', 'icon-gonggaodayi', 'supervisor', 1700000000000, NULL, 0, 'menu.perf.reportRemark');
-INSERT INTO `sys_menu` VALUES (2103, 'menu.perf.threshold', 2099, 4, 'perfThreshold', 'perfManage/perfThreshold/index', '1', '0', 'M', '0', '1', 'perfManage:perfThreshold:index', 'icon-zhuanrang', 'supervisor', 1700000000000, 'admin', 1712807935215, 'menu.perf.thresholdRemark');
+INSERT INTO `sys_menu` VALUES (2103, 'menu.perf.threshold', 2099, 4, 'perfThreshold', 'perfManage/perfThreshold/index', '1', '0', 'M', '1', '1', 'perfManage:perfThreshold:index', 'icon-zhuanrang', 'supervisor', 1700000000000, 'admin', 1712807935215, 'menu.perf.thresholdRemark');
 INSERT INTO `sys_menu` VALUES (2104, 'menu.perf.kpi', 2099, 5, 'goldTarget', 'perfManage/goldTarget/index', '1', '1', 'M', '1', '1', 'perfManage:goldTarget:index', 'icon-soutubiao', 'supervisor', 1700000000000, NULL, 0, 'menu.perf.kpiRemark');
 INSERT INTO `sys_menu` VALUES (2105, 'menu.perf.customTarget', 2099, 6, 'customTarget', 'perfManage/customTarget/index', '1', '1', 'M', '0', '0', 'perfManage:customTarget:index', 'icon-fanhui1', 'supervisor', 1700000000000, 'admin', 1712807948673, 'menu.perf.customTargetRemark');
 INSERT INTO `sys_menu` VALUES (2106, 'menu.perf.set', 2099, 7, 'perfSet', 'perfManage/perfSet/index', '1', '0', 'M', '0', '0', 'perfManage:perfSet:index', 'icon-gonggao', 'supervisor', 1700000000000, NULL, 0, 'menu.perf.setRemark');
@@ -236,8 +158,6 @@ INSERT INTO `sys_menu` VALUES (2112, 'menu.config.licenseManage', 4, 5, 'license
 INSERT INTO `sys_menu` VALUES (2113, 'menu.security', 0, 14, 'security', NULL, '1', '0', 'D', '1', '1', NULL, 'icon-suofang', 'supervisor', 1700000000000, NULL, 0, 'menu.securityRemark');
 INSERT INTO `sys_menu` VALUES (2114, 'menu.system.systemSet', 1, 12, 'setting', 'system/setting/index', '1', '1', 'M', '1', '1', 'system:setting:index', 'icon-piliang', 'supervisor', 1700000000000, NULL, 0, 'menu.system.systemSetRemark');
 INSERT INTO `sys_menu` VALUES (2115, 'menu.system.systemResource', 1, 13, 'monitor', 'monitor/monitor/index', '1', '1', 'M', '1', '1', 'monitor:monitor:info', 'icon-soutubiao', 'supervisor', 1700000000000, NULL, 0, 'menu.system.systemResourceRemark');
-INSERT INTO `sys_menu` VALUES (2116, 'menu.config.configNEForm', 4, 2, 'configParamForm', 'configManage/configParamForm/index', '1', '0', 'M', '1', '1', 'configManage:configParam:index', 'icon-wofaqi', 'supervisor', 1700000000000, NULL, 0, 'menu.config.configNEFormRemark');
-INSERT INTO `sys_menu` VALUES (2117, 'menu.config.configNETree', 4, 2, 'configParamTree', 'configManage/configParamTree/index', '1', '0', 'M', '1', '1', 'configManage:configParam:index', 'icon-wofaqi', 'supervisor', 1700000000000, NULL, 0, 'menu.config.configNETreeRemark');
 INSERT INTO `sys_menu` VALUES (2118, 'menu.config.configNETreeTable', 4, 2, 'configNETreeTable', 'configManage/configParamTreeTable/index', '1', '1', 'M', '1', '1', 'configManage:configParam:index', 'icon-wofaqi', 'supervisor', 1700000000000, NULL, 0, 'menu.config.configNETreeTableRemark');
 INSERT INTO `sys_menu` VALUES (2119, 'menu.ueUser.n3iwf', 5, 8, 'n3iwf', 'neUser/n3iwf/index', '1', '0', 'M', '0', '1', 'neUser:n3iwf:index', 'icon-paixu', 'supervisor', 1700000000000, NULL, 0, NULL);
 INSERT INTO `sys_menu` VALUES (2120, 'menu.ueUser.pcf', 5, 9, 'pcf', 'neUser/pcf/index', '1', '0', 'M', '1', '1', 'neUser:pcf:index', 'icon-paixu', 'supervisor', 1700000000000, NULL, 0, NULL);
@@ -254,12 +174,10 @@ INSERT INTO `sys_menu` VALUES (2130, 'menu.topology', 2087, 20, 'topology', NULL
 INSERT INTO `sys_menu` VALUES (2131, 'menu.dashboard', 2087, 0, 'dashboard', NULL, '1', '0', 'D', '1', '1', NULL, 'icon-soutubiao', 'supervisor', 1705550000000, 'supervisor', 1705550000000, NULL);
 INSERT INTO `sys_menu` VALUES (2132, 'menu.dashboard.overview', 2131, 1, 'overview', 'dashboard/overview/index', '1', '0', 'M', '1', '1', 'dashboard:overview:index', 'icon-paixu', 'supervisor', 1705550000000, NULL, 0, NULL);
 INSERT INTO `sys_menu` VALUES (2133, 'menu.dashboard.cdr', 2140, 40, 'imsCDR', 'dashboard/imsCDR/index', '1', '0', 'M', '1', '1', 'dashboard:cdr:index', 'icon-paixu', 'supervisor', 1705550000000, 'supervisor', 1712751038982, '');
-INSERT INTO `sys_menu` VALUES (2134, 'menu.tools.terminal', 3, 3, 'terminal', 'tool/terminal/index', '1', '1', 'M', '1', '1', 'tool:terminal:index', 'icon-pcduan', 'supervisor', 1708481172778, '', 0, '');
 INSERT INTO `sys_menu` VALUES (2135, 'menu.config.neHost', 4, 15, 'neHost', 'ne/neHost/index', '1', '1', 'M', '1', '1', 'ne:neHost:list', 'icon-fuzhidaima', 'supervisor', 1708583596871, '', 0, '');
 INSERT INTO `sys_menu` VALUES (2136, 'menu.config.neHostCommand', 4, 18, 'neHostCommand', 'ne/neHostCommand/index', '1', '0', 'M', '1', '1', 'ne:neHostCommand:list', 'icon-fuzhidaima', 'supervisor', 1708583596871, '', 0, '');
 INSERT INTO `sys_menu` VALUES (2137, 'menu.config.neInfo', 4, 14, 'neInfo', 'ne/neInfo/index', '1', '0', 'M', '1', '1', 'ne:neInfo:list', 'icon-fuzhidaima', 'supervisor', 1708583596871, '', 0, '');
 INSERT INTO `sys_menu` VALUES (2138, 'menu.dashboard.amfUE', 2141, 1, 'amfUE', 'dashboard/amfUE/index', '1', '0', 'M', '1', '1', 'dashboard:amfUE:index', 'icon-paixu', 'supervisor', 1705550000000, 'supervisor', 1711354049893, '');
-INSERT INTO `sys_menu` VALUES (2139, 'menu.logs.log', 2089, 0, 'log', '', '1', '0', 'D', '0', '1', '', 'icon-wenjian', 'supervisor', 1711352535855, 'supervisor', 1712751078161, '');
 INSERT INTO `sys_menu` VALUES (2140, 'menu.monitor.cdr', 2087, 40, 'cdr', '', '1', '0', 'D', '1', '1', '', 'icon-tubiaoku', 'supervisor', 1711352709786, 'supervisor', 1712751135878, '');
 INSERT INTO `sys_menu` VALUES (2141, 'menu.monitor.event', 2087, 50, 'event', '', '1', '0', 'D', '1', '1', '', 'icon-gengduo', 'supervisor', 1711352768797, 'supervisor', 1712751125648, '');
 

database/install/sys_user.sql

@@ -23,27 +23,27 @@ DROP TABLE IF EXISTS `sys_user`;
 /*!40101 SET @saved_cs_client     = @@character_set_client */;
 /*!40101 SET character_set_client = utf8 */;
 CREATE TABLE `sys_user` (
-  `user_id` bigint(20) NOT NULL AUTO_INCREMENT COMMENT '用户ID',
+  `user_id` bigint NOT NULL AUTO_INCREMENT COMMENT '用户ID',
-  `dept_id` bigint(20) DEFAULT NULL COMMENT '部门ID',
+  `dept_id` bigint DEFAULT '0' COMMENT '部门ID',
-  `user_name` varchar(30) NOT NULL COMMENT '用户账号',
+  `user_name` varchar(36) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NOT NULL DEFAULT '' COMMENT '用户账号',
-  `nick_name` varchar(30) NOT NULL COMMENT '用户昵称',
+  `nick_name` varchar(36) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NOT NULL DEFAULT '' COMMENT '用户昵称',
-  `user_type` varchar(20) DEFAULT 'sys' COMMENT '用户类型（sys系统用户）',
+  `user_type` varchar(20) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci DEFAULT 'sys' COMMENT '用户类型（sys系统用户）',
-  `email` varchar(50) DEFAULT '' COMMENT '用户邮箱',
+  `email` varchar(64) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci DEFAULT '' COMMENT '用户邮箱',
-  `phonenumber` varchar(11) DEFAULT '' COMMENT '手机号码',
+  `phonenumber` varchar(16) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci DEFAULT '' COMMENT '手机号码',
-  `sex` char(1) DEFAULT '0' COMMENT '用户性别（0未知 1男 2女）',
+  `sex` char(1) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci DEFAULT '0' COMMENT '用户性别（0未知 1男 2女）',
-  `avatar` varchar(255) DEFAULT '' COMMENT '头像地址',
+  `avatar` varchar(255) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci DEFAULT '' COMMENT '头像地址',
-  `password` varchar(100) DEFAULT '' COMMENT '密码',
+  `password` varchar(100) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci DEFAULT '' COMMENT '密码',
-  `status` char(1) DEFAULT '0' COMMENT '帐号状态（0停用 1正常）',
+  `status` char(1) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci DEFAULT '0' COMMENT '帐号状态（0停用 1正常）',
-  `del_flag` char(1) DEFAULT '0' COMMENT '删除标志（0代表存在 1代表删除）',
+  `del_flag` char(1) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci DEFAULT '0' COMMENT '删除标志（0代表存在 1代表删除）',
-  `login_ip` varchar(128) DEFAULT '' COMMENT '最后登录IP',
+  `login_ip` varchar(128) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci DEFAULT '' COMMENT '最后登录IP',
-  `login_date` bigint(20) DEFAULT 0 COMMENT '最后登录时间',
+  `login_date` bigint DEFAULT '0' COMMENT '最后登录时间',
-  `create_by` varchar(50) DEFAULT '' COMMENT '创建者',
+  `create_by` varchar(50) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci DEFAULT '' COMMENT '创建者',
-  `create_time` bigint(20) DEFAULT 0 COMMENT '创建时间',
+  `create_time` bigint DEFAULT '0' COMMENT '创建时间',
-  `update_by` varchar(50) DEFAULT '' COMMENT '更新者',
+  `update_by` varchar(50) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci DEFAULT '' COMMENT '更新者',
-  `update_time` bigint(20) DEFAULT 0 COMMENT '更新时间',
+  `update_time` bigint DEFAULT '0' COMMENT '更新时间',
-  `remark` varchar(500) DEFAULT NULL COMMENT '备注',
+  `remark` varchar(500) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci DEFAULT '' COMMENT '备注',
   PRIMARY KEY (`user_id`) USING BTREE
-) ENGINE=InnoDB AUTO_INCREMENT=107 DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_general_ci ROW_FORMAT=DYNAMIC COMMENT='用户信息表';
+) ENGINE=InnoDB AUTO_INCREMENT=100 DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_general_ci ROW_FORMAT=DYNAMIC COMMENT='用户信息表';
 /*!40101 SET character_set_client = @saved_cs_client */;
 
 --

database/upgrade/upg_sys_dict_data1_i18n_zh.sql

@@ -647,5 +647,6 @@ REPLACE INTO `sys_dict_data` VALUES (2129, 2129, 'menu.monitor.event', '事件',
 REPLACE INTO `sys_dict_data` VALUES (2130, 2130, 'post.export.time', '创建时间', 'i18n_zh', '', '', '1', 'supervisor', 1705550000000, '', 0, '');
 REPLACE INTO `sys_dict_data` VALUES (2131, 2131, 'role.export.time', '创建时间', 'i18n_zh', '', '', '1', 'supervisor', 1705550000000, '', 0, '');
 REPLACE INTO `sys_dict_data` VALUES (2132, 2132, 'dictData.ne_host_authMode.2', '免密认证', 'i18n_zh', '', '', '1', 'supervisor', 1705550000000, '', 0, '');
+REPLACE INTO `sys_dict_data` VALUES (2133, 2133, 'menu.ne.neConfPara5G', '网元公共配置', 'i18n_zh', '', '', '1', 'supervisor', 1705550000000, '', 0, '');
 
 SET FOREIGN_KEY_CHECKS = 1;

database/upgrade/upg_sys_menu.sql

@@ -255,7 +255,7 @@ INSERT IGNORE INTO `sys_menu` VALUES (2131, 'menu.dashboard', 2087, 0, 'dashboar
 INSERT IGNORE INTO `sys_menu` VALUES (2132, 'menu.dashboard.overview', 2131, 1, 'overview', 'dashboard/overview/index', '1', '0', 'M', '1', '1', 'dashboard:overview:index', 'icon-paixu', 'supervisor', 1705550000000, NULL, 0, NULL);
 INSERT IGNORE INTO `sys_menu` VALUES (2133, 'menu.dashboard.cdr', 2131, 3, 'imsCDR', 'dashboard/imsCDR/index', '1', '0', 'M', '1', '1', 'dashboard:cdr:index', 'icon-paixu', 'supervisor', 1705550000000, '', 0, '');
 INSERT IGNORE INTO `sys_menu` VALUES (2134, 'menu.tools.terminal', 3, 3, 'terminal', 'tool/terminal/index', '1', '1', 'M', '1', '1', 'tool:terminal:index', 'icon-pcduan', 'supervisor', 1708481172778, '', 0, '');
-INSERT IGNORE INTO `sys_menu` VALUES (2135, 'menu.config.neHost', 4, 15, 'neHost', 'ne/neHost/index', '1', '0', 'M', '1', '1', 'ne:neHost:list', 'icon-fuzhidaima', 'supervisor', 1708583596871, '', 0, '');
+INSERT IGNORE INTO `sys_menu` VALUES (2135, 'menu.config.neHost', 4, 15, 'neHost', 'ne/neHost/index', '1', '1', 'M', '1', '1', 'ne:neHost:list', 'icon-fuzhidaima', 'supervisor', 1708583596871, '', 0, '');
 INSERT IGNORE INTO `sys_menu` VALUES (2136, 'menu.config.neHostCommand', 4, 18, 'neHostCommand', 'ne/neHostCommand/index', '1', '0', 'M', '1', '1', 'ne:neHostCommand:list', 'icon-fuzhidaima', 'supervisor', 1708583596871, '', 0, '');
 INSERT IGNORE INTO `sys_menu` VALUES (2137, 'menu.config.neInfo', 4, 14, 'neInfo', 'ne/neInfo/index', '1', '0', 'M', '1', '1', 'ne:neInfo:list', 'icon-fuzhidaima', 'supervisor', 1708583596871, '', 0, '');
 INSERT IGNORE INTO `sys_menu` VALUES (2138, 'menu.dashboard.amfUE', 2131, 6, 'amfUE', 'dashboard/amfUE/index', '1', '0', 'M', '1', '1', 'dashboard:amfUE:index', 'icon-paixu', 'supervisor', 1705550000000, '', 0, '');
@@ -272,6 +272,9 @@ UPDATE `omc_db`.`sys_menu` SET `is_cache` = '1' WHERE `menu_id` = 2118;
 UPDATE `omc_db`.`sys_menu` SET `is_cache` = '1' WHERE `menu_id` = 2134;
 UPDATE `omc_db`.`sys_menu` SET  `path` = 'imsCDR', `component` = 'dashboard/imsCDR/index' WHERE `menu_id` = 2133;
 
+DELETE FROM `omc_db`.`sys_menu` WHERE `menu_id` = 2142;
+DELETE FROM `omc_db`.`sys_menu` WHERE `menu_id` = 2143;
+
 UPDATE `omc_db`.`sys_menu`
 SET
     `menu_name` = 'menu.system.cacheInfo',
@@ -448,9 +451,7 @@ SET
 WHERE
     `menu_id` = 2105;
 
-DELETE FROM `omc_db`.`sys_menu` WHERE `menu_id` = 2142;
 
-DELETE FROM `omc_db`.`sys_menu` WHERE `menu_id` = 2143;
 
 UPDATE `omc_db`.`sys_menu`
 SET
@@ -958,4 +959,193 @@ SET
 WHERE
     `menu_id` = 2141;
 
+-- begin: remove some excess old menus at 2024/05/10, r2.2405.1
+DELETE FROM `omc_db`.`sys_menu` WHERE `menu_id` = 2;
+
+DELETE FROM `omc_db`.`sys_menu` WHERE `menu_id` = 3;
+
+DELETE FROM `omc_db`.`sys_menu` WHERE `menu_id` = 6;
+
+DELETE FROM `omc_db`.`sys_menu` WHERE `menu_id` = 7;
+
+DELETE FROM `omc_db`.`sys_menu` WHERE `menu_id` = 8;
+
+DELETE FROM `omc_db`.`sys_menu` WHERE `menu_id` = 9;
+
+DELETE FROM `omc_db`.`sys_menu` WHERE `menu_id` = 10;
+
+DELETE FROM `omc_db`.`sys_menu` WHERE `menu_id` = 11;
+
+DELETE FROM `omc_db`.`sys_menu` WHERE `menu_id` = 12;
+
+DELETE FROM `omc_db`.`sys_menu` WHERE `menu_id` = 13;
+
+DELETE FROM `omc_db`.`sys_menu` WHERE `menu_id` = 14;
+
+DELETE FROM `omc_db`.`sys_menu` WHERE `menu_id` = 15;
+
+DELETE FROM `omc_db`.`sys_menu` WHERE `menu_id` = 118;
+
+DELETE FROM `omc_db`.`sys_menu` WHERE `menu_id` = 2011;
+
+DELETE FROM `omc_db`.`sys_menu` WHERE `menu_id` = 2012;
+
+DELETE FROM `omc_db`.`sys_menu` WHERE `menu_id` = 2013;
+
+DELETE FROM `omc_db`.`sys_menu` WHERE `menu_id` = 2014;
+
+DELETE FROM `omc_db`.`sys_menu` WHERE `menu_id` = 2015;
+
+DELETE FROM `omc_db`.`sys_menu` WHERE `menu_id` = 2016;
+
+DELETE FROM `omc_db`.`sys_menu` WHERE `menu_id` = 2017;
+
+DELETE FROM `omc_db`.`sys_menu` WHERE `menu_id` = 2018;
+
+DELETE FROM `omc_db`.`sys_menu` WHERE `menu_id` = 2019;
+
+DELETE FROM `omc_db`.`sys_menu` WHERE `menu_id` = 2020;
+
+DELETE FROM `omc_db`.`sys_menu` WHERE `menu_id` = 2021;
+
+DELETE FROM `omc_db`.`sys_menu` WHERE `menu_id` = 2022;
+
+DELETE FROM `omc_db`.`sys_menu` WHERE `menu_id` = 2023;
+
+DELETE FROM `omc_db`.`sys_menu` WHERE `menu_id` = 2024;
+
+DELETE FROM `omc_db`.`sys_menu` WHERE `menu_id` = 2025;
+
+DELETE FROM `omc_db`.`sys_menu` WHERE `menu_id` = 2026;
+
+DELETE FROM `omc_db`.`sys_menu` WHERE `menu_id` = 2027;
+
+DELETE FROM `omc_db`.`sys_menu` WHERE `menu_id` = 2028;
+
+DELETE FROM `omc_db`.`sys_menu` WHERE `menu_id` = 2029;
+
+DELETE FROM `omc_db`.`sys_menu` WHERE `menu_id` = 2030;
+
+DELETE FROM `omc_db`.`sys_menu` WHERE `menu_id` = 2031;
+
+DELETE FROM `omc_db`.`sys_menu` WHERE `menu_id` = 2032;
+
+DELETE FROM `omc_db`.`sys_menu` WHERE `menu_id` = 2033;
+
+DELETE FROM `omc_db`.`sys_menu` WHERE `menu_id` = 2034;
+
+DELETE FROM `omc_db`.`sys_menu` WHERE `menu_id` = 2035;
+
+DELETE FROM `omc_db`.`sys_menu` WHERE `menu_id` = 2036;
+
+DELETE FROM `omc_db`.`sys_menu` WHERE `menu_id` = 2037;
+
+DELETE FROM `omc_db`.`sys_menu` WHERE `menu_id` = 2038;
+
+DELETE FROM `omc_db`.`sys_menu` WHERE `menu_id` = 2039;
+
+DELETE FROM `omc_db`.`sys_menu` WHERE `menu_id` = 2040;
+
+DELETE FROM `omc_db`.`sys_menu` WHERE `menu_id` = 2041;
+
+DELETE FROM `omc_db`.`sys_menu` WHERE `menu_id` = 2042;
+
+DELETE FROM `omc_db`.`sys_menu` WHERE `menu_id` = 2043;
+
+DELETE FROM `omc_db`.`sys_menu` WHERE `menu_id` = 2044;
+
+DELETE FROM `omc_db`.`sys_menu` WHERE `menu_id` = 2045;
+
+DELETE FROM `omc_db`.`sys_menu` WHERE `menu_id` = 2046;
+
+DELETE FROM `omc_db`.`sys_menu` WHERE `menu_id` = 2047;
+
+DELETE FROM `omc_db`.`sys_menu` WHERE `menu_id` = 2048;
+
+DELETE FROM `omc_db`.`sys_menu` WHERE `menu_id` = 2049;
+
+DELETE FROM `omc_db`.`sys_menu` WHERE `menu_id` = 2050;
+
+DELETE FROM `omc_db`.`sys_menu` WHERE `menu_id` = 2051;
+
+DELETE FROM `omc_db`.`sys_menu` WHERE `menu_id` = 2052;
+
+DELETE FROM `omc_db`.`sys_menu` WHERE `menu_id` = 2053;
+
+DELETE FROM `omc_db`.`sys_menu` WHERE `menu_id` = 2054;
+
+DELETE FROM `omc_db`.`sys_menu` WHERE `menu_id` = 2055;
+
+DELETE FROM `omc_db`.`sys_menu` WHERE `menu_id` = 2056;
+
+DELETE FROM `omc_db`.`sys_menu` WHERE `menu_id` = 2057;
+
+DELETE FROM `omc_db`.`sys_menu` WHERE `menu_id` = 2058;
+
+DELETE FROM `omc_db`.`sys_menu` WHERE `menu_id` = 2059;
+
+DELETE FROM `omc_db`.`sys_menu` WHERE `menu_id` = 2060;
+
+DELETE FROM `omc_db`.`sys_menu` WHERE `menu_id` = 2065;
+
+DELETE FROM `omc_db`.`sys_menu` WHERE `menu_id` = 2066;
+
+DELETE FROM `omc_db`.`sys_menu` WHERE `menu_id` = 2067;
+
+DELETE FROM `omc_db`.`sys_menu` WHERE `menu_id` = 2068;
+
+DELETE FROM `omc_db`.`sys_menu` WHERE `menu_id` = 2069;
+
+DELETE FROM `omc_db`.`sys_menu` WHERE `menu_id` = 2070;
+
+DELETE FROM `omc_db`.`sys_menu` WHERE `menu_id` = 2071;
+
+DELETE FROM `omc_db`.`sys_menu` WHERE `menu_id` = 2072;
+
+DELETE FROM `omc_db`.`sys_menu` WHERE `menu_id` = 2073;
+
+DELETE FROM `omc_db`.`sys_menu` WHERE `menu_id` = 2074;
+
+DELETE FROM `omc_db`.`sys_menu` WHERE `menu_id` = 2076;
+
+DELETE FROM `omc_db`.`sys_menu` WHERE `menu_id` = 2077;
+
+DELETE FROM `omc_db`.`sys_menu` WHERE `menu_id` = 2090;
+
+DELETE FROM `omc_db`.`sys_menu` WHERE `menu_id` = 2093;
+
+DELETE FROM `omc_db`.`sys_menu` WHERE `menu_id` = 2096;
+
+DELETE FROM `omc_db`.`sys_menu` WHERE `menu_id` = 2116;
+
+DELETE FROM `omc_db`.`sys_menu` WHERE `menu_id` = 2117;
+
+DELETE FROM `omc_db`.`sys_menu` WHERE `menu_id` = 2134;
+
+DELETE FROM `omc_db`.`sys_menu` WHERE `menu_id` = 2139;
+
+UPDATE `omc_db`.`sys_menu`
+SET
+    `menu_name` = 'menu.log.set',
+    `parent_id` = 2089,
+    `menu_sort` = 15,
+    `path` = 'logSet',
+    `component` = 'logManage/logSet/index',
+    `is_frame` = '1',
+    `is_cache` = '0',
+    `menu_type` = 'M',
+    `visible` = '0',
+    `status` = '0',
+    `perms` = 'logManage:logSet:index',
+    `icon` = 'icon-you',
+    `create_by` = 'supervisor',
+    `create_time` = 1700000000000,
+    `update_by` = 'supervisor',
+    `update_time` = 1715332370830,
+    `remark` = 'menu.log.setRemark'
+WHERE
+    `menu_id` = 2095;
+
+-- end: remove 
+
 SET FOREIGN_KEY_CHECKS = 1;

database/upgrade/upg_sys_user.sql

@@ -1,28 +1,27 @@
 SET FOREIGN_KEY_CHECKS=0;
 
-CREATE TABLE IF NOT EXISTS `omc_db`.`sys_user`  (
+CREATE TABLE IF NOT EXISTS `omc_db`.`sys_user` (
-  `user_id` bigint(20) NOT NULL AUTO_INCREMENT COMMENT '用户ID',
+  `user_id` bigint NOT NULL AUTO_INCREMENT COMMENT '用户ID',
-  `dept_id` bigint(20) NULL DEFAULT NULL COMMENT '部门ID',
+  `dept_id` bigint DEFAULT '0' COMMENT '部门ID',
-  `user_name` varchar(30) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NOT NULL COMMENT '用户账号',
+  `user_name` varchar(36) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NOT NULL DEFAULT '' COMMENT '用户账号',
-  `nick_name` varchar(30) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NOT NULL COMMENT '用户昵称',
+  `nick_name` varchar(36) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NOT NULL DEFAULT '' COMMENT '用户昵称',
-  `user_type` varchar(20) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT 'sys' COMMENT '用户类型（sys系统用户）',
+  `user_type` varchar(20) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci DEFAULT 'sys' COMMENT '用户类型（sys系统用户）',
-  `email` varchar(50) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT '' COMMENT '用户邮箱',
+  `email` varchar(64) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci DEFAULT '' COMMENT '用户邮箱',
-  `phonenumber` varchar(11) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT '' COMMENT '手机号码',
+  `phonenumber` varchar(16) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci DEFAULT '' COMMENT '手机号码',
-  `sex` char(1) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT '0' COMMENT '用户性别（0未知 1男 2女）',
+  `sex` char(1) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci DEFAULT '0' COMMENT '用户性别（0未知 1男 2女）',
-  `avatar` varchar(255) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT '' COMMENT '头像地址',
+  `avatar` varchar(255) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci DEFAULT '' COMMENT '头像地址',
-  `password` varchar(100) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT '' COMMENT '密码',
+  `password` varchar(100) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci DEFAULT '' COMMENT '密码',
-  `status` char(1) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT '0' COMMENT '帐号状态（0停用 1正常）',
+  `status` char(1) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci DEFAULT '0' COMMENT '帐号状态（0停用 1正常）',
-  `del_flag` char(1) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT '0' COMMENT '删除标志（0代表存在 1代表删除）',
+  `del_flag` char(1) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci DEFAULT '0' COMMENT '删除标志（0代表存在 1代表删除）',
-  `login_ip` varchar(128) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT '' COMMENT '最后登录IP',
+  `login_ip` varchar(128) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci DEFAULT '' COMMENT '最后登录IP',
-  `login_date` bigint(20) NULL DEFAULT 0 COMMENT '最后登录时间',
+  `login_date` bigint DEFAULT '0' COMMENT '最后登录时间',
-  `create_by` varchar(50) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT '' COMMENT '创建者',
+  `create_by` varchar(50) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci DEFAULT '' COMMENT '创建者',
-  `create_time` bigint(20) NULL DEFAULT 0 COMMENT '创建时间',
+  `create_time` bigint DEFAULT '0' COMMENT '创建时间',
-  `update_by` varchar(50) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT '' COMMENT '更新者',
+  `update_by` varchar(50) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci DEFAULT '' COMMENT '更新者',
-  `update_time` bigint(20) NULL DEFAULT 0 COMMENT '更新时间',
+  `update_time` bigint DEFAULT '0' COMMENT '更新时间',
-  `remark` varchar(500) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL COMMENT '备注',
+  `remark` varchar(500) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci DEFAULT '' COMMENT '备注',
   PRIMARY KEY (`user_id`) USING BTREE
-) ENGINE = InnoDB CHARACTER SET = utf8mb4 COLLATE = utf8mb4_general_ci COMMENT = '用户信息表' ROW_FORMAT = Dynamic;
+) ENGINE=InnoDB AUTO_INCREMENT=100 DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_general_ci ROW_FORMAT=DYNAMIC COMMENT='用户信息表';
-
 
 --DELETE FROM `omc_db`.`sys_user` WHERE `user_id` IN (1,2);
 
@@ -202,4 +201,12 @@ VALUES (
         ''
     );
 
+-- 20240508
+ALTER TABLE `omc_db`.`sys_user` MODIFY COLUMN `dept_id` bigint NULL DEFAULT 0 COMMENT '部门ID' AFTER `user_id`;
+ALTER TABLE `omc_db`.`sys_user` MODIFY COLUMN `user_name` varchar(36) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NOT NULL DEFAULT '' COMMENT '用户账号' AFTER `dept_id`;
+ALTER TABLE `omc_db`.`sys_user` MODIFY COLUMN `nick_name` varchar(36) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NOT NULL DEFAULT '' COMMENT '用户昵称' AFTER `user_name`;
+ALTER TABLE `omc_db`.`sys_user` MODIFY COLUMN `email` varchar(64) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT '' COMMENT '用户邮箱' AFTER `user_type`;
+ALTER TABLE `omc_db`.`sys_user` MODIFY COLUMN `phonenumber` varchar(16) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT '' COMMENT '手机号码' AFTER `email`;
+ALTER TABLE `omc_db`.`sys_user` MODIFY COLUMN `remark` varchar(500) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT '' COMMENT '备注' AFTER `update_time`;
+
 SET FOREIGN_KEY_CHECKS=1;    

makefile

@@ -3,7 +3,7 @@
 ProjectL = omc
 ProjectU = OMC
 PROJECT = $(ProjectL)
-VERSION = 2.2404.6
+VERSION = 2.2405.1
 RelDate = `date +%Y%m%d`
 Release = $(RelDate)
 RelVer = $(VERSION)-$(RelDate)

mkpkg.sh

@@ -2,7 +2,7 @@
 
 ProcList="restagent crontask sshsvc captrace data2html"
 ProjectL=omc
-VERSION=2.2404.6
+VERSION=2.2405.1
 RelDate=`date +%Y%m%d`
 Release=${RelDate}
 RelVer=${VERSION}-${RelDate}

restagent/etc/restconf-t.yaml

@@ -3,20 +3,40 @@
 # duration: rotation time with xx hours, example: 1/12/24 hours
 # count: rotation count of log, default is 30 rotation
 logger:
-  file: d:/local.git/be.ems/restagent/log/restagent-t.log  
+  file: d:/local.git/be.ems/restagent/log/restagent.log
   level: trace
   duration: 24
   count: 2   
 
 # rest agent listen ipv4/v6 and port, support multiple routines
 # ip: 0.0.0.0 or ::0, support IPv4/v6
+# clientAuthType: 0:NoClientCert (default), 1:RequestClientCert, 2:RequireAnyClientCert, 
+#                 3:VerifyClientCertIfGiven, 4:RequireAndVerifyClientCerts
 rest:
   - ipv4: 0.0.0.0
     ipv6: 
     port: 33030
   - ipv4: 0.0.0.0
     ipv6: 
-    port: 36060
+    port:  33443
+    scheme: https
+    clientAuthType: 0
+    caFile: ./etc/certs/omc-ca.crt
+    certFile: ./etc/certs/omc-server.crt
+    keyFile: ./etc/certs/omc-server.key
+
+webServer:
+  enabled: false
+  rootDir: d:/local.git/fe.ems.vue3/dist
+  listen: 
+    - addr: :80
+      schema: http
+    - addr: :443
+      scheme: https
+      clientAuthType: 0      
+      caFile: ./etc/certs/omc-ca.crt
+      certFile: ./etc/certs/omc-server.crt
+      keyFile: ./etc/certs/omc-server.key
 
 database:
   type: mysql
@@ -25,6 +45,7 @@ database:
   host: 127.0.0.1
   port: 33066
   name: omc_db
+  connParam: charset=utf8mb4&collation=utf8mb4_general_ci&parseTime=True&interpolateParams=True
   backup: d:/local.git/be.ems/restagent/database
 
 # Redis 缓存数据，数据源声明全小写
@@ -33,25 +54,34 @@ redis:
     # OMC系统使用库
     default:
       port: 6379 # Redis port
-      host: "192.168.2.166" # Redis host
+      host: "192.168.2.219" # Redis host
-      password: ""
+      password: "123456"
       db: 10 # Redis db_num
     # UDM网元用户库
     udmuser:
       port: 6379 # Redis port
-      host: "192.168.2.166"
+      host: "192.168.2.219"
-      password: ""
+      password: "123456"
       db: 0 # Redis db_num
   # 多个数据源时可以用这个指定默认的数据源
   defaultDataSourceName: "default"
-  
+
+# sleep: time delay for after write buffer (millisecond)
+# deadLine: timeout for io read and write (second)  
 mml:
   port: 4100
+  port2: 5002
   sleep: 200
+  deadLine: 10
+  sizeRow: 100
+  sizeCol: 128
+  bufferSize: 65535
   user: admin
   password: admin
   mmlHome: ./mmlhome
+  upload: /home/agtuser
 
+# NE config
 ne:
   user: root
   etcdir: /usr/local/etc
@@ -59,6 +89,13 @@ ne:
   omcdir: /usr/local/omc
   scpdir: /tmp
   licensedir: /usr/local/etc/{neType}/license
+  # backup etc list of IMS,no space  
+  etcListIMS: '{*.yaml,mmtel,vars.cfg}'
+  etcListDefault: '{*.yaml,*.conf,*.cfg}'
+  # true/false to overwrite config file when dpkg ne software 
+  dpkgOverwrite: false
+  # dpkg timeout (second)
+  dpkgTimeout: 180
 
 # chk2ne: true/false, if put OmcNeConfig parameters to NE
 omc:
@@ -71,42 +108,55 @@ omc:
   vendor: ""
   dn: 4600
   chk2ne: false
-  sn: 13750650
+  sn: "-"
   checksign: false
+  rootDir: ./
+  binDir: ./bin
   backup: ./backup
   upload: ./upload
   frontUpload: d:/local.git/fe.ems/upload
   frontTraceDir: d:/local.git/fe.ems/trace
   software: ./software
   license: ./license
-  gtpUri: gtp:192.168.2.119:2152
+  gtpUri: gtp:192.168.2.219:2152
   checkContentType: false
   testMode: false
   rbacMode: true
   runDir: 
+  cmdTimeout: 120
 
 # Alarm module setting
 # Forward interface:
-# email/sms  
+# email/sms
+# smProxy: sms(Short Message Service)/smsc(SMS Centre)  
 alarm:
   forwardAlarm: true
   email:
-    smtp: smtp@xxx.com.cn
+    smtp: mail.agrandtech.com
     port: 25
-    user: smtpuser
+    user: smtpext@agrandtech.com
-    password: smtpuser@omc
+    password: "1000smtp@omc!"
+    # TLS skip verify: true/false
+    tlsSkipVerify: true
+  smProxy: smsc
   sms:
-    apiURL: http://smsc.xxx.com.cn/
+    apiURL: http://smsc.xxx.com/
     accessKeyID: xxxx
     accessKeySecret: xxxx
     signName: xxx SMSC
     templateCode: 1000
-  
+  smsc:
+    addr: "192.168.13.114:2775"
+    systemID: "omc"
+    password: "omc123"
+    systemType: "UTRAN"
+    
 #User authorized information
 # crypt: mysql/md5/bcrypt
 # token: true/false to check accessToken
 # expires for session, unit: second
 # Support single/multiple session of user
+#
 auth:
   crypt: bcrypt
   token: true
@@ -129,6 +179,18 @@ params:
   subidmaxnum: 20
   urimaxlen: 2100000
   rmuidregexp: "[0-9]{4}[A-Z]{2}[A-Z]{2}[0-9A-Z]{1}[0-9A-Z]{3}[0-9A-Z]{1,16}"
+
 testConfig:
   enabled: true
-  file: ./etc/testconfig.yaml
+  file: ./etc/testconfig.yaml
+
+# 静态文件配置, 相对项目根路径或填绝对路径
+staticFile:
+  # 默认资源，dir目录需要预先创建
+  default:
+    prefix: "/static"
+    dir: "./static"
+  # 文件上传资源目录映射，与项目目录同级
+  upload:
+    prefix: "/upload"
+    dir: "./upload"

restagent/etc/restconf.yaml

@@ -18,7 +18,7 @@ rest:
     port: 33040
   - ipv4: 0.0.0.0
     ipv6: 
-    port:  33443
+    port:  34443
     scheme: https
     clientAuthType: 0
     caFile: ./etc/certs/omc-ca.crt

restagent/makefile

@@ -1,7 +1,7 @@
 # Makefile for rest agent project
 
 PROJECT = OMC
-VERSION = 2.2404.6
+VERSION = 2.2405.1
 PLATFORM = amd64
 ARMPLATFORM = aarch64
 BUILDDIR = ../../build

src/framework/config/config/config.default.yaml

@@ -1,7 +1,7 @@
 # 项目信息
 framework:
   name: "CN EMS"
-  version: "2.2404.6"
+  version: "2.2405.1"
 
 # 应用服务配置
 server:

src/modules/network_data/repository/perf_kpi.go

@@ -7,9 +7,15 @@ type IPerfKPI interface {
 	// SelectGoldKPI 通过网元指标数据信息
 	SelectGoldKPI(query model.GoldKPIQuery, kpiIds []string) []map[string]any
 
+	// select from new kpi report table, exp. kpi_report_upf
+	SelectKpiReport(query model.GoldKPIQuery, kpiIds []string) []map[string]any
+
 	// SelectGoldKPITitle 网元对应的指标名称
 	SelectGoldKPITitle(neType string) []model.GoldKPITitle
 
 	// SelectUPFTotalFlow 查询UPF总流量 N3上行 N6下行
 	SelectUPFTotalFlow(neType, rmUID, startDate, endDate string) map[string]any
+
+	// select upf throughput from new kpi_report
+	SelectUPFThroughput(neType, rmUID, startDate, endDate string) map[string]any
 }

src/modules/network_data/repository/perf_kpi.impl.go

@@ -86,6 +86,79 @@ func (r *PerfKPIImpl) SelectGoldKPI(query model.GoldKPIQuery, kpiIds []string) [
 	return results
 }
 
+func (r *PerfKPIImpl) SelectKpiReport(query model.GoldKPIQuery, kpiIds []string) []map[string]any {
+	// 查询条件拼接
+	var conditions []string
+	var params []any
+	var tableName string = "kpi_report_"
+	if query.RmUID != "" {
+		conditions = append(conditions, "gk.rm_uid = ?")
+		params = append(params, query.RmUID)
+	}
+	if query.NeType != "" {
+		conditions = append(conditions, "gk.ne_type = ?")
+		params = append(params, query.NeType)
+		tableName += strings.ToLower(query.NeType)
+	}
+	var dateTimeStr string = "CONCAT(gk.`date`, \" \", gk.start_time)"
+	if query.StartTime != "" {
+		conditions = append(conditions, dateTimeStr+" >= ?")
+		params = append(params, query.StartTime)
+	}
+	if query.EndTime != "" {
+		conditions = append(conditions, dateTimeStr+" <= ?")
+		params = append(params, query.EndTime)
+	}
+	// 构建查询条件语句
+	whereSql := ""
+	if len(conditions) > 0 {
+		whereSql += " where " + strings.Join(conditions, " and ")
+	}
+
+	// 查询字段列
+	timeFormat := "DATE_FORMAT(" + dateTimeStr + ", '%Y-%m-%d %H:%i:')"
+	secondGroup := fmt.Sprintf("LPAD(FLOOR(SECOND(gk.start_time) / %d) * %d, 2, '0')", query.Interval, query.Interval)
+	groupByField := fmt.Sprintf("CONCAT( %s, %s ) AS timeGroup", timeFormat, secondGroup)
+	if query.Interval > 60 {
+		minute := query.Interval / 60
+		timeFormat = "DATE_FORMAT(" + dateTimeStr + ", '%Y-%m-%d %H:')"
+		minuteGroup := fmt.Sprintf("LPAD(FLOOR(MINUTE(gk.start_time) / %d) * %d, 2, '0')", minute, minute)
+		groupByField = fmt.Sprintf("CONCAT( %s, %s ) AS timeGroup", timeFormat, minuteGroup)
+	}
+	var fields = []string{
+		groupByField,
+		"min(CASE WHEN gk.index != '' THEN gk.index ELSE 0 END) AS startIndex",
+		"min(CASE WHEN gk.ne_type != '' THEN gk.ne_type ELSE 0 END) AS neType",
+		"min(CASE WHEN gk.ne_name != '' THEN gk.ne_name ELSE 0 END) AS neName",
+	}
+	for i, kid := range kpiIds {
+		// 特殊字段，只取最后一次收到的非0值
+		if kid == "AMF.01" || kid == "UDM.01" || kid == "UDM.02" || kid == "UDM.03" || kid == "SMF.01" {
+			str := fmt.Sprintf("IFNULL(SUBSTRING_INDEX(GROUP_CONCAT( CASE WHEN JSON_EXTRACT(gk.kpi_values, '$[%d].kpi_id') = '%s' THEN JSON_EXTRACT(gk.kpi_values, '$[%d].value') END  ), ',', 1), 0) AS '%s'", i, kid, i, kid)
+			fields = append(fields, str)
+		} else {
+			str := fmt.Sprintf("sum(CASE WHEN JSON_EXTRACT(gk.kpi_values, '$[%d].kpi_id') = '%s' THEN JSON_EXTRACT(gk.kpi_values, '$[%d].value') ELSE 0 END) AS '%s'", i, kid, i, kid)
+			fields = append(fields, str)
+		}
+	}
+	fieldsSql := strings.Join(fields, ",")
+
+	// 查询数据
+	if query.SortField == "" {
+		query.SortField = "timeGroup"
+	}
+	if query.SortOrder == "" {
+		query.SortOrder = "desc"
+	}
+	orderSql := fmt.Sprintf(" order by %s %s", query.SortField, query.SortOrder)
+	querySql := fmt.Sprintf("SELECT %s FROM %s gk %s GROUP BY timeGroup %s", fieldsSql, tableName, whereSql, orderSql)
+	results, err := datasource.RawDB("", querySql, params)
+	if err != nil {
+		logger.Errorf("query err => %v", err)
+	}
+	return results
+}
+
 // SelectGoldKPITitle 网元对应的指标名称
 func (r *PerfKPIImpl) SelectGoldKPITitle(neType string) []model.GoldKPITitle {
 	result := []model.GoldKPITitle{}
@@ -131,3 +204,39 @@ func (r *PerfKPIImpl) SelectUPFTotalFlow(neType, rmUID, startDate, endDate strin
 	}
 	return results[0]
 }
+
+// SelectUPFTotalFlow 查询UPF总流量 N3上行 N6下行
+func (r *PerfKPIImpl) SelectUPFThroughput(neType, rmUID, startDate, endDate string) map[string]any {
+	// 查询条件拼接
+	var conditions []string
+	var params []any
+	if neType != "" {
+		conditions = append(conditions, "gk.ne_type = ?")
+		params = append(params, neType)
+	}
+	if rmUID != "" {
+		conditions = append(conditions, "gk.rm_uid = ?")
+		params = append(params, rmUID)
+	}
+	if startDate != "" {
+		conditions = append(conditions, "gk.date >= ?")
+		params = append(params, startDate)
+	}
+	if endDate != "" {
+		conditions = append(conditions, "gk.date <= ?")
+		params = append(params, endDate)
+	}
+	// 构建查询条件语句
+	whereSql := ""
+	if len(conditions) > 0 {
+		whereSql += " where " + strings.Join(conditions, " and ")
+	}
+
+	// 查询数据
+	querySql := fmt.Sprintf("SELECT sum( CASE WHEN  JSON_EXTRACT(gk.kpi_values, '$[2].kpi_id') = 'UPF.03' THEN JSON_EXTRACT(gk.kpi_values, '$[2].value') ELSE 0 END ) AS 'up', sum( CASE WHEN  JSON_EXTRACT(gk.kpi_values, '$[5].kpi_id') = 'UPF.06' THEN JSON_EXTRACT(gk.kpi_values, '$[5].value') ELSE 0 END ) AS 'down' FROM kpi_report_upf gk %s", whereSql)
+	results, err := datasource.RawDB("", querySql, params)
+	if err != nil {
+		logger.Errorf("query err => %v", err)
+	}
+	return results[0]
+}

src/modules/network_data/service/perf_kpi.impl.go

@@ -31,7 +31,8 @@ func (r *PerfKPIImpl) SelectGoldKPI(query model.GoldKPIQuery) []map[string]any {
 		kpiIds = append(kpiIds, kpiId.KPIID)
 	}
 
-	data := r.perfKPIRepository.SelectGoldKPI(query, kpiIds)
+	//data := r.perfKPIRepository.SelectGoldKPI(query, kpiIds)
+	data := r.perfKPIRepository.SelectKpiReport(query, kpiIds)
 	if data == nil {
 		return []map[string]any{}
 	}
@@ -66,7 +67,8 @@ func (r *PerfKPIImpl) SelectUPFTotalFlow(neType, rmUID string, day int) map[stri
 		}
 	}
 
-	info = r.perfKPIRepository.SelectUPFTotalFlow(neType, rmUID, startDate, endDate)
+	//info = r.perfKPIRepository.SelectUPFTotalFlow(neType, rmUID, startDate, endDate)
+	info = r.perfKPIRepository.SelectUPFThroughput(neType, rmUID, startDate, endDate)
 
 	// 保存到缓存
 	infoJSON, _ := json.Marshal(info)

sshsvc/makefile

@@ -1,7 +1,7 @@
 # Makefile for OMC-OMC-crontask project
 
 PROJECT = OMC
-VERSION = 2.2404.6
+VERSION = 2.2405.1
 LIBDIR = be.ems/lib
 BINNAME = sshsvc