chore: 更新版本号 2.2410.4

.gitignore

@@ -37,6 +37,7 @@ captrace/log/
 tools/loadmconf/loadmconf
 tools/loadpconf/loadpconf
 
+reference
 vendor
 
 # Built Visual Studio Code Extensions
@@ -48,4 +49,3 @@ vendor
 *.exe
 __debug_bin*.exe
 
-tools/evaluate/*.go

.vscode/launch.json

@@ -29,15 +29,6 @@
             "program": "d:/omc.git/be.ems/sshsvc/sshsvc.go",
             "console": "integratedTerminal"
         },
-        {
-            "name": "debug loadpconf",
-            "type": "go",
-            "request": "launch",
-            "mode": "debug",
-            "program": "d:/omc.git/be.ems/tools/loadpconf",
-            "args": ["-p","../../config/param/smf_param_config.yaml"],
-            "console": "integratedTerminal"
-        },
         {
             "name": "debug crontask",
             "type": "go",
@@ -52,7 +43,6 @@
             "request": "launch",
             "mode": "debug",
             "program": "d:/omc.git/be.ems/tools/encode",
-            //"args": ["-p","../../config/param/smf_param_config.yaml"],
             "console": "integratedTerminal"
         }                                              
     ]

.vscode/settings.json

@@ -1,6 +0,0 @@
-{
-"go.toolsEnvVars": {
-    "GOOS": "windows",
-    "GOARCH": "amd64"
-}
-}

CHANGELOG.md

@@ -1,13 +1,29 @@
 # 版本发布日志
 
-## 2.2409.1-20240925
+## 2.2410.4-20241102
 
-多租户修改如下：
+- 新增 直连网元信息取得hostname/os属性值
+- 新增 UDM鉴权签约imsi多查询
+- 更新 更新系统菜单新增关键指标概览
+- 更新 定时任务周期同步更新UDM用户数据
+- 更新 AMF/SMF参数配置项数据
+- 修复 SMSC安装时关联修改IMS和UDM配置
 
-- ims在线用户显示异常
+## 2.2410.3-20241018
-- admin和tenant角色只能单选
 
-合并主线版本修改如下：
+- 新增 网元主机支持redis配置项
+- 新增 菜单功能iperf3/ping网络测试工具
+- 更新 抓包文件支持查看内容
+- 更新 初始网元相关表字段数据变更
+- 更新 UDM用户数据按查询条件导出
+
+## 2.2410.1-20241012
+
+- 新增 系统菜单新增工具栏目，网元SSH,网络测试，网络探针
+- 更新 UDM签约数据表，同步数据支持MICO和RAT操作修改
+- 优化 MML命令连接改为网元信息配置telnet
+- 更新 SMSC、AMF参数配置数据
+- 更新 定时清除到导出文件缓存
 
 ## 2.2409.4-20240927
 
@@ -28,20 +44,20 @@
 - 新增 跟踪任务相关接口初始化，跟踪任务新增非201/400时接收信息
 - 修复 抓包文件下载zip时目录同名导致删除压缩无内容
 
---## 2.2409.1-20240909
+## 2.2409.1-20240909
 
 - 新增 告警前转的两个接口email前转和短信前转的系统参数，采用了和网元统一的参数配置方式，
 - 优化 修改了dpkg和rpm包安装后的运行脚本，支持通过环境变量传入参数，并判断传入参数调用setomc.sh安装/升级数据库，命令格式：M_PARAM=upgrade C_PARAM=ba dpkg -I xxxx.deb，如果不传入参数则和以前相同
 - 调整的dpkg和rpm包安装的运行脚本中停止omc服务的顺序，解决了omc安装包在前端界面自升级时出现无法自动刷新的问题
 
---## 2.2408.5-20240831
+## 2.2408.5-20240831
 
 - 修复 系统信息读取磁盘获取超时导致返回空数组
 - 优化 缓存信息安全清理排除登录用户身份和验证码信息
 - 新增 KPI自定义指标功能接口
 - 新增 日志数据导出文件查看功能接口
 
---## 2.2408.4-20240823
+## 2.2408.4-20240823
 
 - 优化 网元端文件目录/tmp/omc 上传push 下载pull
 - 新增 网元文件操作可删除本地临时文件
@@ -49,19 +65,19 @@
 - 新增 KPI添加CBC
 - 更新 CBC参数配置可选属性
 
---## 2.2408.3-20240816
+## 2.2408.3-20240816
 
 - 新增 中间件-接口加解密，配合前端CryptoJS加解密
 - 新增 KPI添加SMSC
 - 更新 IMS参数配置可选属性
 
---## 2.2408.2-20240809
+## 2.2408.2-20240809
 
 - 新增 SMSC-CDR 功能接口
 - 新增 文件内容实时查看功能接口
 - 修复 WS 模块连接断开，存在 goroutenue 逃逸问题
 
---## 2.2408.1-20240802
+## 2.2408.1-20240802
 
 - 修复 菜单网元公共配置移除
 - 修复 关闭启动时默认 127.0.0..1 的 IP 绑定
@@ -78,9 +94,6 @@
 
 ## 2.2407.3-20240716
 
-- 修复 禁用OMC MML命令dsp neconfig
-- 修复 支持kvdb依赖包安装，默认带的adb改为kvdb
-- 修复 OMC通过Web升级时数据库更新失败
 - 更新 参数配置 AMF 参数配置 system
 - 更新 参数配置 UPF 参数属性 dataForwarderCommon
 - 修复 移除 omc 脚本命令前的 sudo

captrace/etc/capconf.yaml

@@ -16,7 +16,7 @@ database:
   password: 1000omc@kp!
   host: 172.25.97.150
   port: 33066
-  name: tenants_db
+  name: omc_db
   connParam: charset=utf8mb4&collation=utf8mb4_general_ci&parseTime=True&interpolateParams=True
 
 

captrace/makefile

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

config/etc/default/capconf.yaml

@@ -16,7 +16,7 @@ database:
   password: 1000omc@kp!
   host: 127.0.0.1
   port: 33066
-  name: tenants_db
+  name: omc_db
   connParam: charset=utf8mb4&collation=utf8mb4_general_ci&parseTime=True&interpolateParams=True 
 
 

config/etc/default/crontask.yaml

@@ -24,7 +24,7 @@ database:
   password: 1000omc@kp!
   host: 127.0.0.1
   port: 33066
-  name: tenants_db
+  name: omc_db
   connParam: charset=utf8mb4&collation=utf8mb4_general_ci&parseTime=True&interpolateParams=True 
 
 # northbound interface, cm/pm

config/etc/default/restconf.yaml

@@ -44,7 +44,7 @@ database:
   password: 1000omc@kp!
   host: 127.0.0.1
   port: 33066
-  name: tenants_db
+  name: omc_db
   connParam: charset=utf8mb4&collation=utf8mb4_general_ci&parseTime=True&interpolateParams=True
   backup: /usr/local/omc/database
 
@@ -70,7 +70,7 @@ redis:
 # deadLine: timeout for io read and write (second)
 mml:
   sleep: 200
-  deadLine: 600
+  deadLine: 10
   sizeRow: 600
   sizeCol: 128
   bufferSize: 65535

config/etc/default/sshsvc.yaml

@@ -71,7 +71,7 @@ database:
   password: 1000omc@kp!
   host: 127.0.0.1
   port: 33066
-  name: tenants_db
+  name: omc_db
   connParam: charset=utf8mb4&collation=utf8mb4_general_ci&parseTime=True&interpolateParams=True
 
 omc:

config/etc/default/tasks.yaml

@@ -22,7 +22,7 @@ tasks:
     do: TaskHelloWorld  # (Do what: callback function)
   - name: clear expired history alarm
     status: Inactive 
-    uri: /api/rest/databaseManagement/v1/tenants_db/alarm
+    uri: /api/rest/databaseManagement/v1/omc_db/alarm
     params: WHERE=now()+>+ADDDATE(event_time,+interval+(SELECT+`value`+FROM+config+WHERE+config_tag='historyDuration')+day)+and+alarm_status='0'
     interval: 1
     unit: Days
@@ -30,14 +30,14 @@ tasks:
     do: TaskDeleteExpiredRecord
   - name: clear expired history gold_kpi
     status: Inactive 
-    uri: /api/rest/databaseManagement/v1/tenants_db/gold_kpi
+    uri: /api/rest/databaseManagement/v1/omc_db/gold_kpi
     params: WHERE=now()+>+ADDDATE(`date`,+interval+IFNULL((SELECT+`value`+FROM+config+WHERE+config_tag='goldKpiDuration'),7)+day)
     interval: 1
     unit: Days
     at: 00:12:00
     do: TaskDeleteExpiredRecord    
   - name: clear deleted custom pm kpi
-    uri: /api/rest/databaseManagement/v1/tenants_db/pm_custom_title
+    uri: /api/rest/databaseManagement/v1/omc_db/pm_custom_title
     params: WHERE=now()+>+ADDDATE(update_time,+interval+(SELECT+`value`+FROM+config+WHERE+config_tag='keepPMCKpi')+day)+and+status='Deleted'
     interval: 1
     unit: Days
@@ -45,7 +45,7 @@ tasks:
     do: TaskDeleteExpiredRecord    
   - name: update expired user session
     status: Inactive 
-    uri: /api/rest/databaseManagement/v1/tenants_db/session
+    uri: /api/rest/databaseManagement/v1/omc_db/session
     params: WHERE=NOW()+>+ADDDATE(shake_time,+interval+expires+second)+and+status='online'
     body: '{"session":{"status":"offline"}}'
     interval: 30
@@ -61,28 +61,28 @@ tasks:
     at: 00:50:00
     do: TaskDeleteExpiredRecord
   - name: Backup measure data
-    uri: /api/rest/databaseManagement/v1/tenants_db/measure_data
+    uri: /api/rest/databaseManagement/v1/omc_db/measure_data
     params: SQL=select+*+into+outfile+'%s'+fields+terminated+by+','+escaped+by+''+optionally+enclosed+by+''+lines+terminated+by+'\n'+from+(select+'id','date','task_id','ne_name','rm_uid','ne_type','granul_option','kpi_code','kpi_id','kpi_ext','start_time','end_time','value','timestamp'+union+select+id,date,task_id,ne_name,rm_uid,ne_type,granul_option,kpi_code,kpi_id,kpi_ext,start_time,end_time,value,timestamp+from+measure_data)+b
     interval: 1
     unit: Days
     at: 00:20:00
     do: TaskDBBackupCSVGetBySQL    
   - name: Backup operation log
-    uri: /api/rest/databaseManagement/v1/tenants_db/operation_log
+    uri: /api/rest/databaseManagement/v1/omc_db/operation_log
     params: SQL=select+*+into+outfile+'%s'+fields+terminated+by+','+escaped+by+''+optionally+enclosed+by+''+lines+terminated+by+'\n'+from+(select+'op_id','account_name','op_ip','subsys_tag','op_type','op_content','op_result','begin_time','end_time','vnf_flag','log_time'+union+select+op_id,account_name,op_ip,subsys_tag,op_type,op_content,op_result,begin_time,end_time,vnf_flag,log_time+from+operation_log)+b
     interval: 1
     unit: Days
     at: 00:26:00
     do: TaskDBBackupCSVGetBySQL    
   - name: Backup security log
-    uri: /api/rest/databaseManagement/v1/tenants_db/security_log
+    uri: /api/rest/databaseManagement/v1/omc_db/security_log
     params: SQL=select+*+into+outfile+'%s'+fields+terminated+by+','+escaped+by+''+optionally+enclosed+by+''+lines+terminated+by+'\n'+from+(select+'id','account_name','account_type','op_ip','op_type','op_content','op_result','op_time'+union+select+id,account_name,account_type,op_ip,op_type,op_content,op_result,op_time+from+security_log)+b
     interval: 1
     unit: Days
     at: 00:28:00
     do: TaskDBBackupCSVGetBySQL    
   - name: Backup alarm log
-    uri: /api/rest/databaseManagement/v1/tenants_db/alarm_log
+    uri: /api/rest/databaseManagement/v1/omc_db/alarm_log
     params: SQL=select+*+into+outfile+'%s'+fields+terminated+by+','+escaped+by+''+optionally+enclosed+by+''+lines+terminated+by+'\n'+from+(select+'id','ne_type','ne_id','alarm_seq','alarm_id','alarm_code','alarm_status','event_time','log_time'+union+select+id,ne_type,ne_id,alarm_seq,alarm_id,alarm_code,alarm_status,event_time,log_time+from+alarm_log)+b
     interval: 1
     unit: Days
@@ -144,7 +144,7 @@ tasks:
     at: 
     do: TaskGenMeasureReportTimeoutAlarm    
   - name: Monitor proces list and write system log
-    uri: /api/rest/databaseManagement/v1/tenants_db/system_log
+    uri: /api/rest/databaseManagement/v1/omc_db/system_log
     params:
     body: 
     interval: 10

config/param/amf_param_config.yaml

@@ -80,6 +80,34 @@ amf:
         filter: "0~64"
         display: "PCF URI"
         comment: ""
+      - name: "backupAusfUri"
+        type: "string"
+        value: "http://172.16.5.131:8080"
+        access: "read-write"
+        filter: "0~64"
+        display: "Backup AUSF URI"
+        comment: ""
+      - name: "backupUdmUri"
+        type: "string"
+        value: "http://172.16.5.141:8080"
+        access: "read-write"
+        filter: "0~64"
+        display: "Backup UDM URI"
+        comment: ""
+      - name: "backupSmfUri"
+        type: "string"
+        value: "http://172.16.5.151:8080"
+        access: "read-write"
+        filter: "0~64"
+        display: "Backup SMF URI"
+        comment: ""
+      - name: "backupPcfUri"
+        type: "string"
+        value: "http://172.16.5.161:8080"
+        access: "read-write"
+        filter: "0~64"
+        display: "Backup PCF URI"
+        comment: ""
       - name: "lmfUri"
         type: "string"
         value: "http://172.16.5.200:8080"
@@ -471,4 +499,3 @@ amf:
         filter: '{"0":"false","1":"true"}'
         display: "statusReportEnabled"
         comment: ""
-

config/param/smf_param_config.yaml

@@ -72,14 +72,14 @@ smf:
         access: "read-write"
         filter: ""
         display: "PCF URI"
-        comment: ""
+        comment: "URI1;URI2"
       - name: "udmUri"
         type: "string"
         value: "http://172.16.5.140:8080"
         access: "read-write"
         filter: ""
         display: "UDM URI"
-        comment: ""
+        comment: "URI1;URI2"
       - name: "chfEnable"
         type: "bool"
         value: "false"

config/systemd/restagent.service

@@ -1,6 +1,6 @@
 [Unit]
 Description=OMC rest agent daemon
-After=network-online.target mysql.service
+After=network-online.target mysql.service kvdb.service
 
 [Service]
 Type=simple

crontask/etc/crontask.yaml

@@ -24,7 +24,7 @@ database:
   password: 1000omc@kp!
   host: 127.0.0.1
   port: 33066
-  name: tenants_db
+  name: omc_db
   connParam: charset=utf8mb4&collation=utf8mb4_general_ci&parseTime=True&interpolateParams=True
   backup: d:/omc.git/be.ems/restagent/database
 

crontask/etc/tasks.yaml

@@ -30,35 +30,35 @@ tasks:
     at: 00:00:00
     do: TaskCronUserLoginOMC
   - name: clear expired history alarm
-    uri: /api/rest/databaseManagement/v1/tenants_db/alarm
+    uri: /api/rest/databaseManagement/v1/omc_db/alarm
     params: WHERE=now()+>+ADDDATE(event_time,+interval+(SELECT+`value`+FROM+config+WHERE+config_tag='historyDuration')+day)+and+alarm_status='0'
     interval: 1
     unit: Days
     at: 00:10:00
     do: TaskDeleteExpiredRecord
   - name: clear expired history gold_kpi
-    uri: /api/rest/databaseManagement/v1/tenants_db/gold_kpi
+    uri: /api/rest/databaseManagement/v1/omc_db/gold_kpi
     params: WHERE=now()+>+ADDDATE(`date`,+interval+IFNULL((SELECT+`value`+FROM+config+WHERE+config_tag='goldKpiDuration'),7)+day)
     interval: 1
     unit: Days
     at: 00:11:00
     do: TaskDeleteExpiredRecord    
   - name: clear deleted custom pm kpi
-    uri: /api/rest/databaseManagement/v1/tenants_db/pm_custom_title
+    uri: /api/rest/databaseManagement/v1/omc_db/pm_custom_title
     params: WHERE=now()+>+ADDDATE(update_time,+interval+(SELECT+`value`+FROM+config+WHERE+config_tag='keepPMCKpi')+day)+and+status='Deleted'
     interval: 1
     unit: Days
     at: 00:15:00
     do: TaskDeleteExpiredRecord    
   - name: clear expired ne etc backup
-    uri: /api/rest/databaseManagement/v1/tenants_db/ne_backup
+    uri: /api/rest/databaseManagement/v1/omc_db/ne_backup
     params: WHERE=now()+>+ADDDATE(`create_time`,+interval+IFNULL((SELECT+`value`+FROM+config+WHERE+config_tag='BackUpSaveTime'),30)+day)
     interval: 1
     unit: Days
     at: 15:02:00
     do: TaskRemoveExpiredFile       
   - name: update expired user session
-    uri: /api/rest/databaseManagement/v1/tenants_db/session
+    uri: /api/rest/databaseManagement/v1/omc_db/session
     params: WHERE=NOW()+>+ADDDATE(shake_time,+interval+expires+second)+and+status='online'
     body: '{"session":{"status":"offline"}}'
     interval: 30
@@ -73,28 +73,28 @@ tasks:
     at: 00:50:00
     do: TaskDeleteExpiredRecord
   - name: Backup measure data
-    uri: /api/rest/databaseManagement/v1/tenants_db/measure_data
+    uri: /api/rest/databaseManagement/v1/omc_db/measure_data
     params: SQL=select+*+into+outfile+'%s'+fields+terminated+by+','+escaped+by+''+optionally+enclosed+by+''+lines+terminated+by+'\n'+from+(select+'id','date','task_id','ne_name','rm_uid','ne_type','granul_option','kpi_code','kpi_id','kpi_ext','start_time','end_time','value','timestamp'+union+select+id,date,task_id,ne_name,rm_uid,ne_type,granul_option,kpi_code,kpi_id,kpi_ext,start_time,end_time,value,timestamp+from+measure_data)+b
     interval: 1
     unit: Days
     at: 00:20:00
     do: TaskDBBackupCSVGetBySQL    
   - name: Backup operation log
-    uri: /api/rest/databaseManagement/v1/tenants_db/operation_log
+    uri: /api/rest/databaseManagement/v1/omc_db/operation_log
     params: SQL=select+*+into+outfile+'%s'+fields+terminated+by+','+escaped+by+''+optionally+enclosed+by+''+lines+terminated+by+'\n'+from+(select+'op_id','account_name','op_ip','subsys_tag','op_type','op_content','op_result','begin_time','end_time','vnf_flag','log_time'+union+select+op_id,account_name,op_ip,subsys_tag,op_type,op_content,op_result,begin_time,end_time,vnf_flag,log_time+from+operation_log)+b
     interval: 1
     unit: Days
     at: 00:26:00
     do: TaskDBBackupCSVGetBySQL    
   - name: Backup security log
-    uri: /api/rest/databaseManagement/v1/tenants_db/security_log
+    uri: /api/rest/databaseManagement/v1/omc_db/security_log
     params: SQL=select+*+into+outfile+'%s'+fields+terminated+by+','+escaped+by+''+optionally+enclosed+by+''+lines+terminated+by+'\n'+from+(select+'id','account_name','account_type','op_ip','op_type','op_content','op_result','op_time'+union+select+id,account_name,account_type,op_ip,op_type,op_content,op_result,op_time+from+security_log)+b
     interval: 1
     unit: Days
     at: 00:28:00
     do: TaskDBBackupCSVGetBySQL        
   - name: Backup alarm log
-    uri: /api/rest/databaseManagement/v1/tenants_db/alarm_log
+    uri: /api/rest/databaseManagement/v1/omc_db/alarm_log
     params: SQL=select+*+into+outfile+'%s'+fields+terminated+by+','+escaped+by+''+optionally+enclosed+by+''+lines+terminated+by+'\n'+from+(select+'id','ne_type','ne_id','alarm_seq','alarm_id','alarm_code','alarm_status','event_time','log_time'+union+select+id,ne_type,ne_id,alarm_seq,alarm_id,alarm_code,alarm_status,event_time,log_time+from+alarm_log)+b
     interval: 1
     unit: Days
@@ -155,7 +155,7 @@ tasks:
     at: 
     do: TaskGenMeasureReportTimeoutAlarm    
   - name: Monitor proces list and write system log
-    uri: /api/rest/databaseManagement/v1/tenants_db/system_log
+    uri: /api/rest/databaseManagement/v1/omc_db/system_log
     params:
     body: 
     interval: 5

crontask/makefile

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

data2html/makefile

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

database/common/mml_http_map.sql

@@ -5,7 +5,7 @@
  Source Server Type    : MariaDB
  Source Server Version : 100338 (10.3.38-MariaDB)
  Source Host           : localhost:33066
- Source Schema         : tenants_db
+ Source Schema         : omc_db
 
  Target Server Type    : MariaDB
  Target Server Version : 100338 (10.3.38-MariaDB)

database/install/cdr_event.sql

@@ -1,38 +1,47 @@
-/*
+-- MariaDB dump 10.19  Distrib 10.6.16-MariaDB, for debian-linux-gnu (x86_64)
- Navicat Premium Data Transfer
+--
+-- Host: 192.168.2.219    Database: omc_db
+-- ------------------------------------------------------
+-- Server version	10.3.38-MariaDB
 
- Source Server         : local_mariadb
+/*!40101 SET @OLD_CHARACTER_SET_CLIENT=@@CHARACTER_SET_CLIENT */;
- Source Server Type    : MariaDB
+/*!40101 SET @OLD_CHARACTER_SET_RESULTS=@@CHARACTER_SET_RESULTS */;
- Source Server Version : 100338 (10.3.38-MariaDB)
+/*!40101 SET @OLD_COLLATION_CONNECTION=@@COLLATION_CONNECTION */;
- Source Host           : localhost:33066
+/*!40101 SET NAMES utf8mb4 */;
- Source Schema         : tenants_db
+/*!40103 SET @OLD_TIME_ZONE=@@TIME_ZONE */;
+/*!40103 SET TIME_ZONE='+00:00' */;
+/*!40014 SET @OLD_UNIQUE_CHECKS=@@UNIQUE_CHECKS, UNIQUE_CHECKS=0 */;
+/*!40014 SET @OLD_FOREIGN_KEY_CHECKS=@@FOREIGN_KEY_CHECKS, FOREIGN_KEY_CHECKS=0 */;
+/*!40101 SET @OLD_SQL_MODE=@@SQL_MODE, SQL_MODE='NO_AUTO_VALUE_ON_ZERO' */;
+/*!40111 SET @OLD_SQL_NOTES=@@SQL_NOTES, SQL_NOTES=0 */;
 
- Target Server Type    : MariaDB
+--
- Target Server Version : 100338 (10.3.38-MariaDB)
+-- Table structure for table `cdr_event`
- File Encoding         : 65001
+--
 
- Date: 04/07/2024 10:28:34
-*/
-
-SET NAMES utf8mb4;
-SET FOREIGN_KEY_CHECKS = 0;
-
--- ----------------------------
--- Table structure for cdr_event
--- ----------------------------
 DROP TABLE IF EXISTS `cdr_event`;
+/*!40101 SET @saved_cs_client     = @@character_set_client */;
+/*!40101 SET character_set_client = utf8 */;
 CREATE TABLE `cdr_event` (
-  `id` int(11) UNSIGNED ZEROFILL NOT NULL AUTO_INCREMENT,
+  `id` int(11) NOT NULL AUTO_INCREMENT,
-  `ne_type` varchar(32) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL,
+  `ne_type` varchar(32) DEFAULT NULL,
-  `ne_name` varchar(64) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL,
+  `ne_name` varchar(64) DEFAULT NULL,
-  `rm_uid` varchar(32) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL,
+  `rm_uid` varchar(32) DEFAULT NULL,
-  `timestamp` int(11) NULL DEFAULT NULL,
+  `timestamp` int(11) DEFAULT NULL,
-  `cdr_json` text CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL,
+  `cdr_json` longtext DEFAULT NULL,
-  `created_at` datetime NULL DEFAULT current_timestamp(),
+  `created_at` datetime DEFAULT current_timestamp(),
-  `tenant_id` varchar(32) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL,
   PRIMARY KEY (`id`) USING BTREE,
-  INDEX `id`(`id`) USING BTREE,
+  KEY `id` (`id`) USING BTREE
-  INDEX `idx_type_timestamp`(`ne_type`, `timestamp`, `tenant_id`) USING BTREE
+) ENGINE=InnoDB AUTO_INCREMENT=7 DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_general_ci ROW_FORMAT=DYNAMIC;
-) ENGINE = InnoDB AUTO_INCREMENT = 7 CHARACTER SET = utf8mb4 COLLATE = utf8mb4_general_ci ROW_FORMAT = Dynamic;
+/*!40101 SET character_set_client = @saved_cs_client */;
+/*!40103 SET TIME_ZONE=@OLD_TIME_ZONE */;
 
-SET FOREIGN_KEY_CHECKS = 1;
+/*!40101 SET SQL_MODE=@OLD_SQL_MODE */;
+/*!40014 SET FOREIGN_KEY_CHECKS=@OLD_FOREIGN_KEY_CHECKS */;
+/*!40014 SET UNIQUE_CHECKS=@OLD_UNIQUE_CHECKS */;
+/*!40101 SET CHARACTER_SET_CLIENT=@OLD_CHARACTER_SET_CLIENT */;
+/*!40101 SET CHARACTER_SET_RESULTS=@OLD_CHARACTER_SET_RESULTS */;
+/*!40101 SET COLLATION_CONNECTION=@OLD_COLLATION_CONNECTION */;
+/*!40111 SET SQL_NOTES=@OLD_SQL_NOTES */;
+
+-- Dump completed on 2024-03-06 17:26:59

database/install/cdr_event_ims.sql

@@ -5,13 +5,13 @@
  Source Server Type    : MariaDB
  Source Server Version : 100338 (10.3.38-MariaDB)
  Source Host           : localhost:33066
- Source Schema         : tenants_db
+ Source Schema         : omc_db
 
  Target Server Type    : MariaDB
  Target Server Version : 100338 (10.3.38-MariaDB)
  File Encoding         : 65001
 
- Date: 04/07/2024 10:28:43
+ Date: 28/05/2024 10:19:12
 */
 
 SET NAMES utf8mb4;
@@ -22,17 +22,16 @@ SET FOREIGN_KEY_CHECKS = 0;
 -- ----------------------------
 DROP TABLE IF EXISTS `cdr_event_ims`;
 CREATE TABLE `cdr_event_ims` (
-  `id` int(11) NOT NULL AUTO_INCREMENT,
+  `id` int NOT NULL AUTO_INCREMENT,
-  `ne_type` varchar(32) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL,
+  `ne_type` varchar(32) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci DEFAULT NULL,
-  `ne_name` varchar(64) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL,
+  `ne_name` varchar(64) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci DEFAULT NULL,
-  `rm_uid` varchar(32) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL,
+  `rm_uid` varchar(32) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci DEFAULT NULL,
-  `timestamp` int(11) NULL DEFAULT NULL,
+  `timestamp` int DEFAULT NULL,
-  `cdr_json` longtext CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL,
+  `cdr_json` longtext CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci,
-  `created_at` datetime NULL DEFAULT current_timestamp(),
+  `created_at` datetime DEFAULT CURRENT_TIMESTAMP,
-  `tenant_id` varchar(32) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL,
   PRIMARY KEY (`id`) USING BTREE,
-  INDEX `id`(`id`) USING BTREE,
+  KEY `id` (`id`) USING BTREE,
-  INDEX `idx_type_timestamp`(`ne_type`, `timestamp`, `tenant_id`) USING BTREE
+  KEY `idx_type_timestamp` (`ne_type`,`timestamp`) USING BTREE
-) ENGINE = InnoDB AUTO_INCREMENT = 8 CHARACTER SET = utf8mb4 COLLATE = utf8mb4_general_ci ROW_FORMAT = Dynamic;
+) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_general_ci;
 
 SET FOREIGN_KEY_CHECKS = 1;

database/install/cdr_event_smf.sql

@@ -5,13 +5,13 @@
  Source Server Type    : MariaDB
  Source Server Version : 100338 (10.3.38-MariaDB)
  Source Host           : localhost:33066
- Source Schema         : tenants_db
+ Source Schema         : omc_db
 
  Target Server Type    : MariaDB
  Target Server Version : 100338 (10.3.38-MariaDB)
  File Encoding         : 65001
 
- Date: 04/07/2024 10:29:05
+ Date: 28/05/2024 10:19:23
 */
 
 SET NAMES utf8mb4;
@@ -22,17 +22,16 @@ SET FOREIGN_KEY_CHECKS = 0;
 -- ----------------------------
 DROP TABLE IF EXISTS `cdr_event_smf`;
 CREATE TABLE `cdr_event_smf` (
-  `id` int(11) NOT NULL AUTO_INCREMENT,
+  `id` int NOT NULL AUTO_INCREMENT,
-  `ne_type` varchar(32) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL,
+  `ne_type` varchar(32) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci DEFAULT NULL,
-  `ne_name` varchar(64) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL,
+  `ne_name` varchar(64) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci DEFAULT NULL,
-  `rm_uid` varchar(32) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL,
+  `rm_uid` varchar(32) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci DEFAULT NULL,
-  `timestamp` int(11) NULL DEFAULT NULL,
+  `timestamp` int DEFAULT NULL,
-  `cdr_json` longtext CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL,
+  `cdr_json` longtext CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci,
-  `created_at` datetime NULL DEFAULT current_timestamp(),
+  `created_at` datetime DEFAULT CURRENT_TIMESTAMP,
-  `tenant_id` varchar(32) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL,
   PRIMARY KEY (`id`) USING BTREE,
-  INDEX `id`(`id`) USING BTREE,
+  KEY `id` (`id`) USING BTREE,
-  INDEX `idx_type_timestamp`(`ne_type`, `timestamp`, `tenant_id`) USING BTREE
+  KEY `idx_type_timestamp` (`ne_type`,`timestamp`) USING BTREE
-) ENGINE = InnoDB AUTO_INCREMENT = 13 CHARACTER SET = utf8mb4 COLLATE = utf8mb4_general_ci ROW_FORMAT = Dynamic;
+) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_general_ci;
 
 SET FOREIGN_KEY_CHECKS = 1;

database/install/cdr_event_smsc.sql

@@ -29,10 +29,9 @@ CREATE TABLE `cdr_event_smsc` (
   `timestamp` int DEFAULT NULL,
   `cdr_json` longtext CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci,
   `created_at` datetime DEFAULT CURRENT_TIMESTAMP,
-  `tenant_id` varchar(32) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL,  
   PRIMARY KEY (`id`) USING BTREE,
-  INDEX `id`(`id`) USING BTREE,
+  KEY `id` (`id`) USING BTREE,
-  INDEX `idx_type_timestamp`(`ne_type`, `timestamp`, `tenant_id`) USING BTREE
+  KEY `idx_type_timestamp` (`ne_type`,`timestamp`) USING BTREE
-) ENGINE = InnoDB AUTO_INCREMENT = 13 CHARACTER SET = utf8mb4 COLLATE = utf8mb4_general_ci ROW_FORMAT = Dynamic;
+) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_general_ci;
 
 SET FOREIGN_KEY_CHECKS = 1;

database/install/kpi_report.sql

@@ -1,17 +1,17 @@
 /*
  Navicat Premium Data Transfer
 
- Source Server         : local_mariadb
+ Source Server         : root@192.168.2.166
  Source Server Type    : MariaDB
- Source Server Version : 100338 (10.3.38-MariaDB)
+ Source Server Version : 100616 (10.6.16-MariaDB-0ubuntu0.22.04.1)
- Source Host           : localhost:33066
+ Source Host           : 192.168.2.166:33066
- Source Schema         : tenants_db
+ Source Schema         : omc_db
 
  Target Server Type    : MariaDB
- Target Server Version : 100338 (10.3.38-MariaDB)
+ Target Server Version : 100616 (10.6.16-MariaDB-0ubuntu0.22.04.1)
  File Encoding         : 65001
 
- Date: 25/06/2024 11:42:32
+ Date: 26/04/2024 17:20:10
 */
 
 SET NAMES utf8mb4;
@@ -33,7 +33,6 @@ CREATE TABLE `kpi_report`  (
   `granularity` tinyint(4) NULL DEFAULT 60 COMMENT 'Time granualarity: 5/10/.../60/300 (second)',
   `kpi_values` text CHARACTER SET utf8mb4 COLLATE utf8mb4_bin NULL DEFAULT NULL,
   `created_at` bigint(20) NULL DEFAULT NULL,
-  `tenant_id` varchar(32) NULL DEFAULT NULL,
   PRIMARY KEY (`id`) USING BTREE,
   INDEX `idx_timestamp`(`created_at`) USING BTREE,
   INDEX `idx_uid_datetime`(`rm_uid`, `date`, `start_time`) USING BTREE

database/install/sys_dict_data0.sql

@@ -169,16 +169,4 @@ INSERT INTO `sys_dict_data` VALUES (141, 22, 'dictData.cdr_cause_code.42', '42',
 INSERT INTO `sys_dict_data` VALUES (142, 23, 'dictData.cdr_cause_code.47', '47', 'cdr_cause_code', '', '', '1', 'supervisor', 1712720201349, '', 0, '');
 INSERT INTO `sys_dict_data` VALUES (143, 30, 'dictData.cdr_cause_code.50', '50', 'cdr_cause_code', '', '', '1', 'supervisor', 1712720201349, '', 0, '');
 
--- 多租户
-INSERT INTO `sys_dict_data` VALUES (10000, 10000, 'dictData.tenancy.imsi', 'IMSI', 'tenancy_type', NULL, NULL, '1', 'supervisor', 1699350000000, NULL, 0, NULL);
-INSERT INTO `sys_dict_data` VALUES (10001, 10000, 'dictData.tenancy.apn', 'APN', 'tenancy_type', NULL, NULL, '0', 'supervisor', 1699350000000, NULL, 0, NULL);
-INSERT INTO `sys_dict_data` VALUES (10002, 10000, 'dictData.tenancy.slice', 'SLICE', 'tenancy_type', NULL, NULL, '0', 'supervisor', 1699350000000, NULL, 0, NULL);
-INSERT INTO `sys_dict_data` VALUES (10003, 10000, 'dictData.tenancy.ne', 'UPF', 'tenancy_type', NULL, NULL, '1', 'supervisor', 1699350000000, NULL, 0, NULL);
-INSERT INTO `sys_dict_data` VALUES (10004, 10000, 'dictData.tenancy.radio', 'RADIO', 'tenancy_type', NULL, NULL, '1', 'supervisor', 1699350000000, NULL, 0, NULL);
-INSERT INTO `sys_dict_data` VALUES (10005, 10000, 'dictData.match.exact', 'ExactMatch', 'match_type', NULL, NULL, '1', 'supervisor', 1699350000000, NULL, 0, NULL);
-INSERT INTO `sys_dict_data` VALUES (10006, 10000, 'dictData.match.fuzzy', 'FuzzyMatch', 'match_type', NULL, NULL, '1', 'supervisor', 1699350000000, NULL, 0, NULL);
-INSERT INTO `sys_dict_data` VALUES (10007, 10000, 'dictData.match.prefix', 'PrefixMatch', 'match_type', NULL, NULL, '1', 'supervisor', 1699350000000, NULL, 0, NULL);
-INSERT INTO `sys_dict_data` VALUES (10008, 10000, 'dictData.match.suffix', 'SuffixMatch', 'match_type', NULL, NULL, '1', 'supervisor', 1699350000000, NULL, 0, NULL);
-
-
 SET FOREIGN_KEY_CHECKS = 1;

database/install/sys_dict_data1_i18n_zh.sql

@@ -657,7 +657,7 @@ INSERT INTO `sys_dict_data` VALUES (2146, 2146, 'menu.dashboard.smscCDR', '短
 INSERT INTO `sys_dict_data` VALUES (2147, 2147, 'log.operate.title.smscCDR', '短信话单', 'i18n_zh', '', '', '1', 'supervisor', 1705550000000, '', 0, '');
 INSERT INTO `sys_dict_data` VALUES (2148, 2148, 'menu.trace.pcapFile', '信令抓包文件', 'i18n_zh', '', '', '1', 'supervisor', 1705550000000, '', 0, '');
 INSERT INTO `sys_dict_data` VALUES (2149, 2149, 'menu.trace.taskAnalyze', '跟踪数据分析', 'i18n_zh', '', '', '1', 'supervisor', 1705550000000, '', 0, '');
--- INSERT INTO `sys_dict_data` VALUES (2150, 2150, 'dictData.udm_sub_cn_type.3', '5G&4G', 'i18n_zh', '', '', '1', 'supervisor', 1705550000000, '', 0, '');
+INSERT INTO `sys_dict_data` VALUES (2150, 2150, 'job.ne_data_udm', '网元数据-UDM数据刷新同步', 'i18n_zh', '', '', '1', 'supervisor', 1730173767412, '', 0, '');
 INSERT INTO `sys_dict_data` VALUES (2151, 2151, 'menu.system.setting.doc', '系统使用文档', 'i18n_zh', '', '', '1', 'supervisor', 1705550000000, '', 0, '');
 INSERT INTO `sys_dict_data` VALUES (2152, 2152, 'menu.system.setting.official', '官网链接', 'i18n_zh', '', '', '1', 'supervisor', 1705550000000, '', 0, '');
 INSERT INTO `sys_dict_data` VALUES (2153, 2153, 'menu.system.setting.lock', '锁屏操作', 'i18n_zh', '', '', '1', 'supervisor', 1705550000000, '', 0, '');
@@ -696,49 +696,4 @@ INSERT INTO `sys_dict_data` VALUES (2185, 2185, 'config.sys.homePageRemark', '
 INSERT INTO `sys_dict_data` VALUES (2186, 2186, 'menu.config.neOverview', '网元概览', 'i18n_zh', '', '', '1', 'supervisor', 1721902269805, '', 0, '');
 INSERT INTO `sys_dict_data` VALUES (2187, 2187, 'menu.config.neOverviewRemark', '显示所有网元状态配置和license等概览信息', 'i18n_zh', '', '', '1', 'supervisor', 1721902269805, '', 0, '');
 
--- multi-tenancy
-INSERT INTO `sys_dict_data` VALUES (11000, 11000, 'menu.security.tenant', '租户管理', 'i18n_zh', NULL, NULL, '1', 'supervisor', 1700000000000, NULL, 0, NULL);
-INSERT INTO `sys_dict_data` VALUES (11001, 11000, 'menu.security.tenantRemark', '租户管理菜单', 'i18n_zh', NULL, NULL, '1', 'supervisor', 1700000000000, NULL, 0, NULL);
-INSERT INTO `sys_dict_data` VALUES (11002, 11000, 'menu.common.batchadd', '批量增加', 'i18n_zh', NULL, NULL, '1', 'supervisor', 1700000000000, NULL, 0, NULL);
-INSERT INTO `sys_dict_data` VALUES (11003, 11000, 'menu.common.checkdel', '勾选删除', 'i18n_zh', NULL, NULL, '1', 'supervisor', 1700000000000, NULL, 0, NULL);
-INSERT INTO `sys_dict_data` VALUES (11004, 11000, 'menu.common.loaddata', '加载数据', 'i18n_zh', NULL, NULL, '1', 'supervisor', 1700000000000, NULL, 0, NULL);
-INSERT INTO `sys_dict_data` VALUES (11005, 11000, 'menu.common.export', '导出', 'i18n_zh', NULL, NULL, '1', 'supervisor', 1700000000000, NULL, 0, NULL);
-INSERT INTO `sys_dict_data` VALUES (11006, 11000, 'menu.common.checkexport', '勾选导出', 'i18n_zh', NULL, NULL, '1', 'supervisor', 1700000000000, NULL, 0, NULL);
-INSERT INTO `sys_dict_data` VALUES (11007, 11000, 'menu.common.batchdel', '批量删除', 'i18n_zh', NULL, NULL, '1', 'supervisor', 1700000000000, NULL, 0, NULL);
-INSERT INTO `sys_dict_data` VALUES (11008, 11000, 'menu.common.overview', '概览', 'i18n_zh', NULL, NULL, '1', 'supervisor', 1700000000000, NULL, 0, NULL);
-INSERT INTO `sys_dict_data` VALUES (11009, 11000, 'dictData.tenancy.imsi', 'SIM卡', 'i18n_zh', NULL, NULL, '1', 'supervisor', 1700000000000, NULL, 0, NULL);
-INSERT INTO `sys_dict_data` VALUES (11010, 11000, 'dictData.tenancy.apn', '接入点', 'i18n_zh', NULL, NULL, '1', 'supervisor', 1700000000000, NULL, 0, NULL);
-INSERT INTO `sys_dict_data` VALUES (11011, 11000, 'dictData.tenancy.slice', '网络切片', 'i18n_zh', NULL, NULL, '1', 'supervisor', 1700000000000, NULL, 0, NULL);
-INSERT INTO `sys_dict_data` VALUES (11012, 11000, 'dictData.tenancy.ne', 'UPF', 'i18n_zh', NULL, NULL, '1', 'supervisor', 1700000000000, NULL, 0, NULL);
-INSERT INTO `sys_dict_data` VALUES (11013, 11000, 'dictData.tenancy.radio', '无线基站', 'i18n_zh', NULL, NULL, '1', 'supervisor', 1700000000000, NULL, 0, NULL);
-INSERT INTO `sys_dict_data` VALUES (11014, 11000, 'role.tenant', '租户', 'i18n_zh', NULL, NULL, '1', 'supervisor', 1700000000000, NULL, 0, NULL);
-INSERT INTO `sys_dict_data` VALUES (11015, 11000, 'log.operate.title.sysTenant', '租户管理', 'i18n_zh', NULL, NULL, '1', 'supervisor', 1700000000000, NULL, 0, NULL);
-INSERT INTO `sys_dict_data` VALUES (11016, 11000, 'menu.tenant.overview', '概览', 'i18n_zh', NULL, NULL, '1', 'supervisor', 1700000000000, NULL, 0, NULL);
-INSERT INTO `sys_dict_data` VALUES (11017, 11000, 'menu.tenant.subscriber', '签约用户', 'i18n_zh', NULL, NULL, '1', 'supervisor', 1700000000000, NULL, 0, NULL);
-INSERT INTO `sys_dict_data` VALUES (11018, 11000, 'menu.tenant.onlineUE', '在线数据会话', 'i18n_zh', NULL, NULL, '1', 'supervisor', 1700000000000, NULL, 0, NULL);
-INSERT INTO `sys_dict_data` VALUES (11019, 11000, 'menu.tenant.radio', '基站信息', 'i18n_zh', NULL, NULL, '1', 'supervisor', 1700000000000, NULL, 0, NULL);
-INSERT INTO `sys_dict_data` VALUES (11020, 11000, 'menu.tenant.imsCDR', '语音话单', 'i18n_zh', NULL, NULL, '1', 'supervisor', 1700000000000, NULL, 0, NULL);
-INSERT INTO `sys_dict_data` VALUES (11021, 11000, 'menu.tenant.smfCDR', '数据话单', 'i18n_zh', NULL, NULL, '1', 'supervisor', 1700000000000, NULL, 0, NULL);
-INSERT INTO `sys_dict_data` VALUES (11022, 11000, 'menu.tenant.ueEvent', '终端事件', 'i18n_zh', NULL, NULL, '1', 'supervisor', 1700000000000, NULL, 0, NULL);
-INSERT INTO `sys_dict_data` VALUES (11023, 11000, 'menu.tenant.amfUE', '5G终端事件', 'i18n_zh', NULL, NULL, '1', 'supervisor', 1700000000000, NULL, 0, NULL);
-INSERT INTO `sys_dict_data` VALUES (11024, 11000, 'menu.tenant.mmeUE', '4G终端事件', 'i18n_zh', NULL, NULL, '1', 'supervisor', 1700000000000, NULL, 0, NULL);
-INSERT INTO `sys_dict_data` VALUES (11025, 11000, 'menu.tenant.log', '操作日志', 'i18n_zh', NULL, NULL, '1', 'supervisor', 1700000000000, NULL, 0, NULL);
-INSERT INTO `sys_dict_data` VALUES (11026, 11000, 'dictData.match.exact', '精确匹配', 'i18n_zh', NULL, NULL, '1', 'supervisor', 1700000000000, NULL, 0, NULL);
-INSERT INTO `sys_dict_data` VALUES (11027, 11000, 'dictData.match.fuzzy', '模糊匹配', 'i18n_zh', NULL, NULL, '1', 'supervisor', 1700000000000, NULL, 0, NULL);
-INSERT INTO `sys_dict_data` VALUES (11028, 11000, 'dictData.match.prefix', '前缀匹配', 'i18n_zh', NULL, NULL, '1', 'supervisor', 1700000000000, NULL, 0, NULL);
-INSERT INTO `sys_dict_data` VALUES (11029, 11000, 'dictData.match.suffix', '后缀匹配', 'i18n_zh', NULL, NULL, '1', 'supervisor', 1700000000000, NULL, 0, NULL);
-INSERT INTO `sys_dict_data` VALUES (11030, 11000, 'menu.tenant.cdr', '话单', 'i18n_zh', NULL, NULL, '1', 'supervisor', 1700000000000, NULL, 0, NULL);
-INSERT INTO `sys_dict_data` VALUES (11031, 11000, 'menu.tenant.onlineIMS', '在线语音会话', 'i18n_zh', NULL, NULL, '1', 'supervisor', 1700000000000, NULL, 0, NULL);
-INSERT INTO `sys_dict_data` VALUES (11032, 11000, 'tenant.noData', '没有可访问的租户数据！', 'i18n_zh', NULL, NULL, '1', 'supervisor', 1700000000000, NULL, 0, NULL);
-INSERT INTO `sys_dict_data` VALUES (11033, 11000, 'tenant.errParentDelFlag', '上级租户【{name}】已删除，不允许新增', 'i18n_zh', NULL, NULL, '1', 'supervisor', 1700000000000, NULL, 0, NULL);
-INSERT INTO `sys_dict_data` VALUES (11034, 11000, 'tenant.errParentStatus', '上级租户【{name}】停用，不允许新增', 'i18n_zh', NULL, NULL, '1', 'supervisor', 1700000000000, NULL, 0, NULL);
-INSERT INTO `sys_dict_data` VALUES (11035, 11000, 'tenant.errNameExists', '操作租户【{name}】失败，租户名称已存在', 'i18n_zh', NULL, NULL, '1', 'supervisor', 1700000000000, NULL, 0, NULL);
-INSERT INTO `sys_dict_data` VALUES (11036, 11000, 'tenant.errParentID', '操作租户【{name}】失败，上级租户不能是自己', 'i18n_zh', NULL, NULL, '1', 'supervisor', 1700000000000, NULL, 0, NULL);
-INSERT INTO `sys_dict_data` VALUES (11037, 11000, 'tenant.errHasChildUse', '操作失败，该租户包含未停用的租赁资产数量：{num}', 'i18n_zh', NULL, NULL, '1', 'supervisor', 1700000000000, NULL, 0, NULL);
-INSERT INTO `sys_dict_data` VALUES (11038, 11000, 'tenant.errHasUserUse', '不允许删除，租户已分配用户数：{num}', 'i18n_zh', NULL, NULL, '1', 'supervisor', 1700000000000, NULL, 0, NULL);
-INSERT INTO `sys_dict_data` VALUES (11039, 11000, 'tenant.errAssetExists', '租赁资产[{type}:{key}]与现有的资产有冲突', 'i18n_zh', NULL, NULL, '1', 'supervisor', 1700000000000, NULL, 0, NULL);
-INSERT INTO `sys_dict_data` VALUES (11040, 11000, 'menu.tenant.smscCDR', '短信话单', 'i18n_zh', NULL, NULL, '1', 'supervisor', 1700000000000, NULL, 0, NULL);
-INSERT INTO `sys_dict_data` VALUES (11041, 11000, 'log.operate.export.tenantName', '租户名称', 'i18n_zh', NULL, NULL, '1', 'supervisor', 1700000000000, NULL, 0, NULL);
-INSERT INTO `sys_dict_data` VALUES (11042, 11000, 'menu.tenant.session', '会话', 'i18n_zh', NULL, NULL, '1', 'supervisor', 1700000000000, NULL, 0, NULL);
-
 SET FOREIGN_KEY_CHECKS = 1;

database/install/sys_dict_data2_i18n_en.sql

@@ -657,7 +657,7 @@ INSERT INTO `sys_dict_data` VALUES (4146, 4146, 'menu.dashboard.smscCDR', 'SMS C
 INSERT INTO `sys_dict_data` VALUES (4147, 4147, 'log.operate.title.smscCDR', 'SMS CDR', 'i18n_en', '', '', '1', 'supervisor', 1705550000000, '', 0, '');
 INSERT INTO `sys_dict_data` VALUES (4148, 4148, 'menu.trace.pcapFile', 'Signaling Capture File', 'i18n_en', '', '', '1', 'supervisor', 1718441035866, '', 0, '');
 INSERT INTO `sys_dict_data` VALUES (4149, 4149, 'menu.trace.taskAnalyze', 'Tracking Data Analysis', 'i18n_en', '', '', '1', 'supervisor', 1718441035866, '', 0, '');
--- INSERT INTO `sys_dict_data` VALUES (4150, 4150, 'dictData.udm_sub_cn_type.3', '5G&4G', 'i18n_en', '', '', '1', 'supervisor', 1718441035866, '', 0, '');
+INSERT INTO `sys_dict_data` VALUES (4150, 4150, 'job.ne_data_udm', 'NE Data Sync UDM', 'i18n_en', '', '', '1', 'supervisor', 1730173767412, '', 0, '');
 INSERT INTO `sys_dict_data` VALUES (4151, 4151, 'menu.system.setting.doc', 'System User Documentation', 'i18n_en', '', '', '1', 'supervisor', 1705550000000, '', 0, '');
 INSERT INTO `sys_dict_data` VALUES (4152, 4152, 'menu.system.setting.official', 'Official Website', 'i18n_en', '', '', '1', 'supervisor', 1705550000000, '', 0, '');
 INSERT INTO `sys_dict_data` VALUES (4153, 4153, 'menu.system.setting.lock', 'Lockscreen Operation', 'i18n_en', '', '', '1', 'supervisor', 1705550000000, '', 0, '');
@@ -696,49 +696,4 @@ INSERT INTO `sys_dict_data` VALUES (4185, 4185, 'config.sys.homePageRemark', 'Se
 INSERT INTO `sys_dict_data` VALUES (4186, 4186, 'menu.config.neOverview', 'NE Overview', 'i18n_en', '', '', '1', 'supervisor', 1721902269805, '', 0, '');
 INSERT INTO `sys_dict_data` VALUES (4187, 4187, 'menu.config.neOverviewRemark', 'Displays overview information such as status, configuration and license of all network elements', 'i18n_en', '', '', '1', 'supervisor', 1721902269805, '', 0, '');
 
--- 多租户
-INSERT INTO `sys_dict_data` VALUES (14000, 14000, 'menu.security.tenant', 'Tenant Management', 'i18n_en', '', '', '1', 'supervisor', 1705550000000, '', 0, '');
-INSERT INTO `sys_dict_data` VALUES (14001, 14000, 'menu.security.tenantRemark', 'Tenant Management Menu', 'i18n_en', '', '', '1', 'supervisor', 1705550000000, '', 0, '');
-INSERT INTO `sys_dict_data` VALUES (14002, 14000, 'menu.common.batchadd', 'Batch Add', 'i18n_en', NULL, NULL, '1', 'supervisor', 1700000000000, NULL, 0, NULL);
-INSERT INTO `sys_dict_data` VALUES (14003, 14000, 'menu.common.checkdel', 'Check Delete', 'i18n_en', NULL, NULL, '1', 'supervisor', 1700000000000, NULL, 0, NULL);
-INSERT INTO `sys_dict_data` VALUES (14004, 14000, 'menu.common.loaddata', 'Load Data', 'i18n_en', NULL, NULL, '1', 'supervisor', 1700000000000, NULL, 0, NULL);
-INSERT INTO `sys_dict_data` VALUES (14005, 14000, 'menu.common.export', 'Export', 'i18n_en', NULL, NULL, '1', 'supervisor', 1700000000000, NULL, 0, NULL);
-INSERT INTO `sys_dict_data` VALUES (14006, 14000, 'menu.common.checkexport', 'Check Export', 'i18n_en', NULL, NULL, '1', 'supervisor', 1700000000000, NULL, 0, NULL);
-INSERT INTO `sys_dict_data` VALUES (14007, 14000, 'menu.common.batchdel', 'Batch Delete', 'i18n_en', NULL, NULL, '1', 'supervisor', 1700000000000, NULL, 0, NULL);
-INSERT INTO `sys_dict_data` VALUES (14008, 14000, 'menu.common.overview', 'Overview', 'i18n_en', NULL, NULL, '1', 'supervisor', 1700000000000, NULL, 0, NULL);
-INSERT INTO `sys_dict_data` VALUES (14009, 14000, 'dictData.tenancy.imsi', 'SIM Card', 'i18n_en', NULL, NULL, '1', 'supervisor', 1700000000000, NULL, 0, NULL);
-INSERT INTO `sys_dict_data` VALUES (14010, 14000, 'dictData.tenancy.apn', 'Access Point Name', 'i18n_en', NULL, NULL, '1', 'supervisor', 1700000000000, NULL, 0, NULL);
-INSERT INTO `sys_dict_data` VALUES (14011, 14000, 'dictData.tenancy.slice', 'Network Slice', 'i18n_en', NULL, NULL, '1', 'supervisor', 1700000000000, NULL, 0, NULL);
-INSERT INTO `sys_dict_data` VALUES (14012, 14000, 'dictData.tenancy.ne', 'UPF', 'i18n_en', NULL, NULL, '1', 'supervisor', 1700000000000, NULL, 0, NULL);
-INSERT INTO `sys_dict_data` VALUES (14013, 14000, 'dictData.tenancy.radio', 'Radio', 'i18n_en', NULL, NULL, '1', 'supervisor', 1700000000000, NULL, 0, NULL);
-INSERT INTO `sys_dict_data` VALUES (14014, 14000, 'role.tenant', 'Tenants', 'i18n_en', NULL, NULL, '1', 'supervisor', 1700000000000, NULL, 0, NULL);
-INSERT INTO `sys_dict_data` VALUES (14015, 14000, 'log.operate.title.sysTenant', 'Tenant Management', 'i18n_en', NULL, NULL, '1', 'supervisor', 1700000000000, NULL, 0, NULL);
-INSERT INTO `sys_dict_data` VALUES (14016, 14000, 'menu.tenant.overview', 'Overview', 'i18n_en', NULL, NULL, '1', 'supervisor', 1700000000000, NULL, 0, NULL);
-INSERT INTO `sys_dict_data` VALUES (14017, 14000, 'menu.tenant.subscriber', 'Subscribers', 'i18n_en', NULL, NULL, '1', 'supervisor', 1700000000000, NULL, 0, NULL);
-INSERT INTO `sys_dict_data` VALUES (14018, 14000, 'menu.tenant.onlineUE', 'Online Data Sessions', 'i18n_en', NULL, NULL, '1', 'supervisor', 1700000000000, NULL, 0, NULL);
-INSERT INTO `sys_dict_data` VALUES (14019, 14000, 'menu.tenant.radio', 'Radio Information', 'i18n_en', NULL, NULL, '1', 'supervisor', 1700000000000, NULL, 0, NULL);
-INSERT INTO `sys_dict_data` VALUES (14020, 14000, 'menu.tenant.imsCDR', 'Voice CDR', 'i18n_en', NULL, NULL, '1', 'supervisor', 1700000000000, NULL, 0, NULL);
-INSERT INTO `sys_dict_data` VALUES (14021, 14000, 'menu.tenant.smfCDR', 'Data CDR', 'i18n_en', NULL, NULL, '1', 'supervisor', 1700000000000, NULL, 0, NULL);
-INSERT INTO `sys_dict_data` VALUES (14022, 14000, 'menu.tenant.ueEvent', 'UE Event', 'i18n_en', NULL, NULL, '1', 'supervisor', 1700000000000, NULL, 0, NULL);
-INSERT INTO `sys_dict_data` VALUES (14023, 14000, 'menu.tenant.amfUE', '5G UE Event', 'i18n_en', NULL, NULL, '1', 'supervisor', 1700000000000, NULL, 0, NULL);
-INSERT INTO `sys_dict_data` VALUES (14024, 14000, 'menu.tenant.mmeUE', '4G UE Event', 'i18n_en', NULL, NULL, '1', 'supervisor', 1700000000000, NULL, 0, NULL);
-INSERT INTO `sys_dict_data` VALUES (14025, 14000, 'menu.tenant.log', 'Operation Logs', 'i18n_en', NULL, NULL, '1', 'supervisor', 1700000000000, NULL, 0, NULL);
-INSERT INTO `sys_dict_data` VALUES (14026, 14000, 'dictData.match.exact', 'Exact Match', 'i18n_en', NULL, NULL, '1', 'supervisor', 1700000000000, NULL, 0, NULL);
-INSERT INTO `sys_dict_data` VALUES (14027, 14000, 'dictData.match.fuzzy', 'Fuzzy Match', 'i18n_en', NULL, NULL, '1', 'supervisor', 1700000000000, NULL, 0, NULL);
-INSERT INTO `sys_dict_data` VALUES (14028, 14000, 'dictData.match.prefix', 'Prefix Match', 'i18n_en', NULL, NULL, '1', 'supervisor', 1700000000000, NULL, 0, NULL);
-INSERT INTO `sys_dict_data` VALUES (14029, 14000, 'dictData.match.suffix', 'Suffix Match', 'i18n_en', NULL, NULL, '1', 'supervisor', 1700000000000, NULL, 0, NULL);
-INSERT INTO `sys_dict_data` VALUES (14030, 14000, 'menu.tenant.cdr', 'CDR', 'i18n_en', NULL, NULL, '1', 'supervisor', 1700000000000, NULL, 0, NULL);
-INSERT INTO `sys_dict_data` VALUES (14031, 14000, 'menu.tenant.onlineIMS', 'Online Voice Sessions', 'i18n_en', NULL, NULL, '1', 'supervisor', 1700000000000, NULL, 0, NULL);
-INSERT INTO `sys_dict_data` VALUES (14032, 14000, 'tenant.noData', 'There is no accessible tenant data', 'i18n_en', NULL, NULL, '1', 'supervisor', 1700000000000, NULL, 0, NULL);
-INSERT INTO `sys_dict_data` VALUES (14033, 14000, 'tenant.errParentDelFlag', 'The parent tenant [{name}] has been deleted and is not allowed to be added', 'i18n_en', NULL, NULL, '1', 'supervisor', 1700000000000, NULL, 0, NULL);
-INSERT INTO `sys_dict_data` VALUES (14034, 14000, 'tenant.errParentStatus', 'Parent tenant [{name}] is deactivated, additions are not allowed', 'i18n_en', NULL, NULL, '1', 'supervisor', 1700000000000, NULL, 0, NULL);
-INSERT INTO `sys_dict_data` VALUES (14035, 14000, 'tenant.errNameExists', 'Manipulate tenant [{name}] failed, tenant name already exists', 'i18n_en', NULL, NULL, '1', 'supervisor', 1700000000000, NULL, 0, NULL);
-INSERT INTO `sys_dict_data` VALUES (14036, 14000, 'tenant.errParentID', 'Failed to operate tenant [{name}], the parent tenant cannot be itself', 'i18n_en', NULL, NULL, '1', 'supervisor', 1700000000000, NULL, 0, NULL);
-INSERT INTO `sys_dict_data` VALUES (14037, 14000, 'tenant.errHasChildUse', 'Operation failed, the tenant contains active asset number: {num}', 'i18n_en', NULL, NULL, '1', 'supervisor', 1700000000000, NULL, 0, NULL);
-INSERT INTO `sys_dict_data` VALUES (14038, 14000, 'tenant.errHasUserUse', 'Deletion is not allowed, number of users the tenant has been assigned to: {num}', 'i18n_en', NULL, NULL, '1', 'supervisor', 1700000000000, NULL, 0, NULL);
-INSERT INTO `sys_dict_data` VALUES (14039, 14000, 'tenant.errAssetExists', 'There is a conflict between tenancy asset[{type}:{key}] and a existing asset', 'i18n_en', NULL, NULL, '1', 'supervisor', 1700000000000, NULL, 0, NULL);
-INSERT INTO `sys_dict_data` VALUES (14040, 14000, 'menu.tenant.smscCDR', 'SMS CDR', 'i18n_en', NULL, NULL, '1', 'supervisor', 1700000000000, NULL, 0, NULL);
-INSERT INTO `sys_dict_data` VALUES (14041, 14000, 'log.operate.export.tenantName', 'Tenant Name', 'i18n_en', NULL, NULL, '1', 'supervisor', 1700000000000, NULL, 0, NULL);
-INSERT INTO `sys_dict_data` VALUES (14042, 14000, 'menu.tenant.session', 'Session', 'i18n_en', NULL, NULL, '1', 'supervisor', 1700000000000, NULL, 0, NULL);
-
 SET FOREIGN_KEY_CHECKS = 1;

database/install/sys_dict_type.sql

@@ -57,10 +57,6 @@ INSERT INTO `sys_dict_type` VALUES (122, 'dictType.ne_info_status', 'ne_info_sta
 INSERT INTO `sys_dict_type` VALUES (123, 'dictType.ne_license_status', 'ne_license_status', '1', 'supervisor', 1702020000000, '', 0, '');
 INSERT INTO `sys_dict_type` VALUES (124, 'dictType.cdr_cause_code', 'cdr_cause_code', '1', 'supervisor', 1725877564156, '', 0, '');
 
--- Multi-tenancy
-INSERT INTO `sys_dict_type` VALUES (10000, 'dictType.tenancy_type', 'tenancy_type', '1', 'supervisor', 1702020000000, '', 0, '');
-INSERT INTO `sys_dict_type` VALUES (10001, 'dictType.match_type', 'match_type', '1', 'supervisor', 1702020000000, '', 0, '');
-
 UNLOCK TABLES;
 
 -- Dump completed on 2024-04-12 21:19:20

database/install/sys_job.sql

@@ -30,6 +30,7 @@ CREATE TABLE `sys_job` (
 -- ----------------------------
 INSERT INTO `sys_job` VALUES (1, 'job.monitor_sys_resource', 'SYSTEM', 'monitor_sys_resource', '{\"interval\":5}', '0 0/5 * * * ?', '3', '0', '1', '0', 'supervisor', 1698478134839, 'supervisor', 1700571615807, 'job.monitor_sys_resource_remark');
 INSERT INTO `sys_job` VALUES (2, 'job.ne_config_backup', 'SYSTEM', 'ne_config_backup', '', '0 30 0 * * ?', '3', '0', '1', '1', 'supervisor', 1698478134839, 'supervisor', 1700571615807, 'job.ne_config_backup_remark');
+INSERT INTO `sys_job` VALUES (3, 'job.ne_data_udm', 'SYSTEM', 'ne_data_udm', '', '0 0 0/2 * * ?', '3', '0', '1', '1', 'supervisor', 1730173767412, '', 0, '');
 INSERT INTO `sys_job` VALUES (4, 'job.delExpiredNeBackup', 'SYSTEM', 'delExpiredNeBackup', '{\"duration\":60}', '0 20 0 * * ?', '3', '0', '0', '1', 'supervisor', 1698478134840, NULL, 0, 'job.delExpiredNeBackupRemark');
 INSERT INTO `sys_job` VALUES (5, 'job.deleteExpiredAlarmRecord', 'SYSTEM', 'deleteExpiredRecord', '{\"duration\":90,\"tableName\":\"alarm\",\"colName\":\"event_time\",\"extras\":\"alarm_status=\'0\'\"}', '0 10 0 * * ?', '3', '0', '1', '1', 'supervisor', 1698478134841, NULL, 0, 'job.deleteExpiredAlarmRecordRemark');
 INSERT INTO `sys_job` VALUES (6, 'job.deleteExpiredKpiRecord', 'SYSTEM', 'deleteExpiredRecord', '{\"duration\":30,\"tableName\":\"gold_kpi\",\"colName\":\"date\"}', '0 15 0 * * ?', '3', '0', '1', '1', 'supervisor', 1698478134842, 'supervisor', 1700570673113, 'job.deleteExpiredKpiRecordRemark');
@@ -37,7 +38,7 @@ INSERT INTO `sys_job` VALUES (7, 'job.backupEtcFromNE', 'SYSTEM', 'backupEtcFrom
 INSERT INTO `sys_job` VALUES (8, 'job.deleteExpiredNeStateRecord', 'SYSTEM', 'deleteExpiredRecord', '{\"duration\":1,\"tableName\":\"ne_state\",\"colName\":\"timestamp\"}', '0 25 0 * * ?', '3', '0', '1', '1', 'supervisor', 1698478134842, 'admin', 1703668901929, 'job.deleteExpiredNeStateRecordRemark');
 INSERT INTO `sys_job` VALUES (9, 'job.getStateFromNE', 'SYSTEM', 'getStateFromNE', '', '0/10 * * * * ?', '3', '0', '0', '0', 'supervisor', 1698478134842, 'admin', 1713231120503, 'job.getStateFromNERemark');
 INSERT INTO `sys_job` VALUES (10, 'job.genNeStateAlarm', 'SYSTEM', 'genNeStateAlarm', '{\"alarmID\":\"HXEMSSM10000\",\"alarmCode\":10000,\"alarmTitle\":\"The system state is abnormal\",\"neType\":\"OMC\",\"alarmType\":\"EquipmentAlarm\",\"origSeverity\": \"Major\",\"objectName\":\"EMS;SystemManagement;Heartbeat\",\"objectType\":\"SystemState\",\"specificProblem\":\"Alarm cause: the system state of target NE has not been received for {threshold} seconds\", \"specificProblemID\":\"AC10000\",\"threshold\":30}', '0/5 * * * * ?', '3', '0', '0', '0', 'supervisor', 1698478134842, 'admin', 1713781643031, 'job.genNeStateAlarmRemark');
-INSERT INTO `sys_job` VALUES (11, 'job.exportOperateLog', 'SYSTEM', 'exportTable', '{\"duration\":1,\"tableName\":\"sys_log_operate\",\"timeCol\":\"oper_time\",\"timeUnit\":\"milli\",\"columns\":\"oper_id,omc_get_dict_value(title, \\\"i18n_en\\\") as title,business_type,method,request_method,operator_type,oper_name,dept_name,oper_url,oper_ip,oper_location,oper_param,oper_msg,status,oper_time,cost_time,tenant_id\",\"extras\":\"\",\"filePath\":\"/usr/local/omc/backup/operate_log\"}', '0 0 0/1 * * ?', '3', '0', '1', '1', 'supervisor', 1698478134842, 'admin', 1724833786290, 'job.exportOperateLog');
+INSERT INTO `sys_job` VALUES (11, 'job.exportOperateLog', 'SYSTEM', 'exportTable', '{\"duration\":1,\"tableName\":\"sys_log_operate\",\"timeCol\":\"oper_time\",\"timeUnit\":\"milli\",\"columns\":\"oper_id,omc_get_dict_value(title, \\\"i18n_en\\\") as title,business_type,method,request_method,operator_type,oper_name,dept_name,oper_url,oper_ip,oper_location,oper_param,oper_msg,status,oper_time,cost_time\",\"extras\":\"\",\"filePath\":\"/usr/local/omc/backup/operate_log\"}', '0 0 0/1 * * ?', '3', '0', '1', '1', 'supervisor', 1698478134842, 'admin', 1724833786290, 'job.exportOperateLog');
 INSERT INTO `sys_job` VALUES (12, 'job.exportIMSCDR', 'SYSTEM', 'exportTable', '{\"duration\":1,\"tableName\":\"cdr_event_ims\",\"columns\":\"id,JSON_UNQUOTE(JSON_EXTRACT(cdr_json,\'$.recordType\')) as record_type,JSON_UNQUOTE(JSON_EXTRACT(cdr_json,\'$.callType\')) as call_type,JSON_UNQUOTE(JSON_EXTRACT(cdr_json,\'$.callerParty\')) as caller_party,JSON_UNQUOTE(JSON_EXTRACT(cdr_json,\'$.calledParty\')) as called_party,JSON_UNQUOTE(JSON_EXTRACT(cdr_json,\'$.callDuration\')) as call_duration,JSON_UNQUOTE(JSON_EXTRACT(cdr_json,\'$.serviceResult\')) as service_result,DATE_FORMAT(FROM_UNIXTIME(timestamp), \'%Y-%m-%d %H:%i:%s\') AS timestamp\",\"timeCol\":\"timestamp\",\"timeUnit\":\"second\",\"extras\":\"\",\"filePath\":\"/usr/local/omc/backup/ims_cdr\"}', '0 0 0/1 * * ?', '3', '0', '1', '1', 'supervisor', 1698478134842, 'admin', 1722224659251, '');
 INSERT INTO `sys_job` VALUES (13, 'job.exportSMFCDR', 'SYSTEM', 'exportTable', '{\"duration\":1,\"tableName\":\"cdr_event_smf\",\"columns\":\"id,ne_type,ne_name,rm_uid,JSON_UNQUOTE(JSON_EXTRACT(cdr_json,\'$.recordType\')) AS record_type,JSON_UNQUOTE(JSON_EXTRACT(cdr_json,\'$.chargingID\')) AS charging_id,JSON_UNQUOTE(JSON_EXTRACT(cdr_json,\'$.subscriberIdentifier.subscriptionIDType\')) AS subscriber_id_type,JSON_UNQUOTE(JSON_EXTRACT(cdr_json,\'$.subscriberIdentifier.subscriptionIDData\')) AS subscriber_id_data,JSON_UNQUOTE(JSON_EXTRACT(cdr_json,\'$.duration\')) AS duration,JSON_UNQUOTE(JSON_EXTRACT(cdr_json,\'$.invocationTimestamp\')) as invocationTimestamp,JSON_UNQUOTE(JSON_EXTRACT(cdr_json,\'$.listOfMultipleUnitUsage[*].usedUnitContainer[*].dataVolumeUplink\')) AS data_volume_uplink,JSON_UNQUOTE(JSON_EXTRACT(cdr_json,\'$.listOfMultipleUnitUsage[*].usedUnitContainer[*].dataVolumeDownlink\')) AS data_volume_downlink,JSON_UNQUOTE(JSON_EXTRACT(cdr_json,\'$.listOfMultipleUnitUsage[*].usedUnitContainer[*].dataTotalVolume\')) AS data_total_volume,JSON_UNQUOTE(JSON_EXTRACT(cdr_json,\'$.pDUSessionChargingInformation.pDUAddress.pDUIPv4Address\')) AS pdu_ipv4_address,timestamp\",\"timeCol\":\"timestamp\",\"timeUnit\":\"second\",\"extras\":\"\",\"filePath\":\"/usr/local/omc/backup/smf_cdr\"}', '0 0 0/1 * * ?', '3', '0', '1', '1', 'supervisor', 1698478134842, 'admin', 1724309047797, '');
 INSERT INTO `sys_job` VALUES (14, 'job.exportSMSCCDR', 'SYSTEM', 'exportTable', '{\"duration\":1,\"tableName\":\"cdr_event_smsc\",\"columns\":\"id,JSON_UNQUOTE(JSON_EXTRACT(cdr_json,\'$.recordType\')) as record_type,JSON_UNQUOTE(JSON_EXTRACT(cdr_json,\'$.serviceType\')) as service_type,JSON_UNQUOTE(JSON_EXTRACT(cdr_json,\'$.callerParty\')) as caller_party,JSON_UNQUOTE(JSON_EXTRACT(cdr_json,\'$.calledParty\')) as called_party,JSON_UNQUOTE(JSON_EXTRACT(cdr_json,\'$.result\')) as result,DATE_FORMAT(FROM_UNIXTIME(JSON_UNQUOTE(JSON_EXTRACT(cdr_json,\'$.updateTime\'))), \'%Y-%m-%d %H:%i:%s\') as update_time\",\"timeCol\":\"timestamp\",\"timeUnit\":\"second\",\"extras\":\"\",\"filePath\":\"/usr/local/omc/backup/smsc_cdr\"}', '0 0 0/1 * * ?', '3', '0', '1', '1', 'supervisor', 1698478134842, 'admin', 1724309047797, '');

database/install/sys_log_operate.sql

@@ -1,45 +1,55 @@
-/*
+-- MariaDB dump 10.19  Distrib 10.6.16-MariaDB, for debian-linux-gnu (x86_64)
- Navicat Premium Data Transfer
+--
+-- Host: 192.168.2.219    Database: omc_db
+-- ------------------------------------------------------
+-- Server version	10.3.38-MariaDB
 
- Source Server         : root@192.168.2.166
+/*!40101 SET @OLD_CHARACTER_SET_CLIENT=@@CHARACTER_SET_CLIENT */;
- Source Server Type    : MariaDB
+/*!40101 SET @OLD_CHARACTER_SET_RESULTS=@@CHARACTER_SET_RESULTS */;
- Source Server Version : 100618 (10.6.18-MariaDB-0ubuntu0.22.04.1)
+/*!40101 SET @OLD_COLLATION_CONNECTION=@@COLLATION_CONNECTION */;
- Source Host           : 192.168.2.166:33066
+/*!40101 SET NAMES utf8mb4 */;
- Source Schema         : tenants_db
+/*!40103 SET @OLD_TIME_ZONE=@@TIME_ZONE */;
+/*!40103 SET TIME_ZONE='+00:00' */;
+/*!40014 SET @OLD_UNIQUE_CHECKS=@@UNIQUE_CHECKS, UNIQUE_CHECKS=0 */;
+/*!40014 SET @OLD_FOREIGN_KEY_CHECKS=@@FOREIGN_KEY_CHECKS, FOREIGN_KEY_CHECKS=0 */;
+/*!40101 SET @OLD_SQL_MODE=@@SQL_MODE, SQL_MODE='NO_AUTO_VALUE_ON_ZERO' */;
+/*!40111 SET @OLD_SQL_NOTES=@@SQL_NOTES, SQL_NOTES=0 */;
 
- Target Server Type    : MariaDB
+--
- Target Server Version : 100618 (10.6.18-MariaDB-0ubuntu0.22.04.1)
+-- Table structure for table `sys_log_operate`
- File Encoding         : 65001
+--
 
- Date: 24/06/2024 18:52:00
-*/
-
-SET NAMES utf8mb4;
-SET FOREIGN_KEY_CHECKS = 0;
-
--- ----------------------------
--- Table structure for sys_log_operate
--- ----------------------------
 DROP TABLE IF EXISTS `sys_log_operate`;
+/*!40101 SET @saved_cs_client     = @@character_set_client */;
+/*!40101 SET character_set_client = utf8 */;
 CREATE TABLE `sys_log_operate` (
   `oper_id` bigint(20) NOT NULL AUTO_INCREMENT COMMENT '日志主键',
-  `title` varchar(50) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT '' COMMENT '模块标题',
+  `title` varchar(50) DEFAULT '' COMMENT '模块标题',
-  `business_type` char(1) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT '0' COMMENT '业务类型（0其它 1新增 2修改 3删除 4授权 5导出 6导入 7强退 8清空数据）',
+  `business_type` char(1) DEFAULT '0' COMMENT '业务类型（0其它 1新增 2修改 3删除 4授权 5导出 6导入 7强退 8清空数据）',
-  `method` varchar(100) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT '' COMMENT '方法名称',
+  `method` varchar(100) DEFAULT '' COMMENT '方法名称',
-  `request_method` varchar(10) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT '' COMMENT '请求方式',
+  `request_method` varchar(10) DEFAULT '' COMMENT '请求方式',
-  `operator_type` char(1) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT '0' COMMENT '操作人员类别（0其它 1后台用户 2手机端用户）',
+  `operator_type` char(1) DEFAULT '0' COMMENT '操作人员类别（0其它 1后台用户 2手机端用户）',
-  `oper_name` varchar(50) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT '' COMMENT '操作人员',
+  `oper_name` varchar(50) DEFAULT '' COMMENT '操作人员',
-  `dept_name` varchar(50) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT '' COMMENT '部门名称',
+  `dept_name` varchar(50) DEFAULT '' COMMENT '部门名称',
-  `oper_url` varchar(255) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT '' COMMENT '请求URL',
+  `oper_url` varchar(255) DEFAULT '' COMMENT '请求URL',
-  `oper_ip` varchar(128) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT '' COMMENT '主机地址',
+  `oper_ip` varchar(128) DEFAULT '' COMMENT '主机地址',
-  `oper_location` varchar(255) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT '' COMMENT '操作地点',
+  `oper_location` varchar(255) DEFAULT '' COMMENT '操作地点',
-  `oper_param` varchar(2000) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT '' COMMENT '请求参数',
+  `oper_param` varchar(2000) DEFAULT '' COMMENT '请求参数',
-  `oper_msg` varchar(2000) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT '' COMMENT '操作消息',
+  `oper_msg` varchar(2000) DEFAULT '' COMMENT '操作消息',
-  `status` char(1) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT '0' COMMENT '操作状态（0异常 1正常）',
+  `status` char(1) DEFAULT '0' COMMENT '操作状态（0异常 1正常）',
-  `oper_time` bigint(20) NULL DEFAULT 0 COMMENT '操作时间',
+  `oper_time` bigint(20) DEFAULT 0 COMMENT '操作时间',
-  `cost_time` bigint(20) NULL DEFAULT 0 COMMENT '消耗时间（毫秒）',
+  `cost_time` bigint(20) DEFAULT 0 COMMENT '消耗时间（毫秒）',
-  `tenant_id` varchar(32) NULL DEFAULT NULL COMMENT 'Tenant ID refer to sys_tenant',
   PRIMARY KEY (`oper_id`) USING BTREE
-) ENGINE = InnoDB AUTO_INCREMENT = 30 CHARACTER SET = utf8mb4 COLLATE = utf8mb4_general_ci COMMENT = '系统操作日志表' ROW_FORMAT = Dynamic;
+) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_general_ci ROW_FORMAT=DYNAMIC COMMENT='系统操作日志表';
+/*!40101 SET character_set_client = @saved_cs_client */;
+/*!40103 SET TIME_ZONE=@OLD_TIME_ZONE */;
 
-SET FOREIGN_KEY_CHECKS = 1;
+/*!40101 SET SQL_MODE=@OLD_SQL_MODE */;
+/*!40014 SET FOREIGN_KEY_CHECKS=@OLD_FOREIGN_KEY_CHECKS */;
+/*!40014 SET UNIQUE_CHECKS=@OLD_UNIQUE_CHECKS */;
+/*!40101 SET CHARACTER_SET_CLIENT=@OLD_CHARACTER_SET_CLIENT */;
+/*!40101 SET CHARACTER_SET_RESULTS=@OLD_CHARACTER_SET_RESULTS */;
+/*!40101 SET COLLATION_CONNECTION=@OLD_COLLATION_CONNECTION */;
+/*!40111 SET SQL_NOTES=@OLD_SQL_NOTES */;
+
+-- Dump completed on 2024-03-06 17:26:59

database/install/sys_menu.sql

@@ -59,12 +59,12 @@ INSERT INTO `sys_menu` VALUES (66, 'menu.tools.iperf', 60, 6, 'iperf', 'tool/ipe
 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');
-INSERT INTO `sys_menu` VALUES (103, 'menu.system.menu', 1, 4, 'menu', 'system/menu/index', '1', '1', 'M', '1', '1', 'system:menu:list', 'icon-wofaqi', 'supervisor', 1700000000000, NULL, 0, 'menu.system.menuRemark');
+INSERT INTO `sys_menu` VALUES (103, 'menu.system.menu', 1, 10, 'menu', 'system/menu/index', '1', '1', 'M', '1', '1', 'system:menu:list', 'icon-wofaqi', 'supervisor', 1700000000000, NULL, 0, 'menu.system.menuRemark');
-INSERT INTO `sys_menu` VALUES (104, 'menu.security.dept', 2113, 5, 'dept', 'system/dept/index', '1', '1', 'M', '0', '1', 'system:dept:list', 'icon-yuzhanghao1', 'supervisor', 1700000000000, NULL, 0, 'menu.security.deptRemark');
+INSERT INTO `sys_menu` VALUES (104, 'menu.security.dept', 2113, 5, 'dept', 'system/dept/index', '1', '1', 'M', '1', '1', 'system:dept:list', 'icon-yuzhanghao1', 'supervisor', 1700000000000, NULL, 0, 'menu.security.deptRemark');
-INSERT INTO `sys_menu` VALUES (105, 'menu.security.post', 2113, 6, 'post', 'system/post/index', '1', '1', 'M', '0', '1', 'system:post:list', 'icon-gonggaodayi', 'supervisor', 1700000000000, NULL, 0, 'menu.security.postRemark');
+INSERT INTO `sys_menu` VALUES (105, 'menu.security.post', 2113, 6, 'post', 'system/post/index', '1', '1', 'M', '1', '1', 'system:post:list', 'icon-gonggaodayi', 'supervisor', 1700000000000, NULL, 0, 'menu.security.postRemark');
-INSERT INTO `sys_menu` VALUES (106, 'menu.system.dictType', 1, 7, 'dict', 'system/dict/index', '1', '1', 'M', '1', '1', 'system:dict:list', 'icon-tubiaoku', 'supervisor', 1700000000000, NULL, 0, 'menu.system.dictTypeRemark');
+INSERT INTO `sys_menu` VALUES (106, 'menu.system.dictType', 1, 30, 'dict', 'system/dict/index', '1', '1', 'M', '1', '1', 'system:dict:list', 'icon-tubiaoku', 'supervisor', 1700000000000, NULL, 0, 'menu.system.dictTypeRemark');
-INSERT INTO `sys_menu` VALUES (107, 'menu.system.dictData', 1, 8, 'dict/inline/data/:dictId', 'system/dict/data', '1', '1', 'M', '0', '1', 'system:dict:data', '#', 'supervisor', 1700000000000, NULL, 0, 'menu.system.dictDataRemark');
+INSERT INTO `sys_menu` VALUES (107, 'menu.system.dictData', 1, 31, 'dict/inline/data/:dictId', 'system/dict/data', '1', '1', 'M', '0', '1', 'system:dict:data', '#', 'supervisor', 1700000000000, NULL, 0, 'menu.system.dictDataRemark');
-INSERT INTO `sys_menu` VALUES (108, 'menu.system.paramSet', 1, 9, 'config', 'system/config/index', '1', '1', 'M', '1', '1', 'system:config:list', 'icon-gongnengjieshao', 'supervisor', 1700000000000, NULL, 0, 'menu.system.paramSetRemark');
+INSERT INTO `sys_menu` VALUES (108, 'menu.system.paramSet', 1, 59, 'config', 'system/config/index', '1', '1', 'M', '1', '1', 'system:config:list', 'icon-gongnengjieshao', 'supervisor', 1700000000000, NULL, 0, 'menu.system.paramSetRemark');
 INSERT INTO `sys_menu` VALUES (111, 'menu.system.systemLog', 1, 11, 'log', NULL, '1', '1', 'D', '0', '0', NULL, '#', 'supervisor', 1700000000000, NULL, 0, 'menu.system.systemLogRemark');
 INSERT INTO `sys_menu` VALUES (112, 'menu.system.systemInfo', 1, 5, 'system-info', 'monitor/system/info', '1', '1', 'M', '1', '1', 'monitor:system:info', 'icon-fuzhidaima', 'supervisor', 1700000000000, NULL, 0, 'menu.system.systemInfoRemark');
 INSERT INTO `sys_menu` VALUES (113, 'menu.system.cacheInfo', 1, 8, 'cache-info', 'monitor/cache/info', '1', '1', 'M', '1', '1', 'monitor:cache:info', 'icon-gongnengjieshao', 'supervisor', 1700000000000, NULL, 0, 'menu.system.cacheInfoRemark');
@@ -212,32 +212,4 @@ INSERT INTO `sys_menu` VALUES (2163, 'menu.trace.tshark', 2083, 14, 'tshark', 't
 INSERT INTO `sys_menu` VALUES (2164, 'menu.trace.wireshark', 2083, 16, 'wireshark', 'traceManage/wireshark/index', '1', '0', 'M', '1', '1', 'traceManage:wireshark:index', 'icon-gengduo', 'supervisor', 1724144595914, '', 0, '');
 INSERT INTO `sys_menu` VALUES (2165, 'menu.config.neOverview', 4, 1, 'neOverview', 'configManage/neOverview/index', '1', '0', 'M', '1', '1', 'configManage:neOverview:index', 'icon-tubiaoku', 'supervisor', 1700000000000, NULL, 0, 'menu.config.neOverviewRemark');
 
--- tenant management for admin user
-INSERT INTO `sys_menu` VALUES (10000, 'menu.security.tenant', 2113, 5, 'tenant', 'system/tenant/index', '1', '1', 'M', '1', '1', 'system:tenant:list', 'icon-yuzhanghao1', 'supervisor', 1700000000000, NULL, 0, 'menu.security.tenantRemark');
-INSERT INTO `sys_menu` VALUES (10001, 'menu.common.add', 10010, 1, '', '', '1', '1', 'B', '1', '1', 'tenant:subs:add', '#', 'supervisor', 1717491040044, 'supervisor', 1717491508620, '');
-INSERT INTO `sys_menu` VALUES (10002, 'menu.common.batchadd', 10010, 1, '', '', '1', '1', 'B', '1', '1', 'tenant:subs:batchAdd', '#', 'supervisor', 1717491040044, 'supervisor', 1717491508620, '');
-INSERT INTO `sys_menu` VALUES (10003, 'menu.common.checkdel', 10010, 2, '', '', '1', '1', 'B', '1', '1', 'tenant:subs:checkDel', '#', 'supervisor', 1717491501662, '', 0, '');
-INSERT INTO `sys_menu` VALUES (10004, 'menu.common.batchdel', 10010, 3, '', '', '1', '1', 'B', '1', '1', 'tenant:subs:batchDel', '#', 'supervisor', 1717491702980, '', 0, '');
-INSERT INTO `sys_menu` VALUES (10005, 'menu.common.loaddata', 10010, 4, '', '', '1', '1', 'B', '1', '1', 'tenant:subs:load', '#', 'supervisor', 1717491838364, '', 0, '');
-INSERT INTO `sys_menu` VALUES (10006, 'menu.common.import', 10010, 5, '', '', '1', '1', 'B', '1', '1', 'tenant:subs:import', '#', 'supervisor', 1717491874118, '', 0, '');
--- menu and button for tenant user
-INSERT INTO `sys_menu` VALUES (10007, 'menu.common.export', 10010, 6, '', '', '1', '1', 'B', '1', '1', 'tenant:subs:export', '#', 'supervisor', 1717491901916, '', 0, '');
-INSERT INTO `sys_menu` VALUES (10008, 'menu.common.checkexport', 10010, 7, '', '', '1', '1', 'B', '1', '1', 'tenant:subs:checkExport', '#', 'supervisor', 1717492147021, '', 0, '');
-INSERT INTO `sys_menu` VALUES (10009, 'menu.tenant.overview', 0, 90, 'overview', 'index/index', '1', '0', 'M', '0', '1', 'index:index', 'icon-paixu', 'admin', 1716445027021, 'supervisor', 1716453627718, 'Overview interface for tenants');
-INSERT INTO `sys_menu` VALUES (10010, 'menu.tenant.subscriber', 0, 91, 'sub', 'tenant/sub/index', '1', '1', 'M', '1', '1', 'tenant:sub:index', 'icon-xiangmuchengyuan', 'supervisor', 1716446941420, 'supervisor', 1716453604732, 'UDM Subscriber Menu');
-INSERT INTO `sys_menu` VALUES (10011, 'menu.tenant.onlineUE', 10022, 94, 'ue', 'tenant/ue/index', '1', '0', 'M', '1', '1', 'tenant:ue:index', 'icon-wocanyu', 'supervisor', 1718697278784, '', 0, '');
-INSERT INTO `sys_menu` VALUES (10012, 'menu.tenant.radio', 0, 95, 'base5G', 'tenant/base5G/index', '1', '0', 'M', '1', '1', 'tenant:base5G:index', 'icon-suofang', 'supervisor', 1718696648153, '', 0, '');
-INSERT INTO `sys_menu` VALUES (10013, 'menu.tenant.imsCDR', 10019, 97, 'imsCDR', 'tenant/imsCDR/index', '1', '0', 'M', '1', '1', 'tenant:imsCDR:index', 'icon-tubiaohuizhi', 'supervisor', 1716454666743, '', 0, '');
-INSERT INTO `sys_menu` VALUES (10014, 'menu.tenant.smfCDR', 10019, 98, 'smfCDR', 'tenant/smfCDR/index', '1', '0', 'M', '1', '1', 'tenant:smfCDR:index', 'icon-paixu', 'supervisor', 1716454666743, '', 0, '');
-INSERT INTO `sys_menu` VALUES (10015, 'menu.tenant.ueEvent', 0, 100, 'ueEvent', NULL, '1', '0', 'D', '1', '1', NULL, 'icon-xiangmu', 'supervisor', 1716454666743, 'supervisor', 1718621454168, '');
-INSERT INTO `sys_menu` VALUES (10016, 'menu.tenant.amfUE', 10015, 101, 'amfUE', 'tenant/amfUE/index', '1', '0', 'M', '1', '1', 'tenant:amfUE:index', 'icon-xiangmu', 'supervisor', 1716454666743, 'supervisor', 1718621454168, '');
-INSERT INTO `sys_menu` VALUES (10017, 'menu.tenant.mmeUE', 10015, 102, 'mmeUE', 'tenant/mmeUE/index', '1', '0', 'M', '1', '1', 'tenant:mmeUE:index', 'icon-xiangmu', 'supervisor', 1716454666743, 'supervisor', 1718621454168, '');
-INSERT INTO `sys_menu` VALUES (10018, 'menu.tenant.log', 0, 103, 'operate', 'tenant/operate/index', '1', '1', 'M', '1', '1', 'tenant:operate:list', 'icon-fuzhidaima', 'supervisor', 1716447063341, 'supervisor', 1716453612175, 'Operation log menu');
-INSERT INTO `sys_menu` VALUES (10019, 'menu.tenant.cdr', 0, 96, 'CDR', NULL, '1', '1', 'D', '1', '1', NULL, 'icon-tubiaohuizhi', 'supervisor', 1700000000000, NULL, 0, 'CDR');
-INSERT INTO `sys_menu` VALUES (10020, 'menu.tenant.onlineIMS', 10022, 93, 'ims', 'tenant/ims/index', '1', '0', 'M', '1', '1', 'tenant:ims:index', 'icon-wocanyu', 'supervisor', 1718697278784, '', 0, '');
-INSERT INTO `sys_menu` VALUES (10021, 'menu.tenant.smscCDR', 10019, 99, 'smscCDR', 'tenant/smscCDR/index', '1', '0', 'M', '1', '1', 'tenant:smfCDR:index', 'icon-paixu', 'supervisor', 1716454666743, '', 0, '');
-INSERT INTO `sys_menu` VALUES (10022, 'menu.tenant.session', 0, 92, 'session', NULL, '1', '0', 'D', '1', '1', NULL, 'icon-wocanyu', 'supervisor', 1716454666743, '', 0, '');
-
--- end for tenant user
-
 SET FOREIGN_KEY_CHECKS = 1;

database/install/sys_role.sql

@@ -1,43 +1,27 @@
-/*
+-- MariaDB dump 10.19  Distrib 10.6.16-MariaDB, for debian-linux-gnu (x86_64)
- Navicat Premium Data Transfer
 
- Source Server         : local_mariadb
+--
- Source Server Type    : MariaDB
+-- Table structure for table `sys_role`
- Source Server Version : 100338 (10.3.38-MariaDB)
+--
- Source Host           : localhost:33066
- Source Schema         : tenants_db
 
- Target Server Type    : MariaDB
- Target Server Version : 100338 (10.3.38-MariaDB)
- File Encoding         : 65001
-
- Date: 19/06/2024 15:21:40
-*/
-
-SET NAMES utf8mb4;
-SET FOREIGN_KEY_CHECKS = 0;
-
--- ----------------------------
--- Table structure for sys_role
--- ----------------------------
 DROP TABLE IF EXISTS `sys_role`;
 CREATE TABLE `sys_role` (
   `role_id` bigint(20) NOT NULL AUTO_INCREMENT COMMENT '角色ID',
-  `role_name` varchar(30) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NOT NULL COMMENT '角色名称',
+  `role_name` varchar(30) NOT NULL COMMENT '角色名称',
-  `role_key` varchar(50) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NOT NULL COMMENT '角色键值',
+  `role_key` varchar(50) NOT NULL COMMENT '角色键值',
-  `role_sort` int(11) NULL DEFAULT 0 COMMENT '显示顺序',
+  `role_sort` int(11) DEFAULT 0 COMMENT '显示顺序',
-  `data_scope` char(1) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT '5' COMMENT '数据范围（1：全部数据权限 2：自定数据权限 3：本部门数据权限 4：本部门及以下数据权限 5：仅本人数据权限）',
+  `data_scope` char(1) DEFAULT '5' COMMENT '数据范围（1：全部数据权限 2：自定数据权限 3：本部门数据权限 4：本部门及以下数据权限 5：仅本人数据权限）',
-  `menu_check_strictly` char(1) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT '1' COMMENT '菜单树选择项是否关联显示（0：父子不互相关联显示 1：父子互相关联显示）',
+  `menu_check_strictly` char(1) DEFAULT '1' COMMENT '菜单树选择项是否关联显示（0：父子不互相关联显示 1：父子互相关联显示）',
-  `dept_check_strictly` char(1) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT '1' COMMENT '部门树选择项是否关联显示（0：父子不互相关联显示 1：父子互相关联显示 ）',
+  `dept_check_strictly` char(1) DEFAULT '1' COMMENT '部门树选择项是否关联显示（0：父子不互相关联显示 1：父子互相关联显示 ）',
-  `status` char(1) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT '0' COMMENT '角色状态（0停用 1正常）',
+  `status` char(1) 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) DEFAULT '0' COMMENT '删除标志（0代表存在 1代表删除）',
-  `create_by` varchar(50) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT '' COMMENT '创建者',
+  `create_by` varchar(50) DEFAULT '' COMMENT '创建者',
-  `create_time` bigint(20) NULL DEFAULT 0 COMMENT '创建时间',
+  `create_time` bigint(20) DEFAULT 0 COMMENT '创建时间',
-  `update_by` varchar(50) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT '' COMMENT '更新者',
+  `update_by` varchar(50) DEFAULT '' COMMENT '更新者',
-  `update_time` bigint(20) NULL DEFAULT 0 COMMENT '更新时间',
+  `update_time` bigint(20) DEFAULT 0 COMMENT '更新时间',
-  `remark` varchar(500) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL COMMENT '备注',
+  `remark` varchar(500) DEFAULT NULL COMMENT '备注',
   PRIMARY KEY (`role_id`) USING BTREE
-) ENGINE = InnoDB AUTO_INCREMENT = 121 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='角色信息表';
 
 --
 -- Dumping data for table `sys_role`
@@ -50,6 +34,8 @@ INSERT INTO `sys_role` VALUES (2, 'role.admin', 'admin', 2, '1', '1', '1', '1',
 INSERT INTO `sys_role` VALUES (3, 'role.operator', 'operator', 3, '1', '1', '1', '1', '0', 'supervisor', 1698486934900, 'supervisor', 1717143582784, 'role.operatorRemark');
 INSERT INTO `sys_role` VALUES (4, 'role.monitor', 'monitor', 4, '1', '1', '1', '1', '0', 'supervisor', 1698486950714, 'supervisor', 1706774389300, 'role.monitorRemark');
 INSERT INTO `sys_role` VALUES (5, 'role.vistor', 'vistor', 5, '1', '1', '1', '1', '0', 'supervisor', 1698486975779, 'supervisor', 1706774405096, 'role.vistorRemark');
-INSERT INTO `sys_role` VALUES (100, 'role.tenant', 'tenant', 100, '2', '1', '1', '1', '0', 'admin', 1715591950609, 'supervisor', 1718701342318, '');
 
-SET FOREIGN_KEY_CHECKS = 1;
+UNLOCK TABLES;
+
+
+-- Dump completed on 2024-03-06 17:27:00

database/install/sys_role_menu.sql

@@ -1,19 +1,3 @@
-/*
- Navicat Premium Data Transfer
-
- Source Server         : local_mariadb
- Source Server Type    : MariaDB
- Source Server Version : 100338 (10.3.38-MariaDB)
- Source Host           : localhost:33066
- Source Schema         : tenants_db
-
- Target Server Type    : MariaDB
- Target Server Version : 100338 (10.3.38-MariaDB)
- File Encoding         : 65001
-
- Date: 19/06/2024 15:22:13
-*/
-
 SET NAMES utf8mb4;
 SET FOREIGN_KEY_CHECKS = 0;
 
@@ -27,9 +11,12 @@ CREATE TABLE `sys_role_menu`  (
   PRIMARY KEY (`role_id`, `menu_id`) USING BTREE
 ) ENGINE = InnoDB CHARACTER SET = utf8mb4 COLLATE = utf8mb4_general_ci COMMENT = '角色和菜单关联表' ROW_FORMAT = Dynamic;
 
--- ----------------------------
+--
--- Records of sys_role_menu
+-- Dumping data for table `sys_role_menu`
--- ----------------------------
+--
+
+LOCK TABLES `sys_role_menu` WRITE;
+
 INSERT IGNORE INTO `sys_role_menu` VALUES (2, 1);
 INSERT IGNORE INTO `sys_role_menu` VALUES (2, 4);
 INSERT IGNORE INTO `sys_role_menu` VALUES (2, 5);
@@ -100,9 +87,6 @@ INSERT IGNORE INTO `sys_role_menu` VALUES (2, 1055);
 INSERT IGNORE INTO `sys_role_menu` VALUES (2, 1056);
 INSERT IGNORE INTO `sys_role_menu` VALUES (2, 2009);
 INSERT IGNORE INTO `sys_role_menu` VALUES (2, 2010);
-INSERT IGNORE INTO `sys_role_menu` VALUES (2, 2075);
-INSERT IGNORE INTO `sys_role_menu` VALUES (2, 2078);
-INSERT IGNORE INTO `sys_role_menu` VALUES (2, 2079);
 INSERT IGNORE INTO `sys_role_menu` VALUES (2, 2080);
 INSERT IGNORE INTO `sys_role_menu` VALUES (2, 2081);
 INSERT IGNORE INTO `sys_role_menu` VALUES (2, 2082);
@@ -160,6 +144,7 @@ INSERT IGNORE INTO `sys_role_menu` VALUES (2, 2147);
 INSERT IGNORE INTO `sys_role_menu` VALUES (2, 2148);
 INSERT IGNORE INTO `sys_role_menu` VALUES (2, 2149);
 INSERT IGNORE INTO `sys_role_menu` VALUES (2, 2150);
+INSERT IGNORE INTO `sys_role_menu` VALUES (2, 2151);
 INSERT IGNORE INTO `sys_role_menu` VALUES (2, 2152);
 INSERT IGNORE INTO `sys_role_menu` VALUES (2, 2153);
 INSERT IGNORE INTO `sys_role_menu` VALUES (2, 2154);
@@ -173,16 +158,6 @@ INSERT IGNORE INTO `sys_role_menu` VALUES (2, 2162);
 INSERT IGNORE INTO `sys_role_menu` VALUES (2, 2163);
 INSERT IGNORE INTO `sys_role_menu` VALUES (2, 2165);
 
-INSERT IGNORE INTO `sys_role_menu` VALUES (2, 10000);
-INSERT IGNORE INTO `sys_role_menu` VALUES (2, 10001);
-INSERT IGNORE INTO `sys_role_menu` VALUES (2, 10002);
-INSERT IGNORE INTO `sys_role_menu` VALUES (2, 10003);
-INSERT IGNORE INTO `sys_role_menu` VALUES (2, 10004);
-INSERT IGNORE INTO `sys_role_menu` VALUES (2, 10005);
-INSERT IGNORE INTO `sys_role_menu` VALUES (2, 10006);
-INSERT IGNORE INTO `sys_role_menu` VALUES (2, 10007);
-INSERT IGNORE INTO `sys_role_menu` VALUES (2, 10008);
-
 INSERT IGNORE INTO `sys_role_menu` VALUES (3, 1);
 INSERT IGNORE INTO `sys_role_menu` VALUES (3, 4);
 INSERT IGNORE INTO `sys_role_menu` VALUES (3, 5);
@@ -203,14 +178,10 @@ INSERT IGNORE INTO `sys_role_menu` VALUES (3, 1042);
 INSERT IGNORE INTO `sys_role_menu` VALUES (3, 1048);
 INSERT IGNORE INTO `sys_role_menu` VALUES (3, 2009);
 INSERT IGNORE INTO `sys_role_menu` VALUES (3, 2010);
-INSERT IGNORE INTO `sys_role_menu` VALUES (3, 2075);
-INSERT IGNORE INTO `sys_role_menu` VALUES (3, 2078);
 INSERT IGNORE INTO `sys_role_menu` VALUES (3, 2080);
 INSERT IGNORE INTO `sys_role_menu` VALUES (3, 2081);
 INSERT IGNORE INTO `sys_role_menu` VALUES (3, 2082);
 INSERT IGNORE INTO `sys_role_menu` VALUES (3, 2083);
-INSERT IGNORE INTO `sys_role_menu` VALUES (3, 2084);
-INSERT IGNORE INTO `sys_role_menu` VALUES (3, 2085);
 INSERT IGNORE INTO `sys_role_menu` VALUES (3, 2086);
 INSERT IGNORE INTO `sys_role_menu` VALUES (3, 2087);
 INSERT IGNORE INTO `sys_role_menu` VALUES (3, 2088);
@@ -219,31 +190,17 @@ INSERT IGNORE INTO `sys_role_menu` VALUES (3, 2091);
 INSERT IGNORE INTO `sys_role_menu` VALUES (3, 2092);
 INSERT IGNORE INTO `sys_role_menu` VALUES (3, 2094);
 INSERT IGNORE INTO `sys_role_menu` VALUES (3, 2097);
-INSERT IGNORE INTO `sys_role_menu` VALUES (3, 2098);
-INSERT IGNORE INTO `sys_role_menu` VALUES (3, 2099);
-INSERT IGNORE INTO `sys_role_menu` VALUES (3, 2100);
-INSERT IGNORE INTO `sys_role_menu` VALUES (3, 2101);
-INSERT IGNORE INTO `sys_role_menu` VALUES (3, 2102);
-INSERT IGNORE INTO `sys_role_menu` VALUES (3, 2103);
-INSERT IGNORE INTO `sys_role_menu` VALUES (3, 2104);
-INSERT IGNORE INTO `sys_role_menu` VALUES (3, 2105);
-INSERT IGNORE INTO `sys_role_menu` VALUES (3, 2106);
 INSERT IGNORE INTO `sys_role_menu` VALUES (3, 2107);
 INSERT IGNORE INTO `sys_role_menu` VALUES (3, 2108);
 INSERT IGNORE INTO `sys_role_menu` VALUES (3, 2109);
 INSERT IGNORE INTO `sys_role_menu` VALUES (3, 2111);
-INSERT IGNORE INTO `sys_role_menu` VALUES (3, 2112);
 INSERT IGNORE INTO `sys_role_menu` VALUES (3, 2113);
 INSERT IGNORE INTO `sys_role_menu` VALUES (3, 2114);
 INSERT IGNORE INTO `sys_role_menu` VALUES (3, 2115);
-INSERT IGNORE INTO `sys_role_menu` VALUES (3, 2118);
 INSERT IGNORE INTO `sys_role_menu` VALUES (3, 2119);
 INSERT IGNORE INTO `sys_role_menu` VALUES (3, 2120);
 INSERT IGNORE INTO `sys_role_menu` VALUES (3, 2123);
-INSERT IGNORE INTO `sys_role_menu` VALUES (3, 2124);
-INSERT IGNORE INTO `sys_role_menu` VALUES (3, 2125);
 INSERT IGNORE INTO `sys_role_menu` VALUES (3, 2126);
-INSERT IGNORE INTO `sys_role_menu` VALUES (3, 2127);
 INSERT IGNORE INTO `sys_role_menu` VALUES (3, 2128);
 INSERT IGNORE INTO `sys_role_menu` VALUES (3, 2129);
 INSERT IGNORE INTO `sys_role_menu` VALUES (3, 2130);
@@ -255,9 +212,11 @@ INSERT IGNORE INTO `sys_role_menu` VALUES (3, 2138);
 INSERT IGNORE INTO `sys_role_menu` VALUES (3, 2140);
 INSERT IGNORE INTO `sys_role_menu` VALUES (3, 2141);
 INSERT IGNORE INTO `sys_role_menu` VALUES (3, 2143);
+INSERT IGNORE INTO `sys_role_menu` VALUES (3, 2146);
 INSERT IGNORE INTO `sys_role_menu` VALUES (3, 2147);
 INSERT IGNORE INTO `sys_role_menu` VALUES (3, 2148);
 INSERT IGNORE INTO `sys_role_menu` VALUES (3, 2149);
+INSERT IGNORE INTO `sys_role_menu` VALUES (3, 2151);
 INSERT IGNORE INTO `sys_role_menu` VALUES (3, 2152);
 INSERT IGNORE INTO `sys_role_menu` VALUES (3, 2153);
 INSERT IGNORE INTO `sys_role_menu` VALUES (3, 2154);
@@ -265,8 +224,7 @@ INSERT IGNORE INTO `sys_role_menu` VALUES (3, 2155);
 INSERT IGNORE INTO `sys_role_menu` VALUES (3, 2156);
 INSERT IGNORE INTO `sys_role_menu` VALUES (3, 2157);
 INSERT IGNORE INTO `sys_role_menu` VALUES (3, 2158);
-INSERT IGNORE INTO `sys_role_menu` VALUES (3, 2160);
+INSERT IGNORE INTO `sys_role_menu` VALUES (3, 2165);
-INSERT IGNORE INTO `sys_role_menu` VALUES (3, 2162);
 
 INSERT IGNORE INTO `sys_role_menu` VALUES (4, 1);
 INSERT IGNORE INTO `sys_role_menu` VALUES (4, 4);
@@ -306,10 +264,10 @@ INSERT IGNORE INTO `sys_role_menu` VALUES (4, 2141);
 INSERT IGNORE INTO `sys_role_menu` VALUES (4, 2147);
 INSERT IGNORE INTO `sys_role_menu` VALUES (4, 2148);
 INSERT IGNORE INTO `sys_role_menu` VALUES (4, 2149);
+INSERT IGNORE INTO `sys_role_menu` VALUES (4, 2151);
 INSERT IGNORE INTO `sys_role_menu` VALUES (4, 2152);
 INSERT IGNORE INTO `sys_role_menu` VALUES (4, 2153);
 INSERT IGNORE INTO `sys_role_menu` VALUES (4, 2157);
-INSERT IGNORE INTO `sys_role_menu` VALUES (4, 2160);
 INSERT IGNORE INTO `sys_role_menu` VALUES (4, 2163);
 INSERT IGNORE INTO `sys_role_menu` VALUES (4, 2165);
 
@@ -322,21 +280,6 @@ INSERT IGNORE INTO `sys_role_menu` VALUES (5, 2131);
 INSERT IGNORE INTO `sys_role_menu` VALUES (5, 2132);
 INSERT IGNORE INTO `sys_role_menu` VALUES (5, 2165);
 
-INSERT IGNORE INTO `sys_role_menu` VALUES (100, 10007);
+UNLOCK TABLES;
-INSERT IGNORE INTO `sys_role_menu` VALUES (100, 10008);
-INSERT IGNORE INTO `sys_role_menu` VALUES (100, 10009);
-INSERT IGNORE INTO `sys_role_menu` VALUES (100, 10010);
-INSERT IGNORE INTO `sys_role_menu` VALUES (100, 10011);
-INSERT IGNORE INTO `sys_role_menu` VALUES (100, 10012);
-INSERT IGNORE INTO `sys_role_menu` VALUES (100, 10013);
-INSERT IGNORE INTO `sys_role_menu` VALUES (100, 10014);
-INSERT IGNORE INTO `sys_role_menu` VALUES (100, 10015);
-INSERT IGNORE INTO `sys_role_menu` VALUES (100, 10016);
-INSERT IGNORE INTO `sys_role_menu` VALUES (100, 10017);
-INSERT IGNORE INTO `sys_role_menu` VALUES (100, 10018);
-INSERT IGNORE INTO `sys_role_menu` VALUES (100, 10019);
-INSERT IGNORE INTO `sys_role_menu` VALUES (100, 10020);
-INSERT IGNORE INTO `sys_role_menu` VALUES (100, 10021);
-INSERT IGNORE INTO `sys_role_menu` VALUES (100, 10022);
 
-SET FOREIGN_KEY_CHECKS = 1;
+-- Dump completed on 2024-04-12 21:19:19

database/install/sys_role_tenant.sql

@@ -1,30 +0,0 @@
-/*
- Navicat Premium Data Transfer
-
- Source Server         : local_mariadb
- Source Server Type    : MariaDB
- Source Server Version : 100338 (10.3.38-MariaDB)
- Source Host           : localhost:33066
- Source Schema         : tenants_db
-
- Target Server Type    : MariaDB
- Target Server Version : 100338 (10.3.38-MariaDB)
- File Encoding         : 65001
-
- Date: 19/06/2024 14:12:55
-*/
-
-SET NAMES utf8mb4;
-SET FOREIGN_KEY_CHECKS = 0;
-
--- ----------------------------
--- Table structure for sys_role_tenant
--- ----------------------------
-DROP TABLE IF EXISTS `sys_role_tenant`;
-CREATE TABLE `sys_role_tenant`  (
-  `role_id` bigint(20) NOT NULL COMMENT '角色ID',
-  `tenant_id` bigint(20) NOT NULL COMMENT '租户ID',
-  PRIMARY KEY (`role_id`, `tenant_id`) USING BTREE
-) ENGINE = InnoDB CHARACTER SET = utf8mb4 COLLATE = utf8mb4_general_ci COMMENT = '角色和部门关联表' ROW_FORMAT = Dynamic;
-
-SET FOREIGN_KEY_CHECKS = 1;

database/install/sys_tenant.sql

@@ -1,46 +0,0 @@
-/*
- Navicat Premium Data Transfer
-
- Source Server         : root@192.168.2.166
- Source Server Type    : MariaDB
- Source Server Version : 100616 (10.6.16-MariaDB-0ubuntu0.22.04.1)
- Source Host           : 192.168.2.166:33066
- Source Schema         : tenants_db
-
- Target Server Type    : MariaDB
- Target Server Version : 100616 (10.6.16-MariaDB-0ubuntu0.22.04.1)
- File Encoding         : 65001
-
- Date: 19/06/2024 15:49:42
-*/
-
-SET NAMES utf8mb4;
-SET FOREIGN_KEY_CHECKS = 0;
-
--- ----------------------------
--- Table structure for sys_tenant
--- ----------------------------
-DROP TABLE IF EXISTS `sys_tenant`;
-CREATE TABLE `sys_tenant`  (
-  `tenant_id` bigint(20) NOT NULL AUTO_INCREMENT COMMENT 'Tenant id',
-  `parent_id` bigint(20) NULL DEFAULT 0 COMMENT '父id 默认0',
-  `ancestors` varchar(50) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT '' COMMENT '祖级列表',
-  `tenant_name` varchar(128) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT '' COMMENT '租户名称',
-  `order_num` int(11) NULL DEFAULT 0 COMMENT '显示顺序',
-  `tenancy_type` varchar(20) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL COMMENT 'tenancy type: sd-sst, apn, imsi, msisdn',
-  `tenancy_key` varchar(32) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL COMMENT 'tenancy key: key of sd-sst, apn, imsi, msisdn',
-  `status` 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 NULL DEFAULT '0' COMMENT '删除标志（0代表存在 1代表删除）',
-  `create_by` varchar(50) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT '' COMMENT '创建者',
-  `create_time` bigint(20) NULL DEFAULT 0 COMMENT '创建时间',
-  `update_by` varchar(50) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT '' COMMENT '更新者',
-  `update_time` bigint(20) NULL DEFAULT 0 COMMENT '更新时间',
-  PRIMARY KEY (`tenant_id`) USING BTREE
-) ENGINE = InnoDB AUTO_INCREMENT = 123 CHARACTER SET = utf8mb4 COLLATE = utf8mb4_general_ci COMMENT = '部门表' ROW_FORMAT = Dynamic;
-
--- ----------------------------
--- Records of sys_tenant
--- ----------------------------
--- INSERT INTO `sys_tenant` VALUES (1, 0, '0', 'TenantRoot', 0, '', '', '1', '0', 'admin', 1699348237468, '', 1718783333041);
-
-SET FOREIGN_KEY_CHECKS = 1;

database/install/sys_user.sql

@@ -1,60 +1,43 @@
-/*
+-- MariaDB dump 10.19  Distrib 10.6.16-MariaDB, for debian-linux-gnu (x86_64)
- Navicat Premium Data Transfer
 
- Source Server         : root@192.168.2.166
+--
- Source Server Type    : MariaDB
+-- Table structure for table `sys_user`
- Source Server Version : 100616 (10.6.16-MariaDB-0ubuntu0.22.04.1)
+--
- Source Host           : 192.168.2.166:33066
- Source Schema         : tenants_db
 
- Target Server Type    : MariaDB
- Target Server Version : 100616 (10.6.16-MariaDB-0ubuntu0.22.04.1)
- File Encoding         : 65001
-
- Date: 19/06/2024 14:32:47
-*/
-
-SET NAMES utf8mb4;
-SET FOREIGN_KEY_CHECKS = 0;
-
--- ----------------------------
--- Table structure for sys_user
--- ----------------------------
 DROP TABLE IF EXISTS `sys_user`;
 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) NULL DEFAULT 0 COMMENT '部门ID',
+  `dept_id` bigint DEFAULT '0' COMMENT '部门ID',
-  `tenant_id` bigint(20) NULL DEFAULT NULL COMMENT 'Tenant ID',
   `user_name` varchar(36) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NOT NULL DEFAULT '' 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(64) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT '' COMMENT '用户邮箱',
+  `email` varchar(64) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci DEFAULT '' COMMENT '用户邮箱',
-  `phonenumber` varchar(16) 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 '' COMMENT '备注',
+  `remark` varchar(500) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci DEFAULT '' COMMENT '备注',
   PRIMARY KEY (`user_id`) USING BTREE
 ) ENGINE=InnoDB AUTO_INCREMENT=100 DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_general_ci COMMENT='用户信息表';
 
--- ----------------------------
+--
--- Records of sys_user
+-- Dumping data for table `sys_user`
--- ----------------------------
+--
 
 LOCK TABLES `sys_user` WRITE;
 /*!40000 ALTER TABLE `sys_user` DISABLE KEYS */;
-INSERT INTO `sys_user` VALUES (1, NULL, NULL, 'supervisor', 'supervisor', 'sys', '', '', '', '', '$2a$10$QgIcp6yuOEGrEU0TNU12K.uQRLbcufesEU7hiRYlRSSdUO7OAkoTq', '1', '0', '127.0.0.1', 0, '', 0, '', 0, '');
+INSERT INTO `sys_user` VALUES (1, 100, 'supervisor', 'supervisor', 'sys', '', '', '', '', '$2a$10$QgIcp6yuOEGrEU0TNU12K.uQRLbcufesEU7hiRYlRSSdUO7OAkoTq', '1', '0', '127.0.0.1', 0, '', 0, '', 0, '');
-INSERT INTO `sys_user` VALUES (2, NULL, NULL, 'admin', 'admin', 'sys', '', '', '', '', '$2a$10$QgIcp6yuOEGrEU0TNU12K.uQRLbcufesEU7hiRYlRSSdUO7OAkoTq', '1', '0', '127.0.0.1', 0, '', 0, '', 0, '');
+INSERT INTO `sys_user` VALUES (2, 100, 'admin', 'admin', 'sys', '', '', '', '', '$2a$10$QgIcp6yuOEGrEU0TNU12K.uQRLbcufesEU7hiRYlRSSdUO7OAkoTq', '1', '0', '127.0.0.1', 0, '', 0, '', 0, '');
-INSERT INTO `sys_user` VALUES (3, NULL, NULL, 'manager', 'manager', 'sys', '', '', '', '', '$2a$10$RND3fUw9Ai.WcggYSI57tu.u3OIlktdPxFzlWkmiHC1paV038t0I2', '1', '0', '127.0.0.1', 0, '', 0, '', 0, '');
+INSERT INTO `sys_user` VALUES (3, 100, 'manager', 'manager', 'sys', '', '', '', '', '$2a$10$RND3fUw9Ai.WcggYSI57tu.u3OIlktdPxFzlWkmiHC1paV038t0I2', '1', '0', '127.0.0.1', 0, '', 0, '', 0, '');
-INSERT INTO `sys_user` VALUES (4, NULL, NULL, 'monitor', 'monitor', 'sys', '', '', '', '', '$2a$10$t3zpKQ0olECotFyI1yO43.tCoS0EXoSRBDcqwl09xvrsmn14qFHHy', '1', '0', '127.0.0.1', 0, '', 0, '', 0, '');
+INSERT INTO `sys_user` VALUES (4, 100, 'monitor', 'monitor', 'sys', '', '', '', '', '$2a$10$t3zpKQ0olECotFyI1yO43.tCoS0EXoSRBDcqwl09xvrsmn14qFHHy', '1', '0', '127.0.0.1', 0, '', 0, '', 0, '');
 
 UNLOCK TABLES;
 

database/install/u_sub_user.sql

@@ -2,12 +2,6 @@
 -- Table structure for table `u_sub_user`
 --
 
-SET NAMES utf8mb4;
-SET FOREIGN_KEY_CHECKS = 0;
-
--- ----------------------------
--- Table structure for u_sub_user
--- ----------------------------
 DROP TABLE IF EXISTS `u_sub_user`; 
 CREATE TABLE `u_sub_user` (
   `id` int NOT NULL AUTO_INCREMENT COMMENT '主键',
@@ -41,9 +35,8 @@ CREATE TABLE `u_sub_user` (
   `sm_data` varchar(1500) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci DEFAULT '' COMMENT 'smData',
   `smf_sel` varchar(50) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci DEFAULT '' COMMENT 'smfSel',
   `cag` varchar(50) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci DEFAULT '' COMMENT 'CAG',
-  `tenant_id` varchar(32) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL COMMENT 'multi-tenancy refer to sys_tenant.tenant_id',
   PRIMARY KEY (`id`) USING BTREE,
   UNIQUE KEY `imsi_ne` (`imsi`,`ne_id`) USING BTREE COMMENT 'imsi_ne唯一索引'
 ) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_general_ci COMMENT='UDM签约用户';
 
-SET FOREIGN_KEY_CHECKS = 1;
+-- Dump completed on 2024-10-12 15:26:59

database/install/ue_event.sql

@@ -1,39 +1,48 @@
-/*
+-- MariaDB dump 10.19  Distrib 10.6.16-MariaDB, for debian-linux-gnu (x86_64)
- Navicat Premium Data Transfer
+--
+-- Host: 192.168.2.219    Database: omc_db
+-- ------------------------------------------------------
+-- Server version	10.3.38-MariaDB
 
- Source Server         : local_mariadb
+/*!40101 SET @OLD_CHARACTER_SET_CLIENT=@@CHARACTER_SET_CLIENT */;
- Source Server Type    : MariaDB
+/*!40101 SET @OLD_CHARACTER_SET_RESULTS=@@CHARACTER_SET_RESULTS */;
- Source Server Version : 100338 (10.3.38-MariaDB)
+/*!40101 SET @OLD_COLLATION_CONNECTION=@@COLLATION_CONNECTION */;
- Source Host           : localhost:33066
+/*!40101 SET NAMES utf8mb4 */;
- Source Schema         : tenants_db
+/*!40103 SET @OLD_TIME_ZONE=@@TIME_ZONE */;
+/*!40103 SET TIME_ZONE='+00:00' */;
+/*!40014 SET @OLD_UNIQUE_CHECKS=@@UNIQUE_CHECKS, UNIQUE_CHECKS=0 */;
+/*!40014 SET @OLD_FOREIGN_KEY_CHECKS=@@FOREIGN_KEY_CHECKS, FOREIGN_KEY_CHECKS=0 */;
+/*!40101 SET @OLD_SQL_MODE=@@SQL_MODE, SQL_MODE='NO_AUTO_VALUE_ON_ZERO' */;
+/*!40111 SET @OLD_SQL_NOTES=@@SQL_NOTES, SQL_NOTES=0 */;
 
- Target Server Type    : MariaDB
+--
- Target Server Version : 100338 (10.3.38-MariaDB)
+-- Table structure for table `ue_event`
- File Encoding         : 65001
+--
 
- Date: 04/07/2024 10:15:55
-*/
-
-SET NAMES utf8mb4;
-SET FOREIGN_KEY_CHECKS = 0;
-
--- ----------------------------
--- Table structure for ue_event
--- ----------------------------
 DROP TABLE IF EXISTS `ue_event`;
+/*!40101 SET @saved_cs_client     = @@character_set_client */;
+/*!40101 SET character_set_client = utf8 */;
 CREATE TABLE `ue_event` (
   `id` int(11) NOT NULL AUTO_INCREMENT,
-  `ne_type` varchar(32) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL,
+  `ne_type` varchar(32) DEFAULT NULL,
-  `ne_name` varchar(64) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL,
+  `ne_name` varchar(64) DEFAULT NULL,
-  `rm_uid` varchar(32) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL,
+  `rm_uid` varchar(32) DEFAULT NULL,
-  `timestamp` int(11) NULL DEFAULT NULL,
+  `timestamp` int(11) DEFAULT NULL,
-  `event_type` varchar(16) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL COMMENT 'auth-result/detach/cm-state',
+  `event_type` varchar(16) DEFAULT NULL COMMENT 'auth-result/detach/cm-state',
-  `event_json` longtext CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL,
+  `event_json` longtext DEFAULT NULL,
-  `created_at` datetime NULL DEFAULT current_timestamp(),
+  `created_at` datetime DEFAULT current_timestamp(),
-  `tenant_id` varchar(32) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL,
   PRIMARY KEY (`id`) USING BTREE,
-  INDEX `id`(`id`) USING BTREE,
+  KEY `id` (`id`) USING BTREE
-  INDEX `idx_type_timestamp`(`ne_type`, `timestamp`, `event_type`, `tenant_id`) USING BTREE
+) ENGINE=InnoDB AUTO_INCREMENT=5 DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_general_ci ROW_FORMAT=DYNAMIC;
-) ENGINE = InnoDB AUTO_INCREMENT = 5 CHARACTER SET = utf8mb4 COLLATE = utf8mb4_general_ci ROW_FORMAT = Dynamic;
+/*!40101 SET character_set_client = @saved_cs_client */;
+/*!40103 SET TIME_ZONE=@OLD_TIME_ZONE */;
 
-SET FOREIGN_KEY_CHECKS = 1;
+/*!40101 SET SQL_MODE=@OLD_SQL_MODE */;
+/*!40014 SET FOREIGN_KEY_CHECKS=@OLD_FOREIGN_KEY_CHECKS */;
+/*!40014 SET UNIQUE_CHECKS=@OLD_UNIQUE_CHECKS */;
+/*!40101 SET CHARACTER_SET_CLIENT=@OLD_CHARACTER_SET_CLIENT */;
+/*!40101 SET CHARACTER_SET_RESULTS=@OLD_CHARACTER_SET_RESULTS */;
+/*!40101 SET COLLATION_CONNECTION=@OLD_COLLATION_CONNECTION */;
+/*!40111 SET SQL_NOTES=@OLD_SQL_NOTES */;
+
+-- Dump completed on 2024-03-06 17:26:59

database/install/ue_event_amf.sql

@@ -1,39 +1,20 @@
-/*
+--
- Navicat Premium Data Transfer
+-- Table structure for table `ue_event_amf`
+--
 
- Source Server         : local_mariadb
- Source Server Type    : MariaDB
- Source Server Version : 100338 (10.3.38-MariaDB)
- Source Host           : localhost:33066
- Source Schema         : tenants_db
-
- Target Server Type    : MariaDB
- Target Server Version : 100338 (10.3.38-MariaDB)
- File Encoding         : 65001
-
- Date: 04/07/2024 10:43:31
-*/
-
-SET NAMES utf8mb4;
-SET FOREIGN_KEY_CHECKS = 0;
-
--- ----------------------------
--- Table structure for ue_event_amf
--- ----------------------------
 DROP TABLE IF EXISTS `ue_event_amf`;
 CREATE TABLE `ue_event_amf` (
-  `id` int(11) NOT NULL AUTO_INCREMENT,
+  `id` int NOT NULL AUTO_INCREMENT,
-  `ne_type` varchar(32) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL,
+  `ne_type` varchar(32) COLLATE utf8mb4_general_ci DEFAULT NULL,
-  `ne_name` varchar(64) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL,
+  `ne_name` varchar(64) COLLATE utf8mb4_general_ci DEFAULT NULL,
-  `rm_uid` varchar(32) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL,
+  `rm_uid` varchar(32) COLLATE utf8mb4_general_ci DEFAULT NULL,
-  `timestamp` int(11) NULL DEFAULT NULL,
+  `timestamp` int DEFAULT NULL,
-  `event_type` varchar(16) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL COMMENT 'auth-result/detach/cm-state',
+  `event_type` varchar(16) COLLATE utf8mb4_general_ci DEFAULT NULL COMMENT 'auth-result/detach/cm-state',
-  `event_json` longtext CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL,
+  `event_json` longtext COLLATE utf8mb4_general_ci,
-  `created_at` datetime NULL DEFAULT current_timestamp(),
+  `created_at` datetime DEFAULT CURRENT_TIMESTAMP,
-  `tenant_id` varchar(32) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL,
   PRIMARY KEY (`id`) USING BTREE,
-  INDEX `id`(`id`) USING BTREE,
+  KEY `id` (`id`) USING BTREE,
-  INDEX `idx_type_timestamp`(`ne_type`, `timestamp`, `event_type`, `tenant_id`) USING BTREE
+  KEY `idx_type_timestamp` (`ne_type`,`timestamp`,`event_type`) USING BTREE
-) ENGINE = InnoDB AUTO_INCREMENT = 1 CHARACTER SET = utf8mb4 COLLATE = utf8mb4_general_ci ROW_FORMAT = Dynamic;
+) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_general_ci ROW_FORMAT=DYNAMIC;
 
-SET FOREIGN_KEY_CHECKS = 1;
+-- Dump completed on 2024-03-06 17:26:59

database/install/ue_event_mme.sql

@@ -1,39 +1,20 @@
-/*
+--
- Navicat Premium Data Transfer
+-- Table structure for table `ue_event_mme`
+--
 
- Source Server         : local_mariadb
- Source Server Type    : MariaDB
- Source Server Version : 100338 (10.3.38-MariaDB)
- Source Host           : localhost:33066
- Source Schema         : tenants_db
-
- Target Server Type    : MariaDB
- Target Server Version : 100338 (10.3.38-MariaDB)
- File Encoding         : 65001
-
- Date: 04/07/2024 10:16:18
-*/
-
-SET NAMES utf8mb4;
-SET FOREIGN_KEY_CHECKS = 0;
-
--- ----------------------------
--- Table structure for ue_event_mme
--- ----------------------------
 DROP TABLE IF EXISTS `ue_event_mme`;
 CREATE TABLE `ue_event_mme` (
-  `id` int(11) NOT NULL AUTO_INCREMENT,
+  `id` int NOT NULL AUTO_INCREMENT,
-  `ne_type` varchar(32) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL,
+  `ne_type` varchar(32) COLLATE utf8mb4_general_ci DEFAULT NULL,
-  `ne_name` varchar(64) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL,
+  `ne_name` varchar(64) COLLATE utf8mb4_general_ci DEFAULT NULL,
-  `rm_uid` varchar(32) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL,
+  `rm_uid` varchar(32) COLLATE utf8mb4_general_ci DEFAULT NULL,
-  `timestamp` int(11) NULL DEFAULT NULL,
+  `timestamp` int DEFAULT NULL,
-  `event_type` varchar(16) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT '' COMMENT 'ECM STATUS, EMM STATUS',
+  `event_type` varchar(16) COLLATE utf8mb4_general_ci DEFAULT '' COMMENT 'ECM STATUS, EMM STATUS',
-  `event_json` longtext CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL,
+  `event_json` longtext COLLATE utf8mb4_general_ci,
-  `created_at` datetime NULL DEFAULT current_timestamp(),
+  `created_at` datetime DEFAULT CURRENT_TIMESTAMP,
-  `tenant_id` varchar(32) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL,
   PRIMARY KEY (`id`) USING BTREE,
-  INDEX `id`(`id`) USING BTREE,
+  KEY `id` (`id`) USING BTREE,
-  INDEX `idx_type_timestamp`(`ne_type`, `timestamp`, `event_type`, `tenant_id`) USING BTREE
+  KEY `idx_type_timestamp` (`ne_type`,`timestamp`,`event_type`) USING BTREE
-) ENGINE = InnoDB AUTO_INCREMENT = 1 CHARACTER SET = utf8mb4 COLLATE = utf8mb4_general_ci ROW_FORMAT = Dynamic;
+) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_general_ci ROW_FORMAT=DYNAMIC;
 
-SET FOREIGN_KEY_CHECKS = 1;
+-- Dump completed on 2024-06-16 17:26:59

database/upgrade/upg_cdr_event.sql

@@ -5,13 +5,13 @@
  Source Server Type    : MariaDB
  Source Server Version : 100338 (10.3.38-MariaDB)
  Source Host           : localhost:33066
- Source Schema         : tenants_db
+ Source Schema         : omc_db
 
  Target Server Type    : MariaDB
  Target Server Version : 100338 (10.3.38-MariaDB)
  File Encoding         : 65001
 
- Date: 04/07/2024 10:28:34
+ Date: 19/01/2024 15:57:12
 */
 
 SET NAMES utf8mb4;
@@ -21,17 +21,15 @@ SET FOREIGN_KEY_CHECKS = 0;
 -- Table structure for cdr_event
 -- ----------------------------
 CREATE TABLE IF NOT EXISTS `cdr_event`  (
-  `id` int(11) UNSIGNED ZEROFILL NOT NULL AUTO_INCREMENT,
+  `id` int(11) NOT NULL AUTO_INCREMENT,
   `ne_type` varchar(32) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL,
   `ne_name` varchar(64) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL,
   `rm_uid` varchar(32) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL,
   `timestamp` int(11) NULL DEFAULT NULL,
-  `cdr_json` text CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL,
+  `cdr_json` longtext CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL,
   `created_at` datetime NULL DEFAULT current_timestamp(),
-  `tenant_id` varchar(32) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL,
   PRIMARY KEY (`id`) USING BTREE,
-  INDEX `id`(`id`) USING BTREE,
+  INDEX `id`(`id`) USING BTREE
-  INDEX `idx_type_timestamp`(`ne_type`, `timestamp`, `tenant_id`) USING BTREE
+) ENGINE = InnoDB AUTO_INCREMENT = 1 CHARACTER SET = utf8mb4 COLLATE = utf8mb4_general_ci ROW_FORMAT = Dynamic;
-) ENGINE = InnoDB AUTO_INCREMENT = 7 CHARACTER SET = utf8mb4 COLLATE = utf8mb4_general_ci ROW_FORMAT = Dynamic;
 
 SET FOREIGN_KEY_CHECKS = 1;

database/upgrade/upg_cdr_event_ims.sql

@@ -5,13 +5,13 @@
  Source Server Type    : MariaDB
  Source Server Version : 100338 (10.3.38-MariaDB)
  Source Host           : localhost:33066
- Source Schema         : tenants_db
+ Source Schema         : omc_db
 
  Target Server Type    : MariaDB
  Target Server Version : 100338 (10.3.38-MariaDB)
  File Encoding         : 65001
 
- Date: 04/07/2024 10:28:43
+ Date: 28/05/2024 10:19:12
 */
 
 SET NAMES utf8mb4;
@@ -21,17 +21,18 @@ SET FOREIGN_KEY_CHECKS = 0;
 -- Table structure for cdr_event_ims
 -- ----------------------------
 CREATE TABLE IF NOT EXISTS `cdr_event_ims`  (
-  `id` int(11) NOT NULL AUTO_INCREMENT,
+  `id` int NOT NULL AUTO_INCREMENT,
-  `ne_type` varchar(32) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL,
+  `ne_type` varchar(32) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci DEFAULT NULL,
-  `ne_name` varchar(64) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL,
+  `ne_name` varchar(64) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci DEFAULT NULL,
-  `rm_uid` varchar(32) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL,
+  `rm_uid` varchar(32) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci DEFAULT NULL,
-  `timestamp` int(11) NULL DEFAULT NULL,
+  `timestamp` int DEFAULT NULL,
-  `cdr_json` longtext CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL,
+  `cdr_json` longtext CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci,
-  `created_at` datetime NULL DEFAULT current_timestamp(),
+  `created_at` datetime DEFAULT CURRENT_TIMESTAMP,
-  `tenant_id` varchar(32) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL,
   PRIMARY KEY (`id`) USING BTREE,
-  INDEX `id`(`id`) USING BTREE,
+  KEY `id` (`id`) USING BTREE,
-  INDEX `idx_type_timestamp`(`ne_type`, `timestamp`, `tenant_id`) USING BTREE
+  KEY `idx_type_timestamp` (`ne_type`,`timestamp`) USING BTREE
-) ENGINE = InnoDB AUTO_INCREMENT = 8 CHARACTER SET = utf8mb4 COLLATE = utf8mb4_general_ci ROW_FORMAT = Dynamic;
+) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_general_ci;
+
+ALTER TABLE `cdr_event_ims` ADD INDEX IF NOT EXISTS `idx_type_timestamp`(`ne_type`, `timestamp`) USING BTREE;
 
 SET FOREIGN_KEY_CHECKS = 1;

database/upgrade/upg_cdr_event_smf.sql

@@ -5,13 +5,13 @@
  Source Server Type    : MariaDB
  Source Server Version : 100338 (10.3.38-MariaDB)
  Source Host           : localhost:33066
- Source Schema         : tenants_db
+ Source Schema         : omc_db
 
  Target Server Type    : MariaDB
  Target Server Version : 100338 (10.3.38-MariaDB)
  File Encoding         : 65001
 
- Date: 04/07/2024 10:29:05
+ Date: 28/05/2024 10:19:23
 */
 
 SET NAMES utf8mb4;
@@ -21,17 +21,18 @@ SET FOREIGN_KEY_CHECKS = 0;
 -- Table structure for cdr_event_smf
 -- ----------------------------
 CREATE TABLE IF NOT EXISTS `cdr_event_smf`  (
-  `id` int(11) NOT NULL AUTO_INCREMENT,
+  `id` int NOT NULL AUTO_INCREMENT,
-  `ne_type` varchar(32) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL,
+  `ne_type` varchar(32) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci DEFAULT NULL,
-  `ne_name` varchar(64) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL,
+  `ne_name` varchar(64) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci DEFAULT NULL,
-  `rm_uid` varchar(32) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL,
+  `rm_uid` varchar(32) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci DEFAULT NULL,
-  `timestamp` int(11) NULL DEFAULT NULL,
+  `timestamp` int DEFAULT NULL,
-  `cdr_json` longtext CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL,
+  `cdr_json` longtext CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci,
-  `created_at` datetime NULL DEFAULT current_timestamp(),
+  `created_at` datetime DEFAULT CURRENT_TIMESTAMP,
-  `tenant_id` varchar(32) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL,
   PRIMARY KEY (`id`) USING BTREE,
-  INDEX `id`(`id`) USING BTREE,
+  KEY `id` (`id`) USING BTREE,
-  INDEX `idx_type_timestamp`(`ne_type`, `timestamp`, `tenant_id`) USING BTREE
+  KEY `idx_type_timestamp` (`ne_type`,`timestamp`) USING BTREE
-) ENGINE = InnoDB AUTO_INCREMENT = 13 CHARACTER SET = utf8mb4 COLLATE = utf8mb4_general_ci ROW_FORMAT = Dynamic;
+) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_general_ci;
+
+ALTER TABLE `cdr_event_smf` ADD INDEX IF NOT EXISTS `idx_type_timestamp`(`ne_type`, `timestamp`) USING BTREE;
 
 SET FOREIGN_KEY_CHECKS = 1;

database/upgrade/upg_cdr_event_smsc.sql

@@ -33,9 +33,4 @@ CREATE TABLE IF NOT EXISTS `cdr_event_smsc` (
   KEY `idx_type_timestamp` (`ne_type`,`timestamp`) USING BTREE
 ) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_general_ci;
 
-ALTER TABLE `cdr_event_smsc` 
-ADD COLUMN IF NOT EXISTS `tenant_id` varchar(32) NULL AFTER `created_at`,
-DROP INDEX IF EXISTS `idx_type_timestamp`,
-ADD INDEX IF NOT EXISTS `idx_type_timestamp`(`ne_type`, `timestamp`, `tenant_id`) USING BTREE;
-
 SET FOREIGN_KEY_CHECKS = 1;

database/upgrade/upg_kpi_report.sql

@@ -37,10 +37,4 @@ CREATE TABLE IF NOT EXISTS `kpi_report`  (
   INDEX `idx_uid_datetime`(`rm_uid`, `date`, `start_time`) USING BTREE
 ) ENGINE = InnoDB AUTO_INCREMENT = 10660 CHARACTER SET = utf8mb4 COLLATE = utf8mb4_general_ci ROW_FORMAT = Dynamic;
 
-ALTER TABLE `kpi_report` ADD COLUMN IF NOT EXISTS `tenant_id` varchar(32) NULL DEFAULT NULL AFTER `created_at`;
-
-ALTER TABLE `kpi_report` 
-ADD INDEX IF NOT EXISTS `idx_timestamp`(`created_at`) USING BTREE,
-ADD INDEX IF NOT EXISTS `idx_uid_datetime`(`rm_uid`, `date`, `start_time`) USING BTREE;
-
 SET FOREIGN_KEY_CHECKS = 1;

database/upgrade/upg_sys_dict_data0.sql

@@ -172,16 +172,4 @@ INSERT IGNORE INTO `sys_dict_data` VALUES (143, 30, 'dictData.cdr_cause_code.50'
 
 -- 指定记录条件更新
 
--- multi-tenancy
-INSERT IGNORE INTO `sys_dict_data` VALUES (10000, 10000, 'dictData.tenancy.imsi', 'IMSI', 'tenancy_type', NULL, NULL, '1', 'supervisor', 1699350000000, NULL, 0, NULL);
-INSERT IGNORE INTO `sys_dict_data` VALUES (10001, 10000, 'dictData.tenancy.apn', 'APN', 'tenancy_type', NULL, NULL, '0', 'supervisor', 1699350000000, NULL, 0, NULL);
-INSERT IGNORE INTO `sys_dict_data` VALUES (10002, 10000, 'dictData.tenancy.slice', 'SLICE', 'tenancy_type', NULL, NULL, '0', 'supervisor', 1699350000000, NULL, 0, NULL);
-INSERT IGNORE INTO `sys_dict_data` VALUES (10003, 10000, 'dictData.tenancy.ne', 'UPF', 'tenancy_type', NULL, NULL, '1', 'supervisor', 1699350000000, NULL, 0, NULL);
-INSERT IGNORE INTO `sys_dict_data` VALUES (10004, 10000, 'dictData.tenancy.radio', 'RADIO', 'tenancy_type', NULL, NULL, '1', 'supervisor', 1699350000000, NULL, 0, NULL);
-INSERT IGNORE INTO `sys_dict_data` VALUES (10005, 10000, 'dictData.match.exact', 'ExactMatch', 'match_type', NULL, NULL, '1', 'supervisor', 1699350000000, NULL, 0, NULL);
-INSERT IGNORE INTO `sys_dict_data` VALUES (10006, 10000, 'dictData.match.fuzzy', 'FuzzyMatch', 'match_type', NULL, NULL, '1', 'supervisor', 1699350000000, NULL, 0, NULL);
-INSERT IGNORE INTO `sys_dict_data` VALUES (10007, 10000, 'dictData.match.prefix', 'PrefixMatch', 'match_type', NULL, NULL, '1', 'supervisor', 1699350000000, NULL, 0, NULL);
-INSERT IGNORE INTO `sys_dict_data` VALUES (10008, 10000, 'dictData.match.suffix', 'SuffixMatch', 'match_type', NULL, NULL, '1', 'supervisor', 1699350000000, NULL, 0, NULL);
-
-
 SET FOREIGN_KEY_CHECKS = 1;

database/upgrade/upg_sys_dict_data1_i18n_zh.sql

@@ -125,11 +125,11 @@ REPLACE INTO `sys_dict_data` VALUES (1110, 1110, 'menu.fault.setRemark', '故障
 REPLACE INTO `sys_dict_data` VALUES (1111, 1111, 'menu.perfRemark', '性能目录', 'i18n_zh', NULL, NULL, '1', 'supervisor', 1700000000000, NULL, 0, NULL);
 REPLACE INTO `sys_dict_data` VALUES (1112, 1112, 'menu.perf.task', '任务管理', 'i18n_zh', NULL, NULL, '1', 'supervisor', 1700000000000, NULL, 0, NULL);
 REPLACE INTO `sys_dict_data` VALUES (1113, 1113, 'menu.perf.data', '性能数据', 'i18n_zh', NULL, NULL, '1', 'supervisor', 1700000000000, NULL, 0, NULL);
-REPLACE INTO `sys_dict_data` VALUES (1114, 1114, 'menu.perf.report', '性能报表', 'i18n_zh', NULL, NULL, '1', 'supervisor', 1700000000000, NULL, 0, NULL);
+REPLACE INTO `sys_dict_data` VALUES (1114, 1114, 'menu.perf.kpiOverView', '关键指标概览', 'i18n_zh', '', '', '1', 'supervisor', 1728640045875, '', 0, '');
 REPLACE INTO `sys_dict_data` VALUES (1115, 1115, 'menu.perf.threshold', '性能门限', 'i18n_zh', NULL, NULL, '1', 'supervisor', 1700000000000, NULL, 0, NULL);
-REPLACE INTO `sys_dict_data` VALUES (1116, 1116, 'menu.perf.kpi', '黄金指标', 'i18n_zh', NULL, NULL, '1', 'supervisor', 1700000000000, NULL, 0, NULL);
+REPLACE INTO `sys_dict_data` VALUES (1116, 1116, 'menu.perf.kpi', '关键指标', 'i18n_zh', NULL, NULL, '1', 'supervisor', 1700000000000, NULL, 0, NULL);
 REPLACE INTO `sys_dict_data` VALUES (1117, 1117, 'menu.perf.customTarget', '自定义指标', 'i18n_zh', NULL, NULL, '1', 'supervisor', 1700000000000, NULL, 0, NULL);
-REPLACE INTO `sys_dict_data` VALUES (1118, 1118, 'menu.perf.set', '性能通用设置', 'i18n_zh', NULL, NULL, '1', 'supervisor', 1700000000000, NULL, 0, NULL);
+REPLACE INTO `sys_dict_data` VALUES (1118, 1118, 'menu.perf.kpiKeyTarget', '关键指标报表', 'i18n_zh', '', '', '1', 'supervisor', 1728640045875, '', 0, '');
 REPLACE INTO `sys_dict_data` VALUES (1119, 1119, 'menu.mml', 'MML', 'i18n_zh', NULL, NULL, '1', 'supervisor', 1700000000000, NULL, 0, NULL);
 REPLACE INTO `sys_dict_data` VALUES (1120, 1120, 'menu.mml.ne', '网元操作', 'i18n_zh', NULL, NULL, '1', 'supervisor', 1700000000000, NULL, 0, NULL);
 REPLACE INTO `sys_dict_data` VALUES (1121, 1121, 'menu.mml.udm', 'UDM操作', 'i18n_zh', NULL, NULL, '1', 'supervisor', 1700000000000, NULL, 0, NULL);
@@ -137,11 +137,11 @@ REPLACE INTO `sys_dict_data` VALUES (1122, 1122, 'menu.mml.set', 'MML设置', 'i
 REPLACE INTO `sys_dict_data` VALUES (1123, 1123, 'menu.mml.omc', 'OMC操作', 'i18n_zh', NULL, NULL, '1', 'supervisor', 1700000000000, NULL, 0, NULL);
 REPLACE INTO `sys_dict_data` VALUES (1124, 1124, 'menu.perf.taskRemark', '任务管理菜单', 'i18n_zh', NULL, NULL, '1', 'supervisor', 1700000000000, NULL, 0, NULL);
 REPLACE INTO `sys_dict_data` VALUES (1125, 1125, 'menu.perf.dataRemark', '性能数据菜单', 'i18n_zh', NULL, NULL, '1', 'supervisor', 1700000000000, NULL, 0, NULL);
-REPLACE INTO `sys_dict_data` VALUES (1126, 1126, 'menu.perf.reportRemark', '性能报表菜单', 'i18n_zh', NULL, NULL, '1', 'supervisor', 1700000000000, NULL, 0, NULL);
+-- REPLACE INTO `sys_dict_data` VALUES (1126, 1126, 'menu.perf.kpiOverViewRemark', '性能报表菜单', 'i18n_zh', NULL, NULL, '1', 'supervisor', 1700000000000, NULL, 0, NULL);
 REPLACE INTO `sys_dict_data` VALUES (1127, 1127, 'menu.perf.thresholdRemark', '性能门限菜单', 'i18n_zh', NULL, NULL, '1', 'supervisor', 1700000000000, NULL, 0, NULL);
 REPLACE INTO `sys_dict_data` VALUES (1128, 1128, 'menu.perf.kpiRemark', '黄金指标菜单', 'i18n_zh', NULL, NULL, '1', 'supervisor', 1700000000000, NULL, 0, NULL);
 REPLACE INTO `sys_dict_data` VALUES (1129, 1129, 'menu.perf.customTargetRemark', '自定义指标菜单', 'i18n_zh', NULL, NULL, '1', 'supervisor', 1700000000000, NULL, 0, NULL);
-REPLACE INTO `sys_dict_data` VALUES (1130, 1130, 'menu.perf.setRemark', '性能通用设置菜单', 'i18n_zh', NULL, NULL, '1', 'supervisor', 1700000000000, NULL, 0, NULL);
+-- REPLACE INTO `sys_dict_data` VALUES (1130, 1130, 'menu.perf.setRemark', '性能通用设置菜单', 'i18n_zh', NULL, NULL, '1', 'supervisor', 1700000000000, NULL, 0, NULL);
 REPLACE INTO `sys_dict_data` VALUES (1131, 1131, 'menu.mmlRemark', 'MML管理目录', 'i18n_zh', NULL, NULL, '1', 'supervisor', 1700000000000, NULL, 0, NULL);
 REPLACE INTO `sys_dict_data` VALUES (1132, 1132, 'menu.mml.neRemark', '网元操作菜单', 'i18n_zh', NULL, NULL, '1', 'supervisor', 1700000000000, NULL, 0, NULL);
 REPLACE INTO `sys_dict_data` VALUES (1133, 1133, 'menu.mml.udmRemark', '网元UDM用户数据菜单', 'i18n_zh', NULL, NULL, '1', 'supervisor', 1700000000000, NULL, 0, NULL);
@@ -215,8 +215,8 @@ REPLACE INTO `sys_dict_data` VALUES (1426, 1426, 'dictData.trace.user', '用户
 -- REPLACE INTO `sys_dict_data` VALUES (1444, 1444, 'dictData.securityLogType.delete', '删除', 'i18n_zh', NULL, NULL, '1', 'supervisor', 1700000000000, NULL, 0, NULL);
 -- REPLACE INTO `sys_dict_data` VALUES (1445, 1445, 'dictData.securityLogType.lock', '锁定', 'i18n_zh', NULL, NULL, '1', 'supervisor', 1700000000000, NULL, 0, NULL);
 -- REPLACE INTO `sys_dict_data` VALUES (1446, 1446, 'dictData.securityLogType.unlock', '解锁', 'i18n_zh', NULL, NULL, '1', 'supervisor', 1700000000000, NULL, 0, NULL);
--- REPLACE INTO `sys_dict_data` VALUES (1447, 1447, 'dictData.securityLogType.reset', '重置', 'i18n_zh', NULL, NULL, '1', 'supervisor', 1700000000000, NULL, 0, NULL);
+REPLACE INTO `sys_dict_data` VALUES (1447, 1447, 'menu.tools.ping', '网络探测测试', 'i18n_zh', '', '', '1', 'supervisor', 1728640045875, '', 0, '');
--- REPLACE INTO `sys_dict_data` VALUES (1448, 1448, 'dictData.securityLogType.deactivate', '停用', 'i18n_zh', NULL, NULL, '1', 'supervisor', 1700000000000, NULL, 0, NULL);
+REPLACE INTO `sys_dict_data` VALUES (1448, 1448, 'menu.tools.iperf', '网络性能测试', 'i18n_zh', '', '', '1', 'supervisor', 1728640045875, '', 0, '');
 REPLACE INTO `sys_dict_data` VALUES (1449, 1449, 'dictData.jobSaveLog.no', '不记录', 'i18n_zh', NULL, NULL, '1', 'supervisor', 1700000000000, NULL, 0, NULL);
 REPLACE INTO `sys_dict_data` VALUES (1450, 1450, 'dictData.jobSaveLog.yes', '记录', 'i18n_zh', NULL, NULL, '1', 'supervisor', 1700000000000, NULL, 0, NULL);
 REPLACE INTO `sys_dict_data` VALUES (1451, 1451, 'dictData.neVersionStatus.upload', '已上传', 'i18n_zh', NULL, NULL, '1', 'supervisor', 1700000000000, NULL, 0, NULL);
@@ -246,9 +246,9 @@ REPLACE INTO `sys_dict_data` VALUES (1505, 1505, 'dictType.sys_yes_no', '系统
 REPLACE INTO `sys_dict_data` VALUES (1506, 1506, 'dictType.sys_oper_type', '操作类型', 'i18n_zh', NULL, NULL, '1', 'supervisor', 1700000000000, NULL, 0, NULL);
 REPLACE INTO `sys_dict_data` VALUES (1507, 1507, 'dictType.sys_common_status', '系统状态', 'i18n_zh', NULL, NULL, '1', 'supervisor', 1700000000000, NULL, 0, NULL);
 REPLACE INTO `sys_dict_data` VALUES (1508, 1508, 'dictType.trace_type', '跟踪类型', 'i18n_zh', NULL, NULL, '1', 'supervisor', 1700000000000, NULL, 0, NULL);
--- REPLACE INTO `sys_dict_data` VALUES (1509, 1509, 'dictType.operation_log_type', '操作日志类型', 'i18n_zh', NULL, NULL, '1', 'supervisor', 1700000000000, NULL, 0, NULL);
+REPLACE INTO `sys_dict_data` VALUES (1509, 1509, 'menu.tools.ps', '进程运行程序', 'i18n_zh', '', '', '1', 'supervisor', 1728640045875, '', 0, '');
 REPLACE INTO `sys_dict_data` VALUES (1510, 1510, 'dictType.alarm_status', '告警日志类型', 'i18n_zh', NULL, NULL, '1', 'supervisor', 1700000000000, NULL, 0, NULL);
--- REPLACE INTO `sys_dict_data` VALUES (1511, 1511, 'dictType.security_log_type', '安全日志类型', 'i18n_zh', NULL, NULL, '1', 'supervisor', 1700000000000, NULL, 0, NULL);
+REPLACE INTO `sys_dict_data` VALUES (1511, 1511, 'menu.tools.net', '进程网络连接', 'i18n_zh', '', '', '1', 'supervisor', 1728640045875, '', 0, '');
 REPLACE INTO `sys_dict_data` VALUES (1512, 1512, 'dictType.ne_version_status', '网元软件版本状态', 'i18n_zh', NULL, NULL, '1', 'supervisor', 1700000000000, NULL, 0, NULL);
 REPLACE INTO `sys_dict_data` VALUES (1513, 1513, 'dictType.i18n_en', '多语言-英文', 'i18n_zh', NULL, NULL, '1', 'supervisor', 1700000000000, NULL, 0, NULL);
 REPLACE INTO `sys_dict_data` VALUES (1514, 1514, 'dictType.i18n_zh', '多语言-中文', 'i18n_zh', NULL, NULL, '1', 'supervisor', 1700000000000, NULL, 0, NULL);
@@ -598,7 +598,7 @@ REPLACE INTO `sys_dict_data` VALUES (2080, 2080, 'log.operate.title.ws', 'WS会
 REPLACE INTO `sys_dict_data` VALUES (2081, 2081, 'log.operate.title.neHost', '网元主机', 'i18n_zh', '', '', '1', 'supervisor', 1705550000000, '', 0, '');
 REPLACE INTO `sys_dict_data` VALUES (2082, 2082, 'neHost.noData', '没有可访问主机信息数据！', 'i18n_zh', '', '', '1', 'supervisor', 1705550000000, '', 0, '');
 REPLACE INTO `sys_dict_data` VALUES (2083, 2083, 'neHost.errKeyExists', '主机信息操作【{name}】失败，同组内名称已存在', 'i18n_zh', '', '', '1', 'supervisor', 1705550000000, '', 0, '');
-REPLACE INTO `sys_dict_data` VALUES (2084, 2084, 'neHost.errByHostInfo', '连接主机失败，请检查连接参数后重试', 'i18n_zh', '', '', '1', 'supervisor', 1705550000000, '', 0, '');
+REPLACE INTO `sys_dict_data` VALUES (2084, 2084, 'neHost.errByHostInfo', '连接失败，请检查连接参数后重试', 'i18n_zh', '', '', '1', 'supervisor', 1705550000000, '', 0, '');
 REPLACE INTO `sys_dict_data` VALUES (2085, 2085, 'dictType.ne_host_type', '网元主机连接类型', 'i18n_zh', '', '', '1', 'supervisor', 1705550000000, '', 0, '');
 REPLACE INTO `sys_dict_data` VALUES (2086, 2086, 'dictType.ne_host_groupId', '网元主机分组', 'i18n_zh', '', '', '1', 'supervisor', 1705550000000, '', 0, '');
 REPLACE INTO `sys_dict_data` VALUES (2087, 2087, 'dictType.ne_host_authMode', '网元主机认证模式', 'i18n_zh', '', '', '1', 'supervisor', 1705550000000, '', 0, '');
@@ -663,8 +663,8 @@ REPLACE INTO `sys_dict_data` VALUES (2145, 2145, 'menu.system.user.editPost', '
 REPLACE INTO `sys_dict_data` VALUES (2146, 2146, 'menu.dashboard.smscCDR', '短信话单', 'i18n_zh', '', '', '1', 'supervisor', 1717051745866, '', 0, '');
 REPLACE INTO `sys_dict_data` VALUES (2147, 2147, 'log.operate.title.smscCDR', '短信话单', 'i18n_zh', '', '', '1', 'supervisor', 1705550000000, '', 0, '');
 REPLACE INTO `sys_dict_data` VALUES (2148, 2148, 'menu.trace.pcapFile', '信令抓包文件', 'i18n_zh', '', '', '1', 'supervisor', 1705550000000, '', 0, '');
--- REPLACE INTO `sys_dict_data` VALUES (2149, 2149, 'dictData.udm_sub_cn_type.2', '4G', 'i18n_zh', '', '', '1', 'supervisor', 1705550000000, '', 0, '');
+REPLACE INTO `sys_dict_data` VALUES (2149, 2149, 'menu.trace.taskAnalyze', '跟踪数据分析', 'i18n_zh', '', '', '1', 'supervisor', 1705550000000, '', 0, '');
--- REPLACE INTO `sys_dict_data` VALUES (2150, 2150, 'dictData.udm_sub_cn_type.3', '5G&4G', 'i18n_zh', '', '', '1', 'supervisor', 1705550000000, '', 0, '');
+REPLACE INTO `sys_dict_data` VALUES (2150, 2150, 'job.ne_data_udm', '网元数据-UDM数据刷新同步', 'i18n_zh', '', '', '1', 'supervisor', 1730173767412, '', 0, '');
 REPLACE INTO `sys_dict_data` VALUES (2151, 2151, 'menu.system.setting.doc', '系统使用文档', 'i18n_zh', '', '', '1', 'supervisor', 1705550000000, '', 0, '');
 REPLACE INTO `sys_dict_data` VALUES (2152, 2152, 'menu.system.setting.official', '官网链接', 'i18n_zh', '', '', '1', 'supervisor', 1705550000000, '', 0, '');
 REPLACE INTO `sys_dict_data` VALUES (2153, 2153, 'menu.system.setting.lock', '锁屏操作', 'i18n_zh', '', '', '1', 'supervisor', 1705550000000, '', 0, '');
@@ -703,49 +703,4 @@ REPLACE INTO `sys_dict_data` VALUES (2185, 2185, 'config.sys.homePageRemark', '
 REPLACE INTO `sys_dict_data` VALUES (2186, 2186, 'menu.config.neOverview', '网元概览', 'i18n_zh', '', '', '1', 'supervisor', 1721902269805, '', 0, '');
 REPLACE INTO `sys_dict_data` VALUES (2187, 2187, 'menu.config.neOverviewRemark', '显示所有网元状态配置和license等概览信息', 'i18n_zh', '', '', '1', 'supervisor', 1721902269805, '', 0, '');
 
--- multi-tenancy
-REPLACE INTO `sys_dict_data` VALUES (11000, 11000, 'menu.security.tenant', '租户管理', 'i18n_zh', NULL, NULL, '1', 'supervisor', 1700000000000, NULL, 0, NULL);
-REPLACE INTO `sys_dict_data` VALUES (11001, 11000, 'menu.security.tenantRemark', '租户管理菜单', 'i18n_zh', NULL, NULL, '1', 'supervisor', 1700000000000, NULL, 0, NULL);
-REPLACE INTO `sys_dict_data` VALUES (11002, 11000, 'menu.common.batchadd', '批量增加', 'i18n_zh', NULL, NULL, '1', 'supervisor', 1700000000000, NULL, 0, NULL);
-REPLACE INTO `sys_dict_data` VALUES (11003, 11000, 'menu.common.checkdel', '勾选删除', 'i18n_zh', NULL, NULL, '1', 'supervisor', 1700000000000, NULL, 0, NULL);
-REPLACE INTO `sys_dict_data` VALUES (11004, 11000, 'menu.common.loaddata', '加载数据', 'i18n_zh', NULL, NULL, '1', 'supervisor', 1700000000000, NULL, 0, NULL);
-REPLACE INTO `sys_dict_data` VALUES (11005, 11000, 'menu.common.export', '导出', 'i18n_zh', NULL, NULL, '1', 'supervisor', 1700000000000, NULL, 0, NULL);
-REPLACE INTO `sys_dict_data` VALUES (11006, 11000, 'menu.common.checkexport', '勾选导出', 'i18n_zh', NULL, NULL, '1', 'supervisor', 1700000000000, NULL, 0, NULL);
-REPLACE INTO `sys_dict_data` VALUES (11007, 11000, 'menu.common.batchdel', '批量删除', 'i18n_zh', NULL, NULL, '1', 'supervisor', 1700000000000, NULL, 0, NULL);
-REPLACE INTO `sys_dict_data` VALUES (11008, 11000, 'menu.common.overview', '概览', 'i18n_zh', NULL, NULL, '1', 'supervisor', 1700000000000, NULL, 0, NULL);
-REPLACE INTO `sys_dict_data` VALUES (11009, 11000, 'dictData.tenancy.imsi', 'SIM卡', 'i18n_zh', NULL, NULL, '1', 'supervisor', 1700000000000, NULL, 0, NULL);
-REPLACE INTO `sys_dict_data` VALUES (11010, 11000, 'dictData.tenancy.apn', '接入点', 'i18n_zh', NULL, NULL, '1', 'supervisor', 1700000000000, NULL, 0, NULL);
-REPLACE INTO `sys_dict_data` VALUES (11011, 11000, 'dictData.tenancy.slice', '网络切片', 'i18n_zh', NULL, NULL, '1', 'supervisor', 1700000000000, NULL, 0, NULL);
-REPLACE INTO `sys_dict_data` VALUES (11012, 11000, 'dictData.tenancy.ne', 'UPF', 'i18n_zh', NULL, NULL, '1', 'supervisor', 1700000000000, NULL, 0, NULL);
-REPLACE INTO `sys_dict_data` VALUES (11013, 11000, 'dictData.tenancy.radio', '无线基站', 'i18n_zh', NULL, NULL, '1', 'supervisor', 1700000000000, NULL, 0, NULL);
-REPLACE INTO `sys_dict_data` VALUES (11014, 11000, 'role.tenant', '租户', 'i18n_zh', NULL, NULL, '1', 'supervisor', 1700000000000, NULL, 0, NULL);
-REPLACE INTO `sys_dict_data` VALUES (11015, 11000, 'log.operate.title.sysTenant', '租户管理', 'i18n_zh', NULL, NULL, '1', 'supervisor', 1700000000000, NULL, 0, NULL);
-REPLACE INTO `sys_dict_data` VALUES (11016, 11000, 'menu.tenant.overview', '概览', 'i18n_zh', NULL, NULL, '1', 'supervisor', 1700000000000, NULL, 0, NULL);
-REPLACE INTO `sys_dict_data` VALUES (11017, 11000, 'menu.tenant.subscriber', '签约用户', 'i18n_zh', NULL, NULL, '1', 'supervisor', 1700000000000, NULL, 0, NULL);
-REPLACE INTO `sys_dict_data` VALUES (11018, 11000, 'menu.tenant.onlineUE', '在线数据会话', 'i18n_zh', NULL, NULL, '1', 'supervisor', 1700000000000, NULL, 0, NULL);
-REPLACE INTO `sys_dict_data` VALUES (11019, 11000, 'menu.tenant.radio', '基站信息', 'i18n_zh', NULL, NULL, '1', 'supervisor', 1700000000000, NULL, 0, NULL);
-REPLACE INTO `sys_dict_data` VALUES (11020, 11000, 'menu.tenant.imsCDR', '语音话单', 'i18n_zh', NULL, NULL, '1', 'supervisor', 1700000000000, NULL, 0, NULL);
-REPLACE INTO `sys_dict_data` VALUES (11021, 11000, 'menu.tenant.smfCDR', '数据话单', 'i18n_zh', NULL, NULL, '1', 'supervisor', 1700000000000, NULL, 0, NULL);
-REPLACE INTO `sys_dict_data` VALUES (11022, 11000, 'menu.tenant.ueEvent', '终端事件', 'i18n_zh', NULL, NULL, '1', 'supervisor', 1700000000000, NULL, 0, NULL);
-REPLACE INTO `sys_dict_data` VALUES (11023, 11000, 'menu.tenant.amfUE', '5G终端事件', 'i18n_zh', NULL, NULL, '1', 'supervisor', 1700000000000, NULL, 0, NULL);
-REPLACE INTO `sys_dict_data` VALUES (11024, 11000, 'menu.tenant.mmeUE', '4G终端事件', 'i18n_zh', NULL, NULL, '1', 'supervisor', 1700000000000, NULL, 0, NULL);
-REPLACE INTO `sys_dict_data` VALUES (11025, 11000, 'menu.tenant.log', '操作日志', 'i18n_zh', NULL, NULL, '1', 'supervisor', 1700000000000, NULL, 0, NULL);
-REPLACE INTO `sys_dict_data` VALUES (11026, 11000, 'dictData.match.exact', '精确匹配', 'i18n_zh', NULL, NULL, '1', 'supervisor', 1700000000000, NULL, 0, NULL);
-REPLACE INTO `sys_dict_data` VALUES (11027, 11000, 'dictData.match.fuzzy', '模糊匹配', 'i18n_zh', NULL, NULL, '1', 'supervisor', 1700000000000, NULL, 0, NULL);
-REPLACE INTO `sys_dict_data` VALUES (11028, 11000, 'dictData.match.prefix', '前缀匹配', 'i18n_zh', NULL, NULL, '1', 'supervisor', 1700000000000, NULL, 0, NULL);
-REPLACE INTO `sys_dict_data` VALUES (11029, 11000, 'dictData.match.suffix', '后缀匹配', 'i18n_zh', NULL, NULL, '1', 'supervisor', 1700000000000, NULL, 0, NULL);
-REPLACE INTO `sys_dict_data` VALUES (11030, 11000, 'menu.tenant.cdr', '话单', 'i18n_zh', NULL, NULL, '1', 'supervisor', 1700000000000, NULL, 0, NULL);
-REPLACE INTO `sys_dict_data` VALUES (11031, 11000, 'menu.tenant.onlineIMS', '在线语音会话', 'i18n_zh', NULL, NULL, '1', 'supervisor', 1700000000000, NULL, 0, NULL);
-REPLACE INTO `sys_dict_data` VALUES (11032, 11000, 'tenant.noData', '没有可访问的租户数据！', 'i18n_zh', NULL, NULL, '1', 'supervisor', 1700000000000, NULL, 0, NULL);
-REPLACE INTO `sys_dict_data` VALUES (11033, 11000, 'tenant.errParentDelFlag', '上级租户【{name}】已删除，不允许新增', 'i18n_zh', NULL, NULL, '1', 'supervisor', 1700000000000, NULL, 0, NULL);
-REPLACE INTO `sys_dict_data` VALUES (11034, 11000, 'tenant.errParentStatus', '上级租户【{name}】停用，不允许新增', 'i18n_zh', NULL, NULL, '1', 'supervisor', 1700000000000, NULL, 0, NULL);
-REPLACE INTO `sys_dict_data` VALUES (11035, 11000, 'tenant.errNameExists', '操作租户【{name}】失败，租户名称已存在', 'i18n_zh', NULL, NULL, '1', 'supervisor', 1700000000000, NULL, 0, NULL);
-REPLACE INTO `sys_dict_data` VALUES (11036, 11000, 'tenant.errParentID', '操作租户【{name}】失败，上级租户不能是自己', 'i18n_zh', NULL, NULL, '1', 'supervisor', 1700000000000, NULL, 0, NULL);
-REPLACE INTO `sys_dict_data` VALUES (11037, 11000, 'tenant.errHasChildUse', '操作失败，该租户包含未停用的租赁资产数量：{num}', 'i18n_zh', NULL, NULL, '1', 'supervisor', 1700000000000, NULL, 0, NULL);
-REPLACE INTO `sys_dict_data` VALUES (11038, 11000, 'tenant.errHasUserUse', '不允许删除，租户已分配用户数：{num}', 'i18n_zh', NULL, NULL, '1', 'supervisor', 1700000000000, NULL, 0, NULL);
-REPLACE INTO `sys_dict_data` VALUES (11039, 11000, 'tenant.errAssetExists', '租赁资产[{type}:{key}]与现有的资产有冲突', 'i18n_zh', NULL, NULL, '1', 'supervisor', 1700000000000, NULL, 0, NULL);
-REPLACE INTO `sys_dict_data` VALUES (11040, 11000, 'menu.tenant.smscCDR', '短信话单', 'i18n_zh', NULL, NULL, '1', 'supervisor', 1700000000000, NULL, 0, NULL);
-REPLACE INTO `sys_dict_data` VALUES (11041, 11000, 'log.operate.export.tenantName', '租户名称', 'i18n_zh', NULL, NULL, '1', 'supervisor', 1700000000000, NULL, 0, NULL);
-REPLACE INTO `sys_dict_data` VALUES (11042, 11000, 'menu.tenant.session', '会话', 'i18n_zh', NULL, NULL, '1', 'supervisor', 1700000000000, NULL, 0, NULL);
-
 SET FOREIGN_KEY_CHECKS = 1;

database/upgrade/upg_sys_dict_data2_i18n_en.sql

@@ -659,7 +659,7 @@ REPLACE INTO `sys_dict_data` VALUES (4146, 4146, 'menu.dashboard.smscCDR', 'SMS
 REPLACE INTO `sys_dict_data` VALUES (4147, 4147, 'log.operate.title.smscCDR', 'SMS CDR', 'i18n_en', '', '', '1', 'supervisor', 1705550000000, '', 0, '');
 REPLACE INTO `sys_dict_data` VALUES (4148, 4148, 'menu.trace.pcapFile', 'Signaling Capture File', 'i18n_en', '', '', '1', 'supervisor', 1718441035866, '', 0, '');
 REPLACE INTO `sys_dict_data` VALUES (4149, 4149, 'menu.trace.taskAnalyze', 'Tracking Data Analysis', 'i18n_en', '', '', '1', 'supervisor', 1718441035866, '', 0, '');
--- REPLACE INTO `sys_dict_data` VALUES (4150, 4150, 'dictData.udm_sub_cn_type.3', '5G&4G', 'i18n_en', '', '', '1', 'supervisor', 1718441035866, '', 0, '');
+REPLACE INTO `sys_dict_data` VALUES (4150, 4150, 'job.ne_data_udm', 'NE Data Sync UDM', 'i18n_en', '', '', '1', 'supervisor', 1730173767412, '', 0, '');
 REPLACE INTO `sys_dict_data` VALUES (4151, 4151, 'menu.system.setting.doc', 'System User Documentation', 'i18n_en', '', '', '1', 'supervisor', 1705550000000, '', 0, '');
 REPLACE INTO `sys_dict_data` VALUES (4152, 4152, 'menu.system.setting.official', 'Official Website', 'i18n_en', '', '', '1', 'supervisor', 1705550000000, '', 0, '');
 REPLACE INTO `sys_dict_data` VALUES (4153, 4153, 'menu.system.setting.lock', 'Lockscreen Operation', 'i18n_en', '', '', '1', 'supervisor', 1705550000000, '', 0, '');
@@ -698,49 +698,4 @@ REPLACE INTO `sys_dict_data` VALUES (4185, 4185, 'config.sys.homePageRemark', 'S
 REPLACE INTO `sys_dict_data` VALUES (4186, 4186, 'menu.config.neOverview', 'NE Overview', 'i18n_en', '', '', '1', 'supervisor', 1721902269805, '', 0, '');
 REPLACE INTO `sys_dict_data` VALUES (4187, 4187, 'menu.config.neOverviewRemark', 'Displays overview information such as status, configuration and license of all network elements', 'i18n_en', '', '', '1', 'supervisor', 1721902269805, '', 0, '');
 
--- 多租户
-REPLACE INTO `sys_dict_data` VALUES (14000, 14000, 'menu.security.tenant', 'Tenant Management', 'i18n_en', '', '', '1', 'supervisor', 1705550000000, '', 0, '');
-REPLACE INTO `sys_dict_data` VALUES (14001, 14000, 'menu.security.tenantRemark', 'Tenant Management Menu', 'i18n_en', '', '', '1', 'supervisor', 1705550000000, '', 0, '');
-REPLACE INTO `sys_dict_data` VALUES (14002, 14000, 'menu.common.batchadd', 'Batch Add', 'i18n_en', NULL, NULL, '1', 'supervisor', 1700000000000, NULL, 0, NULL);
-REPLACE INTO `sys_dict_data` VALUES (14003, 14000, 'menu.common.checkdel', 'Check Delete', 'i18n_en', NULL, NULL, '1', 'supervisor', 1700000000000, NULL, 0, NULL);
-REPLACE INTO `sys_dict_data` VALUES (14004, 14000, 'menu.common.loaddata', 'Load Data', 'i18n_en', NULL, NULL, '1', 'supervisor', 1700000000000, NULL, 0, NULL);
-REPLACE INTO `sys_dict_data` VALUES (14005, 14000, 'menu.common.export', 'Export', 'i18n_en', NULL, NULL, '1', 'supervisor', 1700000000000, NULL, 0, NULL);
-REPLACE INTO `sys_dict_data` VALUES (14006, 14000, 'menu.common.checkexport', 'Check Export', 'i18n_en', NULL, NULL, '1', 'supervisor', 1700000000000, NULL, 0, NULL);
-REPLACE INTO `sys_dict_data` VALUES (14007, 14000, 'menu.common.batchdel', 'Batch Delete', 'i18n_en', NULL, NULL, '1', 'supervisor', 1700000000000, NULL, 0, NULL);
-REPLACE INTO `sys_dict_data` VALUES (14008, 14000, 'menu.common.overview', 'Overview', 'i18n_en', NULL, NULL, '1', 'supervisor', 1700000000000, NULL, 0, NULL);
-REPLACE INTO `sys_dict_data` VALUES (14009, 14000, 'dictData.tenancy.imsi', 'SIM Card', 'i18n_en', NULL, NULL, '1', 'supervisor', 1700000000000, NULL, 0, NULL);
-REPLACE INTO `sys_dict_data` VALUES (14010, 14000, 'dictData.tenancy.apn', 'Access Point Name', 'i18n_en', NULL, NULL, '1', 'supervisor', 1700000000000, NULL, 0, NULL);
-REPLACE INTO `sys_dict_data` VALUES (14011, 14000, 'dictData.tenancy.slice', 'Network Slice', 'i18n_en', NULL, NULL, '1', 'supervisor', 1700000000000, NULL, 0, NULL);
-REPLACE INTO `sys_dict_data` VALUES (14012, 14000, 'dictData.tenancy.ne', 'UPF', 'i18n_en', NULL, NULL, '1', 'supervisor', 1700000000000, NULL, 0, NULL);
-REPLACE INTO `sys_dict_data` VALUES (14013, 14000, 'dictData.tenancy.radio', 'Radio', 'i18n_en', NULL, NULL, '1', 'supervisor', 1700000000000, NULL, 0, NULL);
-REPLACE INTO `sys_dict_data` VALUES (14014, 14000, 'role.tenant', 'Tenants', 'i18n_en', NULL, NULL, '1', 'supervisor', 1700000000000, NULL, 0, NULL);
-REPLACE INTO `sys_dict_data` VALUES (14015, 14000, 'log.operate.title.sysTenant', 'Tenant Management', 'i18n_en', NULL, NULL, '1', 'supervisor', 1700000000000, NULL, 0, NULL);
-REPLACE INTO `sys_dict_data` VALUES (14016, 14000, 'menu.tenant.overview', 'Overview', 'i18n_en', NULL, NULL, '1', 'supervisor', 1700000000000, NULL, 0, NULL);
-REPLACE INTO `sys_dict_data` VALUES (14017, 14000, 'menu.tenant.subscriber', 'Subscribers', 'i18n_en', NULL, NULL, '1', 'supervisor', 1700000000000, NULL, 0, NULL);
-REPLACE INTO `sys_dict_data` VALUES (14018, 14000, 'menu.tenant.onlineUE', 'Online Data Sessions', 'i18n_en', NULL, NULL, '1', 'supervisor', 1700000000000, NULL, 0, NULL);
-REPLACE INTO `sys_dict_data` VALUES (14019, 14000, 'menu.tenant.radio', 'Radio Information', 'i18n_en', NULL, NULL, '1', 'supervisor', 1700000000000, NULL, 0, NULL);
-REPLACE INTO `sys_dict_data` VALUES (14020, 14000, 'menu.tenant.imsCDR', 'Voice CDR', 'i18n_en', NULL, NULL, '1', 'supervisor', 1700000000000, NULL, 0, NULL);
-REPLACE INTO `sys_dict_data` VALUES (14021, 14000, 'menu.tenant.smfCDR', 'Data CDR', 'i18n_en', NULL, NULL, '1', 'supervisor', 1700000000000, NULL, 0, NULL);
-REPLACE INTO `sys_dict_data` VALUES (14022, 14000, 'menu.tenant.ueEvent', 'UE Event', 'i18n_en', NULL, NULL, '1', 'supervisor', 1700000000000, NULL, 0, NULL);
-REPLACE INTO `sys_dict_data` VALUES (14023, 14000, 'menu.tenant.amfUE', '5G UE Event', 'i18n_en', NULL, NULL, '1', 'supervisor', 1700000000000, NULL, 0, NULL);
-REPLACE INTO `sys_dict_data` VALUES (14024, 14000, 'menu.tenant.mmeUE', '4G UE Event', 'i18n_en', NULL, NULL, '1', 'supervisor', 1700000000000, NULL, 0, NULL);
-REPLACE INTO `sys_dict_data` VALUES (14025, 14000, 'menu.tenant.log', 'Operation Logs', 'i18n_en', NULL, NULL, '1', 'supervisor', 1700000000000, NULL, 0, NULL);
-REPLACE INTO `sys_dict_data` VALUES (14026, 14000, 'dictData.match.exact', 'Exact Match', 'i18n_en', NULL, NULL, '1', 'supervisor', 1700000000000, NULL, 0, NULL);
-REPLACE INTO `sys_dict_data` VALUES (14027, 14000, 'dictData.match.fuzzy', 'Fuzzy Match', 'i18n_en', NULL, NULL, '1', 'supervisor', 1700000000000, NULL, 0, NULL);
-REPLACE INTO `sys_dict_data` VALUES (14028, 14000, 'dictData.match.prefix', 'Prefix Match', 'i18n_en', NULL, NULL, '1', 'supervisor', 1700000000000, NULL, 0, NULL);
-REPLACE INTO `sys_dict_data` VALUES (14029, 14000, 'dictData.match.suffix', 'Suffix Match', 'i18n_en', NULL, NULL, '1', 'supervisor', 1700000000000, NULL, 0, NULL);
-REPLACE INTO `sys_dict_data` VALUES (14030, 14000, 'menu.tenant.cdr', 'CDR', 'i18n_en', NULL, NULL, '1', 'supervisor', 1700000000000, NULL, 0, NULL);
-REPLACE INTO `sys_dict_data` VALUES (14031, 14000, 'menu.tenant.onlineIMS', 'Online Voice Sessions', 'i18n_en', NULL, NULL, '1', 'supervisor', 1700000000000, NULL, 0, NULL);
-REPLACE INTO `sys_dict_data` VALUES (14032, 14000, 'tenant.noData', 'There is no accessible tenant data', 'i18n_en', NULL, NULL, '1', 'supervisor', 1700000000000, NULL, 0, NULL);
-REPLACE INTO `sys_dict_data` VALUES (14033, 14000, 'tenant.errParentDelFlag', 'The parent tenant [{name}] has been deleted and is not allowed to be added', 'i18n_en', NULL, NULL, '1', 'supervisor', 1700000000000, NULL, 0, NULL);
-REPLACE INTO `sys_dict_data` VALUES (14034, 14000, 'tenant.errParentStatus', 'Parent tenant [{name}] is deactivated, additions are not allowed', 'i18n_en', NULL, NULL, '1', 'supervisor', 1700000000000, NULL, 0, NULL);
-REPLACE INTO `sys_dict_data` VALUES (14035, 14000, 'tenant.errNameExists', 'Manipulate tenant [{name}] failed, tenant name already exists', 'i18n_en', NULL, NULL, '1', 'supervisor', 1700000000000, NULL, 0, NULL);
-REPLACE INTO `sys_dict_data` VALUES (14036, 14000, 'tenant.errParentID', 'Failed to operate tenant [{name}], the parent tenant cannot be itself', 'i18n_en', NULL, NULL, '1', 'supervisor', 1700000000000, NULL, 0, NULL);
-REPLACE INTO `sys_dict_data` VALUES (14037, 14000, 'tenant.errHasChildUse', 'Operation failed, the tenant contains active asset number: {num}', 'i18n_en', NULL, NULL, '1', 'supervisor', 1700000000000, NULL, 0, NULL);
-REPLACE INTO `sys_dict_data` VALUES (14038, 14000, 'tenant.errHasUserUse', 'Deletion is not allowed, number of users the tenant has been assigned to: {num}', 'i18n_en', NULL, NULL, '1', 'supervisor', 1700000000000, NULL, 0, NULL);
-REPLACE INTO `sys_dict_data` VALUES (14039, 14000, 'tenant.errAssetExists', 'There is a conflict between tenancy asset[{type}:{key}] and a existing asset', 'i18n_en', NULL, NULL, '1', 'supervisor', 1700000000000, NULL, 0, NULL);
-REPLACE INTO `sys_dict_data` VALUES (14040, 14000, 'menu.tenant.smscCDR', 'SMS CDR', 'i18n_en', NULL, NULL, '1', 'supervisor', 1700000000000, NULL, 0, NULL);
-REPLACE INTO `sys_dict_data` VALUES (14041, 14000, 'log.operate.export.tenantName', 'Tenant Name', 'i18n_en', NULL, NULL, '1', 'supervisor', 1700000000000, NULL, 0, NULL);
-REPLACE INTO `sys_dict_data` VALUES (14042, 14000, 'menu.tenant.session', 'Session', 'i18n_en', NULL, NULL, '1', 'supervisor', 1700000000000, NULL, 0, NULL);
-
 SET FOREIGN_KEY_CHECKS = 1;

database/upgrade/upg_sys_dict_type.sql

@@ -55,8 +55,4 @@ INSERT IGNORE INTO `sys_dict_type` VALUES (122, 'dictType.ne_info_status', 'ne_i
 INSERT IGNORE INTO `sys_dict_type` VALUES (123, 'dictType.ne_license_status', 'ne_license_status', '1', 'supervisor', 1702020000000, '', 0, '');
 INSERT IGNORE INTO `sys_dict_type` VALUES (124, 'dictType.cdr_cause_code', 'cdr_cause_code', '1', 'supervisor', 1725877564156, '', 0, '');
 
--- 多租户
-INSERT IGNORE INTO `sys_dict_type` VALUES (10000, 'dictType.tenancy_type', 'tenancy_type', '1', 'supervisor', 1702020000000, '', 0, '');
-INSERT IGNORE INTO `sys_dict_type` VALUES (10001, 'dictType.match_type', 'match_type', '1', 'supervisor', 1702020000000, '', 0, '');
-
 SET FOREIGN_KEY_CHECKS = 1;

database/upgrade/upg_sys_job.sql

@@ -34,6 +34,7 @@ MODIFY COLUMN `target_params` varchar(2048) CHARACTER SET utf8mb4 COLLATE utf8mb
 
 REPLACE INTO `sys_job` VALUES (1, 'job.monitor_sys_resource', 'SYSTEM', 'monitor_sys_resource', '{\"interval\":5}', '0 0/5 * * * ?', '3', '0', '1', '0', 'supervisor', 1698478134839, 'supervisor', 1700571615807, 'job.monitor_sys_resource_remark');
 REPLACE INTO `sys_job` VALUES (2, 'job.ne_config_backup', 'SYSTEM', 'ne_config_backup', '', '0 30 0 * * ?', '3', '0', '1', '1', 'supervisor', 1698478134839, 'supervisor', 1700571615807, 'job.ne_config_backup_remark');
+REPLACE INTO `sys_job` VALUES (3, 'job.ne_data_udm', 'SYSTEM', 'ne_data_udm', '', '0 0 0/2 * * ?', '3', '0', '1', '1', 'supervisor', 1730173767412, '', 0, '');
 REPLACE INTO `sys_job` VALUES (4, 'job.delExpiredNeBackup', 'SYSTEM', 'delExpiredNeBackup', '{\"duration\":60}', '0 20 0 * * ?', '3', '0', '0', '1', 'supervisor', 1698478134840, NULL, 0, 'job.delExpiredNeBackupRemark');
 REPLACE INTO `sys_job` VALUES (5, 'job.deleteExpiredAlarmRecord', 'SYSTEM', 'deleteExpiredRecord', '{\"duration\":90,\"tableName\":\"alarm\",\"colName\":\"event_time\",\"extras\":\"alarm_status=\'0\'\"}', '0 10 0 * * ?', '3', '0', '1', '1', 'supervisor', 1698478134841, NULL, 0, 'job.deleteExpiredAlarmRecordRemark');
 REPLACE INTO `sys_job` VALUES (6, 'job.deleteExpiredKpiRecord', 'SYSTEM', 'deleteExpiredRecord', '{\"duration\":30,\"tableName\":\"gold_kpi\",\"colName\":\"date\"}', '0 15 0 * * ?', '3', '0', '1', '1', 'supervisor', 1698478134842, 'supervisor', 1700570673113, 'job.deleteExpiredKpiRecordRemark');
@@ -41,7 +42,7 @@ REPLACE INTO `sys_job` VALUES (7, 'job.backupEtcFromNE', 'SYSTEM', 'backupEtcFro
 REPLACE INTO `sys_job` VALUES (8, 'job.deleteExpiredNeStateRecord', 'SYSTEM', 'deleteExpiredRecord', '{\"duration\":1,\"tableName\":\"ne_state\",\"colName\":\"timestamp\"}', '0 25 0 * * ?', '3', '0', '1', '1', 'supervisor', 1698478134842, 'admin', 1703668901929, 'job.deleteExpiredNeStateRecordRemark');
 REPLACE INTO `sys_job` VALUES (9, 'job.getStateFromNE', 'SYSTEM', 'getStateFromNE', '', '0/10 * * * * ?', '3', '0', '0', '0', 'supervisor', 1698478134842, 'admin', 1713231120503, 'job.getStateFromNERemark');
 REPLACE INTO `sys_job` VALUES (10, 'job.genNeStateAlarm', 'SYSTEM', 'genNeStateAlarm', '{\"alarmID\":\"HXEMSSM10000\",\"alarmCode\":10000,\"alarmTitle\":\"The system state is abnormal\",\"neType\":\"OMC\",\"alarmType\":\"EquipmentAlarm\",\"origSeverity\": \"Major\",\"objectName\":\"EMS;SystemManagement;Heartbeat\",\"objectType\":\"SystemState\",\"specificProblem\":\"Alarm cause: the system state of target NE has not been received for {threshold} seconds\", \"specificProblemID\":\"AC10000\",\"threshold\":30}', '0/5 * * * * ?', '3', '0', '0', '0', 'supervisor', 1698478134842, 'admin', 1713781643031, 'job.genNeStateAlarmRemark');
-REPLACE INTO `sys_job` VALUES (11, 'job.exportOperateLog', 'SYSTEM', 'exportTable', '{\"duration\":1,\"tableName\":\"sys_log_operate\",\"timeCol\":\"oper_time\",\"timeUnit\":\"milli\",\"columns\":\"oper_id,omc_get_dict_value(title, \\\"i18n_en\\\") as title,business_type,method,request_method,operator_type,oper_name,dept_name,oper_url,oper_ip,oper_location,oper_param,oper_msg,status,oper_time,cost_time,tenant_id\",\"extras\":\"\",\"filePath\":\"/usr/local/omc/backup/operate_log\"}', '0 0 0/1 * * ?', '3', '0', '1', '1', 'supervisor', 1698478134842, 'admin', 1724833786290, 'job.exportOperateLog');
+REPLACE INTO `sys_job` VALUES (11, 'job.exportOperateLog', 'SYSTEM', 'exportTable', '{\"duration\":1,\"tableName\":\"sys_log_operate\",\"timeCol\":\"oper_time\",\"timeUnit\":\"milli\",\"columns\":\"oper_id,omc_get_dict_value(title, \\\"i18n_en\\\") as title,business_type,method,request_method,operator_type,oper_name,dept_name,oper_url,oper_ip,oper_location,oper_param,oper_msg,status,oper_time,cost_time\",\"extras\":\"\",\"filePath\":\"/usr/local/omc/backup/operate_log\"}', '0 0 0/1 * * ?', '3', '0', '1', '1', 'supervisor', 1698478134842, 'admin', 1724833786290, 'job.exportOperateLog');
 REPLACE INTO `sys_job` VALUES (12, 'job.exportIMSCDR', 'SYSTEM', 'exportTable', '{\"duration\":1,\"tableName\":\"cdr_event_ims\",\"columns\":\"id,JSON_UNQUOTE(JSON_EXTRACT(cdr_json,\'$.recordType\')) as record_type,JSON_UNQUOTE(JSON_EXTRACT(cdr_json,\'$.callType\')) as call_type,JSON_UNQUOTE(JSON_EXTRACT(cdr_json,\'$.callerParty\')) as caller_party,JSON_UNQUOTE(JSON_EXTRACT(cdr_json,\'$.calledParty\')) as called_party,JSON_UNQUOTE(JSON_EXTRACT(cdr_json,\'$.callDuration\')) as call_duration,JSON_UNQUOTE(JSON_EXTRACT(cdr_json,\'$.serviceResult\')) as service_result,DATE_FORMAT(FROM_UNIXTIME(timestamp), \'%Y-%m-%d %H:%i:%s\') AS timestamp\",\"timeCol\":\"timestamp\",\"timeUnit\":\"second\",\"extras\":\"\",\"filePath\":\"/usr/local/omc/backup/ims_cdr\"}', '0 0 0/1 * * ?', '3', '0', '1', '1', 'supervisor', 1698478134842, 'admin', 1722224659251, '');
 REPLACE INTO `sys_job` VALUES (13, 'job.exportSMFCDR', 'SYSTEM', 'exportTable', '{\"duration\":1,\"tableName\":\"cdr_event_smf\",\"columns\":\"id,JSON_UNQUOTE(JSON_EXTRACT(cdr_json,\'$.recordType\')) AS record_type,JSON_UNQUOTE(JSON_EXTRACT(cdr_json,\'$.chargingID\')) AS charging_id,JSON_UNQUOTE(JSON_EXTRACT(cdr_json,\'$.subscriberIdentifier.subscriptionIDType\')) AS subscriber_id_type,JSON_UNQUOTE(JSON_EXTRACT(cdr_json,\'$.subscriberIdentifier.subscriptionIDData\')) AS subscriber_id_data,JSON_UNQUOTE(JSON_EXTRACT(cdr_json,\'$.duration\')) AS duration,JSON_UNQUOTE(JSON_EXTRACT(cdr_json,\'$.invocationTimestamp\')) as invocationTimestamp,JSON_UNQUOTE(JSON_EXTRACT(cdr_json,\'$.listOfMultipleUnitUsage[*].usedUnitContainer[*].dataVolumeUplink\')) AS data_volume_uplink,JSON_UNQUOTE(JSON_EXTRACT(cdr_json,\'$.listOfMultipleUnitUsage[*].usedUnitContainer[*].dataVolumeDownlink\')) AS data_volume_downlink,JSON_UNQUOTE(JSON_EXTRACT(cdr_json,\'$.listOfMultipleUnitUsage[*].usedUnitContainer[*].dataTotalVolume\')) AS data_total_volume,JSON_UNQUOTE(JSON_EXTRACT(cdr_json,\'$.pDUSessionChargingInformation.pDUAddress.pDUIPv4Address\')) AS pdu_ipv4_address,timestamp\",\"timeCol\":\"timestamp\",\"timeUnit\":\"second\",\"extras\":\"\",\"filePath\":\"/usr/local/omc/backup/smf_cdr\"}', '0 0 0/1 * * ?', '3', '0', '1', '1', 'supervisor', 1698478134842, 'admin', 1724309047797, '');
 REPLACE INTO `sys_job` VALUES (14, 'job.exportSMSCCDR', 'SYSTEM', 'exportTable', '{\"duration\":1,\"tableName\":\"cdr_event_smsc\",\"columns\":\"id,JSON_UNQUOTE(JSON_EXTRACT(cdr_json,\'$.recordType\')) as record_type,JSON_UNQUOTE(JSON_EXTRACT(cdr_json,\'$.serviceType\')) as service_type,JSON_UNQUOTE(JSON_EXTRACT(cdr_json,\'$.callerParty\')) as caller_party,JSON_UNQUOTE(JSON_EXTRACT(cdr_json,\'$.calledParty\')) as called_party,JSON_UNQUOTE(JSON_EXTRACT(cdr_json,\'$.result\')) as result,DATE_FORMAT(FROM_UNIXTIME(JSON_UNQUOTE(JSON_EXTRACT(cdr_json,\'$.updateTime\'))), \'%Y-%m-%d %H:%i:%s\') as update_time\",\"timeCol\":\"timestamp\",\"timeUnit\":\"second\",\"extras\":\"\",\"filePath\":\"/usr/local/omc/backup/smsc_cdr\"}', '0 0 0/1 * * ?', '3', '0', '1', '1', 'supervisor', 1698478134842, 'admin', 1724309047797, '');

database/upgrade/upg_sys_log_operate.sql

@@ -4,6 +4,17 @@
 -- ------------------------------------------------------
 -- Server version	10.3.38-MariaDB
 
+/*!40101 SET @OLD_CHARACTER_SET_CLIENT=@@CHARACTER_SET_CLIENT */;
+/*!40101 SET @OLD_CHARACTER_SET_RESULTS=@@CHARACTER_SET_RESULTS */;
+/*!40101 SET @OLD_COLLATION_CONNECTION=@@COLLATION_CONNECTION */;
+/*!40101 SET NAMES utf8mb4 */;
+/*!40103 SET @OLD_TIME_ZONE=@@TIME_ZONE */;
+/*!40103 SET TIME_ZONE='+00:00' */;
+/*!40014 SET @OLD_UNIQUE_CHECKS=@@UNIQUE_CHECKS, UNIQUE_CHECKS=0 */;
+/*!40014 SET @OLD_FOREIGN_KEY_CHECKS=@@FOREIGN_KEY_CHECKS, FOREIGN_KEY_CHECKS=0 */;
+/*!40101 SET @OLD_SQL_MODE=@@SQL_MODE, SQL_MODE='NO_AUTO_VALUE_ON_ZERO' */;
+/*!40111 SET @OLD_SQL_NOTES=@@SQL_NOTES, SQL_NOTES=0 */;
+
 --
 -- Table structure for table `sys_log_operate`
 --
@@ -29,7 +40,15 @@ CREATE TABLE IF NOT EXISTS `sys_log_operate` (
   `cost_time` bigint(20) DEFAULT 0 COMMENT '消耗时间（毫秒）',
   PRIMARY KEY (`oper_id`) USING BTREE
 ) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_general_ci ROW_FORMAT=DYNAMIC COMMENT='系统操作日志表';
+/*!40101 SET character_set_client = @saved_cs_client */;
+/*!40103 SET TIME_ZONE=@OLD_TIME_ZONE */;
 
-ALTER TABLE `sys_log_operate` ADD COLUMN IF NOT EXISTS `tenant_id` varchar(32) NULL DEFAULT NULL AFTER `cost_time`;
+/*!40101 SET SQL_MODE=@OLD_SQL_MODE */;
-
+/*!40014 SET FOREIGN_KEY_CHECKS=@OLD_FOREIGN_KEY_CHECKS */;
+/*!40014 SET UNIQUE_CHECKS=@OLD_UNIQUE_CHECKS */;
+/*!40101 SET CHARACTER_SET_CLIENT=@OLD_CHARACTER_SET_CLIENT */;
+/*!40101 SET CHARACTER_SET_RESULTS=@OLD_CHARACTER_SET_RESULTS */;
+/*!40101 SET COLLATION_CONNECTION=@OLD_COLLATION_CONNECTION */;
+/*!40111 SET SQL_NOTES=@OLD_SQL_NOTES */;
 
+-- Dump completed on 2024-03-06 17:26:59

database/upgrade/upg_sys_menu.sql

@@ -188,44 +188,13 @@ REPLACE INTO `sys_menu` VALUES (2156, 'menu.common.edit', 2154, 2, '#', '', '1',
 REPLACE INTO `sys_menu` VALUES (2157, 'menu.dashboard.smscCDR', 2140, 9, 'smscCDR', 'dashboard/smscCDR/index', '1', '0', 'M', '1', '1', 'dashboard:cdr:index', 'icon-paixu', 'supervisor', 1723107637982, 'supervisor', 1723107637982, '');
 REPLACE INTO `sys_menu` VALUES (2158, 'menu.trace.pcapFile', 2083, 12, 'pcap/inline/file', 'traceManage/pcap/file', '1', '1', 'M', '0', '1', 'traceManage:pcap:index', '#', 'supervisor', 1724144595914, '', 0, '');
 REPLACE INTO `sys_menu` VALUES (2159, 'menu.log.exportFile', 2089, 100, 'exportFile', 'logManage/exportFile/index', '1', '1', 'M', '1', '1', 'logManage:exportFile:index', 'icon-wenjian', 'supervisor', 1724144595914, '', 0, '');
-REPLACE INTO `sys_menu` VALUES (2160, 'menu.perf.kpiCReport', 2099, 100, 'kpiCReport', 'perfManage/kpiCReport/index', '1', '1', 'M', '0', '0', 'perfManage:kpiCReport:index', 'icon-tubiaoku', 'supervisor', 1724144595914, '', 0, '');
+REPLACE INTO `sys_menu` VALUES (2160, 'menu.perf.kpiCReport', 2099, 100, 'kpiCReport', 'perfManage/kpiCReport/index', '1', '1', 'M', '1', '1', 'perfManage:kpiCReport:index', 'icon-tubiaoku', 'supervisor', 1724144595914, '', 0, '');
-REPLACE INTO `sys_menu` VALUES (2161, 'menu.trace.taskHLR', 2083, 6, 'taskHLR', 'traceManage/task-hlr/index', '1', '0', 'M', '1', '1', 'traceManage:taskHLR:index', 'icon-chexiao', 'supervisor', 1724144595914, '', 0, '');
+REPLACE INTO `sys_menu` VALUES (2161, 'menu.trace.taskHLR', 2083, 6, 'taskHLR', 'traceManage/task-hlr/index', '1', '0', 'M', '0', '1', 'traceManage:taskHLR:index', 'icon-chexiao', 'supervisor', 1724144595914, '', 0, '');
 REPLACE INTO `sys_menu` VALUES (2162, 'menu.trace.taskAnalyze', 2083, 2, 'task/inline/analyze', 'traceManage/task/analyze', '1', '0', 'M', '0', '1', 'traceManage:taskAnalyze:index', '#', 'supervisor', 1724144595914, '', 0, '');
 REPLACE INTO `sys_menu` VALUES (2163, 'menu.trace.tshark', 2083, 14, 'tshark', 'traceManage/tshark/index', '1', '0', 'M', '1', '1', 'traceManage:tshark:index', 'icon-gengduo', 'supervisor', 1724144595914, '', 0, '');
 REPLACE INTO `sys_menu` VALUES (2164, 'menu.trace.wireshark', 2083, 16, 'wireshark', 'traceManage/wireshark/index', '1', '0', 'M', '1', '1', 'traceManage:wireshark:index', 'icon-gengduo', 'supervisor', 1724144595914, '', 0, '');
 REPLACE INTO `sys_menu` VALUES (2165, 'menu.config.neOverview', 4, 1, 'neOverview', 'configManage/neOverview/index', '1', '0', 'M', '1', '1', 'configManage:neOverview:index', 'icon-tubiaoku', 'supervisor', 1700000000000, NULL, 0, 'menu.config.neOverviewRemark');
 
--- multi-tenancy
+-- 指定记录条件更新
--- tenant management for admin user
-REPLACE INTO `sys_menu` VALUES (10000, 'menu.security.tenant', 2113, 5, 'tenant', 'system/tenant/index', '1', '1', 'M', '1', '1', 'system:tenant:list', 'icon-yuzhanghao1', 'supervisor', 1700000000000, NULL, 0, 'menu.security.tenantRemark');
-REPLACE INTO `sys_menu` VALUES (10001, 'menu.common.add', 10010, 1, '', '', '1', '1', 'B', '1', '1', 'tenant:subs:add', '#', 'supervisor', 1717491040044, 'supervisor', 1717491508620, '');
-REPLACE INTO `sys_menu` VALUES (10002, 'menu.common.batchadd', 10010, 1, '', '', '1', '1', 'B', '1', '1', 'tenant:subs:batchAdd', '#', 'supervisor', 1717491040044, 'supervisor', 1717491508620, '');
-REPLACE INTO `sys_menu` VALUES (10003, 'menu.common.checkdel', 10010, 2, '', '', '1', '1', 'B', '1', '1', 'tenant:subs:checkDel', '#', 'supervisor', 1717491501662, '', 0, '');
-REPLACE INTO `sys_menu` VALUES (10004, 'menu.common.batchdel', 10010, 3, '', '', '1', '1', 'B', '1', '1', 'tenant:subs:batchDel', '#', 'supervisor', 1717491702980, '', 0, '');
-REPLACE INTO `sys_menu` VALUES (10005, 'menu.common.loaddata', 10010, 4, '', '', '1', '1', 'B', '1', '1', 'tenant:subs:load', '#', 'supervisor', 1717491838364, '', 0, '');
-REPLACE INTO `sys_menu` VALUES (10006, 'menu.common.import', 10010, 5, '', '', '1', '1', 'B', '1', '1', 'tenant:subs:import', '#', 'supervisor', 1717491874118, '', 0, '');
--- menu and button for tenant user
-REPLACE INTO `sys_menu` VALUES (10007, 'menu.common.export', 10010, 6, '', '', '1', '1', 'B', '1', '1', 'tenant:subs:export', '#', 'supervisor', 1717491901916, '', 0, '');
-REPLACE INTO `sys_menu` VALUES (10008, 'menu.common.checkexport', 10010, 7, '', '', '1', '1', 'B', '1', '1', 'tenant:subs:checkExport', '#', 'supervisor', 1717492147021, '', 0, '');
-REPLACE INTO `sys_menu` VALUES (10009, 'menu.tenant.overview', 0, 90, 'overview', 'index/index', '1', '0', 'M', '0', '1', 'index:index', 'icon-paixu', 'admin', 1716445027021, 'supervisor', 1716453627718, 'Overview interface for tenants');
-REPLACE INTO `sys_menu` VALUES (10010, 'menu.tenant.subscriber', 0, 91, 'sub', 'tenant/sub/index', '1', '1', 'M', '1', '1', 'tenant:sub:index', 'icon-xiangmuchengyuan', 'supervisor', 1716446941420, 'supervisor', 1716453604732, 'UDM Subscriber Menu');
-REPLACE INTO `sys_menu` VALUES (10011, 'menu.tenant.onlineUE', 10022, 94, 'ue', 'tenant/ue/index', '1', '0', 'M', '1', '1', 'tenant:ue:index', 'icon-wocanyu', 'supervisor', 1718697278784, '', 0, '');
-REPLACE INTO `sys_menu` VALUES (10012, 'menu.tenant.radio', 0, 95, 'base5G', 'tenant/base5G/index', '1', '0', 'M', '1', '1', 'tenant:base5G:index', 'icon-suofang', 'supervisor', 1718696648153, '', 0, '');
-REPLACE INTO `sys_menu` VALUES (10013, 'menu.tenant.imsCDR', 10019, 97, 'imsCDR', 'tenant/imsCDR/index', '1', '0', 'M', '1', '1', 'tenant:imsCDR:index', 'icon-tubiaohuizhi', 'supervisor', 1716454666743, '', 0, '');
-REPLACE INTO `sys_menu` VALUES (10014, 'menu.tenant.smfCDR', 10019, 98, 'smfCDR', 'tenant/smfCDR/index', '1', '0', 'M', '1', '1', 'tenant:smfCDR:index', 'icon-paixu', 'supervisor', 1716454666743, '', 0, '');
-REPLACE INTO `sys_menu` VALUES (10015, 'menu.tenant.ueEvent', 0, 100, 'ueEvent', 'tenant/ueEvent/index', '1', '0', 'D', '1', '1', 'tenant:ueEvent:index', 'icon-xiangmu', 'supervisor', 1716454666743, 'supervisor', 1718621454168, '');
-REPLACE INTO `sys_menu` VALUES (10016, 'menu.tenant.amfUE', 10015, 101, 'amfUE', 'tenant/amfUE/index', '1', '0', 'M', '1', '1', 'tenant:amfUE:index', 'icon-xiangmu', 'supervisor', 1716454666743, 'supervisor', 1718621454168, '');
-REPLACE INTO `sys_menu` VALUES (10017, 'menu.tenant.mmeUE', 10015, 102, 'mmeUE', 'tenant/mmeUE/index', '1', '0', 'M', '1', '1', 'tenant:mmeUE:index', 'icon-xiangmu', 'supervisor', 1716454666743, 'supervisor', 1718621454168, '');
-REPLACE INTO `sys_menu` VALUES (10018, 'menu.tenant.log', 0, 103, 'operate', 'tenant/operate/index', '1', '1', 'M', '1', '1', 'tenant:operate:list', 'icon-fuzhidaima', 'supervisor', 1716447063341, 'supervisor', 1716453612175, 'Operation log menu');
-REPLACE INTO `sys_menu` VALUES (10019, 'menu.tenant.cdr', 0, 96, 'CDR', NULL, '1', '1', 'D', '1', '1', NULL, 'icon-tubiaohuizhi', 'supervisor', 1700000000000, NULL, 0, 'CDR');
-REPLACE INTO `sys_menu` VALUES (10020, 'menu.tenant.onlineIMS', 10022, 93, 'ims', 'tenant/ims/index', '1', '0', 'M', '1', '1', 'tenant:ims:index', 'icon-wocanyu', 'supervisor', 1718697278784, '', 0, '');
-REPLACE INTO `sys_menu` VALUES (10021, 'menu.tenant.smscCDR', 10019, 99, 'smscCDR', 'tenant/smscCDR/index', '1', '0', 'M', '1', '1', 'tenant:smscCDR:index', 'icon-paixu', 'supervisor', 1716454666743, '', 0, '');
-REPLACE INTO `sys_menu` VALUES (10022, 'menu.tenant.session', 0, 92, 'session', NULL, '1', '0', 'D', '1', '1', NULL, 'icon-wocanyu', 'supervisor', 1716454666743, '', 0, '');
-
--- end for tenant user
-
--- update department management to non visible
-UPDATE `sys_menu` SET `visible` = '0' WHERE `menu_id` = 104;
-UPDATE `sys_menu` SET `visible` = '0' WHERE `menu_id` = 105;
 
 SET FOREIGN_KEY_CHECKS = 1;

database/upgrade/upg_sys_role.sql

@@ -5,6 +5,5 @@ INSERT IGNORE INTO `sys_role` VALUES (2, 'role.admin', 'admin', 2, '1', '1', '1'
 INSERT IGNORE INTO `sys_role` VALUES (3, 'role.operator', 'operator', 3, '1', '1', '1', '1', '0', 'supervisor', 1698486934900, 'supervisor', 1717143582784, 'role.operatorRemark');
 INSERT IGNORE INTO `sys_role` VALUES (4, 'role.monitor', 'monitor', 4, '1', '1', '1', '1', '0', 'supervisor', 1698486950714, 'supervisor', 1706774389300, 'role.monitorRemark');
 INSERT IGNORE INTO `sys_role` VALUES (5, 'role.vistor', 'vistor', 5, '1', '1', '1', '1', '0', 'supervisor', 1698486975779, 'supervisor', 1706774405096, 'role.vistorRemark');
-INSERT IGNORE INTO `sys_role` VALUES (100, 'role.tenant', 'tenant', 100, '2', '1', '1', '1', '0', 'admin', 1715591950609, 'supervisor', 1718701342318, '');
 
 SET FOREIGN_KEY_CHECKS=1;    

database/upgrade/upg_sys_role_menu.sql

@@ -4,8 +4,7 @@ SET FOREIGN_KEY_CHECKS = 0;
 -- ----------------------------
 -- Table structure for sys_role_menu
 -- ----------------------------
-DROP TABLE IF EXISTS `sys_role_menu`;
+CREATE TABLE IF NOT EXISTS `sys_role_menu`  (
-CREATE TABLE `sys_role_menu`  (
   `role_id` bigint(20) NOT NULL COMMENT '角色ID',
   `menu_id` bigint(20) NOT NULL COMMENT '菜单ID',
   PRIMARY KEY (`role_id`, `menu_id`) USING BTREE
@@ -85,9 +84,6 @@ INSERT IGNORE INTO `sys_role_menu` VALUES (2, 1055);
 INSERT IGNORE INTO `sys_role_menu` VALUES (2, 1056);
 INSERT IGNORE INTO `sys_role_menu` VALUES (2, 2009);
 INSERT IGNORE INTO `sys_role_menu` VALUES (2, 2010);
-INSERT IGNORE INTO `sys_role_menu` VALUES (2, 2075);
-INSERT IGNORE INTO `sys_role_menu` VALUES (2, 2078);
-INSERT IGNORE INTO `sys_role_menu` VALUES (2, 2079);
 INSERT IGNORE INTO `sys_role_menu` VALUES (2, 2080);
 INSERT IGNORE INTO `sys_role_menu` VALUES (2, 2081);
 INSERT IGNORE INTO `sys_role_menu` VALUES (2, 2082);
@@ -145,6 +141,7 @@ INSERT IGNORE INTO `sys_role_menu` VALUES (2, 2147);
 INSERT IGNORE INTO `sys_role_menu` VALUES (2, 2148);
 INSERT IGNORE INTO `sys_role_menu` VALUES (2, 2149);
 INSERT IGNORE INTO `sys_role_menu` VALUES (2, 2150);
+INSERT IGNORE INTO `sys_role_menu` VALUES (2, 2151);
 INSERT IGNORE INTO `sys_role_menu` VALUES (2, 2152);
 INSERT IGNORE INTO `sys_role_menu` VALUES (2, 2153);
 INSERT IGNORE INTO `sys_role_menu` VALUES (2, 2154);
@@ -154,19 +151,10 @@ INSERT IGNORE INTO `sys_role_menu` VALUES (2, 2157);
 INSERT IGNORE INTO `sys_role_menu` VALUES (2, 2158);
 INSERT IGNORE INTO `sys_role_menu` VALUES (2, 2159);
 INSERT IGNORE INTO `sys_role_menu` VALUES (2, 2160);
+INSERT IGNORE INTO `sys_role_menu` VALUES (2, 2162);
 INSERT IGNORE INTO `sys_role_menu` VALUES (2, 2163);
 INSERT IGNORE INTO `sys_role_menu` VALUES (2, 2165);
 
-INSERT IGNORE INTO `sys_role_menu` VALUES (2, 10000);
-INSERT IGNORE INTO `sys_role_menu` VALUES (2, 10001);
-INSERT IGNORE INTO `sys_role_menu` VALUES (2, 10002);
-INSERT IGNORE INTO `sys_role_menu` VALUES (2, 10003);
-INSERT IGNORE INTO `sys_role_menu` VALUES (2, 10004);
-INSERT IGNORE INTO `sys_role_menu` VALUES (2, 10005);
-INSERT IGNORE INTO `sys_role_menu` VALUES (2, 10006);
-INSERT IGNORE INTO `sys_role_menu` VALUES (2, 10007);
-INSERT IGNORE INTO `sys_role_menu` VALUES (2, 10008);
-
 INSERT IGNORE INTO `sys_role_menu` VALUES (3, 1);
 INSERT IGNORE INTO `sys_role_menu` VALUES (3, 4);
 INSERT IGNORE INTO `sys_role_menu` VALUES (3, 5);
@@ -187,14 +175,10 @@ INSERT IGNORE INTO `sys_role_menu` VALUES (3, 1042);
 INSERT IGNORE INTO `sys_role_menu` VALUES (3, 1048);
 INSERT IGNORE INTO `sys_role_menu` VALUES (3, 2009);
 INSERT IGNORE INTO `sys_role_menu` VALUES (3, 2010);
-INSERT IGNORE INTO `sys_role_menu` VALUES (3, 2075);
-INSERT IGNORE INTO `sys_role_menu` VALUES (3, 2078);
 INSERT IGNORE INTO `sys_role_menu` VALUES (3, 2080);
 INSERT IGNORE INTO `sys_role_menu` VALUES (3, 2081);
 INSERT IGNORE INTO `sys_role_menu` VALUES (3, 2082);
 INSERT IGNORE INTO `sys_role_menu` VALUES (3, 2083);
-INSERT IGNORE INTO `sys_role_menu` VALUES (3, 2084);
-INSERT IGNORE INTO `sys_role_menu` VALUES (3, 2085);
 INSERT IGNORE INTO `sys_role_menu` VALUES (3, 2086);
 INSERT IGNORE INTO `sys_role_menu` VALUES (3, 2087);
 INSERT IGNORE INTO `sys_role_menu` VALUES (3, 2088);
@@ -203,30 +187,17 @@ INSERT IGNORE INTO `sys_role_menu` VALUES (3, 2091);
 INSERT IGNORE INTO `sys_role_menu` VALUES (3, 2092);
 INSERT IGNORE INTO `sys_role_menu` VALUES (3, 2094);
 INSERT IGNORE INTO `sys_role_menu` VALUES (3, 2097);
-INSERT IGNORE INTO `sys_role_menu` VALUES (3, 2098);
-INSERT IGNORE INTO `sys_role_menu` VALUES (3, 2099);
-INSERT IGNORE INTO `sys_role_menu` VALUES (3, 2100);
-INSERT IGNORE INTO `sys_role_menu` VALUES (3, 2101);
-INSERT IGNORE INTO `sys_role_menu` VALUES (3, 2102);
-INSERT IGNORE INTO `sys_role_menu` VALUES (3, 2103);
-INSERT IGNORE INTO `sys_role_menu` VALUES (3, 2104);
-INSERT IGNORE INTO `sys_role_menu` VALUES (3, 2105);
-INSERT IGNORE INTO `sys_role_menu` VALUES (3, 2106);
 INSERT IGNORE INTO `sys_role_menu` VALUES (3, 2107);
 INSERT IGNORE INTO `sys_role_menu` VALUES (3, 2108);
 INSERT IGNORE INTO `sys_role_menu` VALUES (3, 2109);
 INSERT IGNORE INTO `sys_role_menu` VALUES (3, 2111);
-INSERT IGNORE INTO `sys_role_menu` VALUES (3, 2112);
 INSERT IGNORE INTO `sys_role_menu` VALUES (3, 2113);
+INSERT IGNORE INTO `sys_role_menu` VALUES (3, 2114);
 INSERT IGNORE INTO `sys_role_menu` VALUES (3, 2115);
-INSERT IGNORE INTO `sys_role_menu` VALUES (3, 2118);
 INSERT IGNORE INTO `sys_role_menu` VALUES (3, 2119);
 INSERT IGNORE INTO `sys_role_menu` VALUES (3, 2120);
 INSERT IGNORE INTO `sys_role_menu` VALUES (3, 2123);
-INSERT IGNORE INTO `sys_role_menu` VALUES (3, 2124);
-INSERT IGNORE INTO `sys_role_menu` VALUES (3, 2125);
 INSERT IGNORE INTO `sys_role_menu` VALUES (3, 2126);
-INSERT IGNORE INTO `sys_role_menu` VALUES (3, 2127);
 INSERT IGNORE INTO `sys_role_menu` VALUES (3, 2128);
 INSERT IGNORE INTO `sys_role_menu` VALUES (3, 2129);
 INSERT IGNORE INTO `sys_role_menu` VALUES (3, 2130);
@@ -238,9 +209,11 @@ INSERT IGNORE INTO `sys_role_menu` VALUES (3, 2138);
 INSERT IGNORE INTO `sys_role_menu` VALUES (3, 2140);
 INSERT IGNORE INTO `sys_role_menu` VALUES (3, 2141);
 INSERT IGNORE INTO `sys_role_menu` VALUES (3, 2143);
+INSERT IGNORE INTO `sys_role_menu` VALUES (3, 2146);
 INSERT IGNORE INTO `sys_role_menu` VALUES (3, 2147);
 INSERT IGNORE INTO `sys_role_menu` VALUES (3, 2148);
 INSERT IGNORE INTO `sys_role_menu` VALUES (3, 2149);
+INSERT IGNORE INTO `sys_role_menu` VALUES (3, 2151);
 INSERT IGNORE INTO `sys_role_menu` VALUES (3, 2152);
 INSERT IGNORE INTO `sys_role_menu` VALUES (3, 2153);
 INSERT IGNORE INTO `sys_role_menu` VALUES (3, 2154);
@@ -248,8 +221,7 @@ INSERT IGNORE INTO `sys_role_menu` VALUES (3, 2155);
 INSERT IGNORE INTO `sys_role_menu` VALUES (3, 2156);
 INSERT IGNORE INTO `sys_role_menu` VALUES (3, 2157);
 INSERT IGNORE INTO `sys_role_menu` VALUES (3, 2158);
-INSERT IGNORE INTO `sys_role_menu` VALUES (3, 2160);
+INSERT IGNORE INTO `sys_role_menu` VALUES (3, 2165);
-INSERT IGNORE INTO `sys_role_menu` VALUES (3, 2162);
 
 INSERT IGNORE INTO `sys_role_menu` VALUES (4, 1);
 INSERT IGNORE INTO `sys_role_menu` VALUES (4, 4);
@@ -289,11 +261,11 @@ INSERT IGNORE INTO `sys_role_menu` VALUES (4, 2141);
 INSERT IGNORE INTO `sys_role_menu` VALUES (4, 2147);
 INSERT IGNORE INTO `sys_role_menu` VALUES (4, 2148);
 INSERT IGNORE INTO `sys_role_menu` VALUES (4, 2149);
+INSERT IGNORE INTO `sys_role_menu` VALUES (4, 2151);
 INSERT IGNORE INTO `sys_role_menu` VALUES (4, 2152);
 INSERT IGNORE INTO `sys_role_menu` VALUES (4, 2153);
 INSERT IGNORE INTO `sys_role_menu` VALUES (4, 2157);
 INSERT IGNORE INTO `sys_role_menu` VALUES (4, 2163);
-INSERT IGNORE INTO `sys_role_menu` VALUES (4, 2160);
 INSERT IGNORE INTO `sys_role_menu` VALUES (4, 2165);
 
 INSERT IGNORE INTO `sys_role_menu` VALUES (5, 1);
@@ -305,21 +277,4 @@ INSERT IGNORE INTO `sys_role_menu` VALUES (5, 2131);
 INSERT IGNORE INTO `sys_role_menu` VALUES (5, 2132);
 INSERT IGNORE INTO `sys_role_menu` VALUES (5, 2165);
 
-INSERT IGNORE INTO `sys_role_menu` VALUES (100, 10007);
-INSERT IGNORE INTO `sys_role_menu` VALUES (100, 10008);
-INSERT IGNORE INTO `sys_role_menu` VALUES (100, 10009);
-INSERT IGNORE INTO `sys_role_menu` VALUES (100, 10010);
-INSERT IGNORE INTO `sys_role_menu` VALUES (100, 10011);
-INSERT IGNORE INTO `sys_role_menu` VALUES (100, 10012);
-INSERT IGNORE INTO `sys_role_menu` VALUES (100, 10013);
-INSERT IGNORE INTO `sys_role_menu` VALUES (100, 10014);
-INSERT IGNORE INTO `sys_role_menu` VALUES (100, 10015);
-INSERT IGNORE INTO `sys_role_menu` VALUES (100, 10016);
-INSERT IGNORE INTO `sys_role_menu` VALUES (100, 10017);
-INSERT IGNORE INTO `sys_role_menu` VALUES (100, 10018);
-INSERT IGNORE INTO `sys_role_menu` VALUES (100, 10019);
-INSERT IGNORE INTO `sys_role_menu` VALUES (100, 10020);
-INSERT IGNORE INTO `sys_role_menu` VALUES (100, 10021);
-INSERT IGNORE INTO `sys_role_menu` VALUES (100, 10022);
-
 SET FOREIGN_KEY_CHECKS = 1;

database/upgrade/upg_sys_role_tenant.sql

@@ -1,29 +0,0 @@
-/*
- Navicat Premium Data Transfer
-
- Source Server         : local_mariadb
- Source Server Type    : MariaDB
- Source Server Version : 100338 (10.3.38-MariaDB)
- Source Host           : localhost:33066
- Source Schema         : tenants_db
-
- Target Server Type    : MariaDB
- Target Server Version : 100338 (10.3.38-MariaDB)
- File Encoding         : 65001
-
- Date: 19/06/2024 14:12:55
-*/
-
-SET NAMES utf8mb4;
-SET FOREIGN_KEY_CHECKS = 0;
-
--- ----------------------------
--- Table structure for sys_role_tenant
--- ----------------------------
-CREATE TABLE IF NOT EXISTS `sys_role_tenant`  (
-  `role_id` bigint(20) NOT NULL COMMENT '角色ID',
-  `tenant_id` bigint(20) NOT NULL COMMENT '租户ID',
-  PRIMARY KEY (`role_id`, `tenant_id`) USING BTREE
-) ENGINE = InnoDB CHARACTER SET = utf8mb4 COLLATE = utf8mb4_general_ci COMMENT = '角色和部门关联表' ROW_FORMAT = Dynamic;
-
-SET FOREIGN_KEY_CHECKS = 1;

database/upgrade/upg_sys_tenant.sql

@@ -1,45 +0,0 @@
-/*
- Navicat Premium Data Transfer
-
- Source Server         : root@192.168.2.166
- Source Server Type    : MariaDB
- Source Server Version : 100616 (10.6.16-MariaDB-0ubuntu0.22.04.1)
- Source Host           : 192.168.2.166:33066
- Source Schema         : tenants_db
-
- Target Server Type    : MariaDB
- Target Server Version : 100616 (10.6.16-MariaDB-0ubuntu0.22.04.1)
- File Encoding         : 65001
-
- Date: 19/06/2024 15:49:42
-*/
-
-SET NAMES utf8mb4;
-SET FOREIGN_KEY_CHECKS = 0;
-
--- ----------------------------
--- Table structure for sys_tenant
--- ----------------------------
-CREATE TABLE IF NOT EXISTS `sys_tenant`  (
-  `tenant_id` bigint(20) NOT NULL AUTO_INCREMENT COMMENT 'Tenant id',
-  `parent_id` bigint(20) NULL DEFAULT 0 COMMENT '父id 默认0',
-  `ancestors` varchar(50) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT '' COMMENT '祖级列表',
-  `tenant_name` varchar(128) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT '' COMMENT '租户名称',
-  `order_num` int(11) NULL DEFAULT 0 COMMENT '显示顺序',
-  `tenancy_type` varchar(20) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL COMMENT 'tenancy type: sd-sst, apn, imsi, msisdn',
-  `tenancy_key` varchar(32) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL COMMENT 'tenancy key: key of sd-sst, apn, imsi, msisdn',
-  `status` 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 NULL DEFAULT '0' COMMENT '删除标志（0代表存在 1代表删除）',
-  `create_by` varchar(50) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT '' COMMENT '创建者',
-  `create_time` bigint(20) NULL DEFAULT 0 COMMENT '创建时间',
-  `update_by` varchar(50) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT '' COMMENT '更新者',
-  `update_time` bigint(20) NULL DEFAULT 0 COMMENT '更新时间',
-  PRIMARY KEY (`tenant_id`) USING BTREE
-) ENGINE = InnoDB AUTO_INCREMENT = 2 CHARACTER SET = utf8mb4 COLLATE = utf8mb4_general_ci COMMENT = '部门表' ROW_FORMAT = Dynamic;
-
--- ----------------------------
--- Records of sys_tenant
--- ----------------------------
--- INSERT IGNORE INTO `sys_tenant` VALUES (1, 0, '0', 'TenantRoot', 0, '', '', '1', '0', 'admin', 1699348237468, 'supervisor', 1718783333041);
-
-SET FOREIGN_KEY_CHECKS = 1;

database/upgrade/upg_sys_user.sql

@@ -23,7 +23,184 @@ CREATE TABLE IF NOT EXISTS `sys_user` (
   PRIMARY KEY (`user_id`) USING BTREE
 ) ENGINE=InnoDB AUTO_INCREMENT=100 DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_general_ci COMMENT='用户信息表';
 
--- multi-tenancy
+INSERT IGNORE INTO `sys_user` (
-ALTER TABLE `sys_user` ADD COLUMN IF NOT EXISTS `tenant_id` bigint(20) NULL DEFAULT NULL DEFAULT NULL COMMENT 'Tenant ID' AFTER `dept_id`;
+        `user_id`,
+        `dept_id`,
+        `user_name`,
+        `nick_name`,
+        `user_type`,
+        `email`,
+        `phonenumber`,
+        `sex`,
+        `avatar`,
+        `password`,
+        `status`,
+        `del_flag`,
+        `login_ip`,
+        `login_date`,
+        `create_by`,
+        `create_time`,
+        `update_by`,
+        `update_time`,
+        `remark`
+    )
+VALUES (
+        1,
+        '100',
+        'supervisor',
+        'supervisor',
+        'sys',
+        '',
+        '',
+        '',
+        '',
+        '$2a$10$QgIcp6yuOEGrEU0TNU12K.uQRLbcufesEU7hiRYlRSSdUO7OAkoTq',
+        '1',
+        '0',
+        '192.168.2.114',
+        1698920815347,
+        'admin',
+        1697091656500,
+        'supervisor',
+        1698920815347,
+        ''
+    );
+
+INSERT IGNORE INTO `sys_user` (
+        `user_id`,
+        `dept_id`,
+        `user_name`,
+        `nick_name`,
+        `user_type`,
+        `email`,
+        `phonenumber`,
+        `sex`,
+        `avatar`,
+        `password`,
+        `status`,
+        `del_flag`,
+        `login_ip`,
+        `login_date`,
+        `create_by`,
+        `create_time`,
+        `update_by`,
+        `update_time`,
+        `remark`
+    )
+VALUES (
+        2,
+        '100',
+        'admin',
+        'admin',
+        'sys',
+        '',
+        '',
+        '',
+        '',
+        '$2a$10$QgIcp6yuOEGrEU0TNU12K.uQRLbcufesEU7hiRYlRSSdUO7OAkoTq',
+        '1',
+        '0',
+        '192.168.2.219',
+        1699338435424,
+        'admin',
+        1697091656500,
+        'admin',
+        1699338435425,
+        ''
+    );
+
+INSERT IGNORE INTO `sys_user` (
+        `user_id`,
+        `dept_id`,
+        `user_name`,
+        `nick_name`,
+        `user_type`,
+        `email`,
+        `phonenumber`,
+        `sex`,
+        `avatar`,
+        `password`,
+        `status`,
+        `del_flag`,
+        `login_ip`,
+        `login_date`,
+        `create_by`,
+        `create_time`,
+        `update_by`,
+        `update_time`,
+        `remark`
+    )
+VALUES (
+        103,
+        '100',
+        'manager',
+        'manager',
+        'sys',
+        '',
+        '',
+        '1',
+        '',
+        '$2a$10$RND3fUw9Ai.WcggYSI57tu.u3OIlktdPxFzlWkmiHC1paV038t0I2',
+        '1',
+        '0',
+        '192.168.2.114',
+        1698661596191,
+        'admin',
+        1698661521780,
+        'admin',
+        1699340083864,
+        'manager'
+    );
+
+INSERT IGNORE INTO `sys_user` (
+        `user_id`,
+        `dept_id`,
+        `user_name`,
+        `nick_name`,
+        `user_type`,
+        `email`,
+        `phonenumber`,
+        `sex`,
+        `avatar`,
+        `password`,
+        `status`,
+        `del_flag`,
+        `login_ip`,
+        `login_date`,
+        `create_by`,
+        `create_time`,
+        `update_by`,
+        `update_time`,
+        `remark`
+    )
+VALUES (
+        104,
+        '100',
+        'monitor',
+        'monitor',
+        'sys',
+        '',
+        '',
+        '1',
+        '',
+        '$2a$10$t3zpKQ0olECotFyI1yO43.tCoS0EXoSRBDcqwl09xvrsmn14qFHHy',
+        '1',
+        '0',
+        '',
+        0,
+        'admin',
+        1698661684898,
+        'admin',
+        1698740853724,
+        ''
+    );
+
+-- 20240508
+ALTER TABLE `sys_user` MODIFY COLUMN `dept_id` bigint NULL DEFAULT 0 COMMENT '部门ID' AFTER `user_id`;
+ALTER TABLE `sys_user` MODIFY COLUMN `user_name` varchar(36) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NOT NULL DEFAULT '' COMMENT '用户账号' AFTER `dept_id`;
+ALTER TABLE `sys_user` MODIFY COLUMN `nick_name` varchar(36) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NOT NULL DEFAULT '' COMMENT '用户昵称' AFTER `user_name`;
+ALTER TABLE `sys_user` MODIFY COLUMN `email` varchar(64) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT '' COMMENT '用户邮箱' AFTER `user_type`;
+ALTER TABLE `sys_user` MODIFY COLUMN `phonenumber` varchar(16) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT '' COMMENT '手机号码' AFTER `email`;
+ALTER TABLE `sys_user` MODIFY COLUMN `remark` varchar(500) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT '' COMMENT '备注' AFTER `update_time`;
 
 SET FOREIGN_KEY_CHECKS=1;    

database/upgrade/upg_u_sub_user.sql

@@ -1,6 +1,3 @@
-SET NAMES utf8mb4;
-SET FOREIGN_KEY_CHECKS = 0;
-
 --
 -- Table structure for table `u_sub_user`
 --
@@ -37,7 +34,6 @@ CREATE TABLE IF NOT EXISTS `u_sub_user` (
   `sm_data` varchar(1500) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci DEFAULT '' COMMENT 'smData',
   `smf_sel` varchar(50) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci DEFAULT '' COMMENT 'smfSel',
   `cag` varchar(50) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci DEFAULT '' COMMENT 'CAG',
-  `tenant_id` varchar(32) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL COMMENT 'multi-tenancy refer to sys_tenant.tenant_id',
   PRIMARY KEY (`id`) USING BTREE,
   UNIQUE KEY `imsi_ne` (`imsi`,`ne_id`) USING BTREE COMMENT 'imsi_ne唯一索引'
 ) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_general_ci COMMENT='UDM签约用户';
@@ -72,6 +68,3 @@ ALTER TABLE `u_sub_user` MODIFY COLUMN IF EXISTS `static_ip` varchar(50) CHARACT
 ALTER TABLE `u_sub_user` MODIFY COLUMN IF EXISTS `sm_data` varchar(1500) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT '' COMMENT 'smData' AFTER `static_ip`;
 ALTER TABLE `u_sub_user` MODIFY COLUMN IF EXISTS `smf_sel` varchar(50) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT '' COMMENT 'smfSel' AFTER `sm_data`;
 ALTER TABLE `u_sub_user` DROP COLUMN IF EXISTS `cn`;
-
--- multi-tenancy
-ALTER TABLE `u_sub_user` ADD COLUMN IF NOT EXISTS `tenant_id` varchar(32) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL COMMENT 'multi-tenancy refer to sys_tenant.tenant_id' AFTER `cag`;

database/upgrade/upg_ue_event.sql

@@ -5,13 +5,13 @@
  Source Server Type    : MariaDB
  Source Server Version : 100338 (10.3.38-MariaDB)
  Source Host           : localhost:33066
- Source Schema         : tenants_db
+ Source Schema         : omc_db
 
  Target Server Type    : MariaDB
  Target Server Version : 100338 (10.3.38-MariaDB)
  File Encoding         : 65001
 
- Date: 04/07/2024 10:15:55
+ Date: 22/01/2024 17:03:39
 */
 
 SET NAMES utf8mb4;
@@ -29,10 +29,8 @@ CREATE TABLE IF NOT EXISTS `ue_event`  (
   `event_type` varchar(16) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL COMMENT 'auth-result/detach/cm-state',
   `event_json` longtext CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL,
   `created_at` datetime NULL DEFAULT current_timestamp(),
-  `tenant_id` varchar(32) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL,
   PRIMARY KEY (`id`) USING BTREE,
-  INDEX `id`(`id`) USING BTREE,
+  INDEX `id`(`id`) USING BTREE
-  INDEX `idx_type_timestamp`(`ne_type`, `timestamp`, `event_type`, `tenant_id`) USING BTREE
 ) ENGINE = InnoDB AUTO_INCREMENT = 5 CHARACTER SET = utf8mb4 COLLATE = utf8mb4_general_ci ROW_FORMAT = Dynamic;
 
 SET FOREIGN_KEY_CHECKS = 1;

database/upgrade/upg_ue_event_amf.sql

@@ -5,13 +5,13 @@
  Source Server Type    : MariaDB
  Source Server Version : 100338 (10.3.38-MariaDB)
  Source Host           : localhost:33066
- Source Schema         : tenants_db
+ Source Schema         : omc_db
 
  Target Server Type    : MariaDB
  Target Server Version : 100338 (10.3.38-MariaDB)
  File Encoding         : 65001
 
- Date: 04/07/2024 10:41:59
+ Date: 22/01/2024 17:03:39
 */
 
 SET NAMES utf8mb4;
@@ -21,18 +21,17 @@ SET FOREIGN_KEY_CHECKS = 0;
 -- Table structure for ue_event_amf
 -- ----------------------------
 CREATE TABLE IF NOT EXISTS `ue_event_amf`  (
-  `id` int(11) NOT NULL AUTO_INCREMENT,
+  `id` int NOT NULL AUTO_INCREMENT,
-  `ne_type` varchar(32) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL,
+  `ne_type` varchar(32) COLLATE utf8mb4_general_ci DEFAULT NULL,
-  `ne_name` varchar(64) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL,
+  `ne_name` varchar(64) COLLATE utf8mb4_general_ci DEFAULT NULL,
-  `rm_uid` varchar(32) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL,
+  `rm_uid` varchar(32) COLLATE utf8mb4_general_ci DEFAULT NULL,
-  `timestamp` int(11) NULL DEFAULT NULL,
+  `timestamp` int DEFAULT NULL,
-  `event_type` varchar(16) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL COMMENT 'auth-result/detach/cm-state',
+  `event_type` varchar(16) COLLATE utf8mb4_general_ci DEFAULT NULL COMMENT 'auth-result/detach/cm-state',
-  `event_json` longtext CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL,
+  `event_json` longtext COLLATE utf8mb4_general_ci,
-  `created_at` datetime NULL DEFAULT current_timestamp(),
+  `created_at` datetime DEFAULT CURRENT_TIMESTAMP,
-  `tenant_id` varchar(32) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL,
   PRIMARY KEY (`id`) USING BTREE,
-  INDEX `id`(`id`) USING BTREE,
+  KEY `id` (`id`) USING BTREE,
-  INDEX `idx_type_timestamp`(`ne_type`, `timestamp`, `event_type`, `tenant_id`) USING BTREE
+  KEY `idx_type_timestamp` (`ne_type`,`timestamp`,`event_type`) USING BTREE
-) ENGINE = InnoDB AUTO_INCREMENT = 1 CHARACTER SET = utf8mb4 COLLATE = utf8mb4_general_ci ROW_FORMAT = Dynamic;
+) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_general_ci ROW_FORMAT=DYNAMIC;
 
 SET FOREIGN_KEY_CHECKS = 1;

database/upgrade/upg_ue_event_mme.sql

@@ -1,19 +1,3 @@
-/*
- Navicat Premium Data Transfer
-
- Source Server         : local_mariadb
- Source Server Type    : MariaDB
- Source Server Version : 100338 (10.3.38-MariaDB)
- Source Host           : localhost:33066
- Source Schema         : tenants_db
-
- Target Server Type    : MariaDB
- Target Server Version : 100338 (10.3.38-MariaDB)
- File Encoding         : 65001
-
- Date: 04/07/2024 10:16:18
-*/
-
 SET NAMES utf8mb4;
 SET FOREIGN_KEY_CHECKS = 0;
 
@@ -21,18 +5,17 @@ SET FOREIGN_KEY_CHECKS = 0;
 -- Table structure for ue_event_mme
 -- ----------------------------
 CREATE TABLE IF NOT EXISTS `ue_event_mme`  (
-  `id` int(11) NOT NULL AUTO_INCREMENT,
+  `id` int NOT NULL AUTO_INCREMENT,
-  `ne_type` varchar(32) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL,
+  `ne_type` varchar(32) COLLATE utf8mb4_general_ci DEFAULT NULL,
-  `ne_name` varchar(64) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL,
+  `ne_name` varchar(64) COLLATE utf8mb4_general_ci DEFAULT NULL,
-  `rm_uid` varchar(32) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL,
+  `rm_uid` varchar(32) COLLATE utf8mb4_general_ci DEFAULT NULL,
-  `timestamp` int(11) NULL DEFAULT NULL,
+  `timestamp` int DEFAULT NULL,
-  `event_type` varchar(16) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT '' COMMENT 'ECM STATUS, EMM STATUS',
+  `event_type` varchar(16) COLLATE utf8mb4_general_ci DEFAULT '' COMMENT 'ECM STATUS, EMM STATUS',
-  `event_json` longtext CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL,
+  `event_json` longtext COLLATE utf8mb4_general_ci,
-  `created_at` datetime NULL DEFAULT current_timestamp(),
+  `created_at` datetime DEFAULT CURRENT_TIMESTAMP,
-  `tenant_id` varchar(32) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL,
   PRIMARY KEY (`id`) USING BTREE,
-  INDEX `id`(`id`) USING BTREE,
+  KEY `id` (`id`) USING BTREE,
-  INDEX `idx_type_timestamp`(`ne_type`, `timestamp`, `event_type`, `tenant_id`) USING BTREE
+  KEY `idx_type_timestamp` (`ne_type`,`timestamp`,`event_type`) USING BTREE
-) ENGINE = InnoDB AUTO_INCREMENT = 1 CHARACTER SET = utf8mb4 COLLATE = utf8mb4_general_ci ROW_FORMAT = Dynamic;
+) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_general_ci ROW_FORMAT=DYNAMIC;
 
 SET FOREIGN_KEY_CHECKS = 1;

database/upgvue3/upg_alarm_event.sql

@@ -63,7 +63,7 @@ CREATE TABLE IF NOT EXISTS `alarm_event`  (
 START TRANSACTION;
 
 INSERT INTO
-    `alarm_event` (
+    `omc_db`.`alarm_event` (
         `alarm_seq`,
         `alarm_id`,
         `alarm_title`,
@@ -126,11 +126,11 @@ SELECT
     `clear_time`,
     `clear_user`,
     `timestamp`
-FROM `alarm`
+FROM `omc_db`.`alarm`
 WHERE
     `orig_severity` = 'Event';
 
-DELETE FROM `alarm` WHERE `orig_severity` = 'Event';
+DELETE FROM `omc_db`.`alarm` WHERE `orig_severity` = 'Event';
 
 COMMIT;
 

database/upgvue3/upg_sys_config.sql

@@ -3,10 +3,10 @@ SET FOREIGN_KEY_CHECKS=0;
 -- 参数配置value长度
 
 ALTER TABLE
-    `sys_config` MODIFY COLUMN `config_value` varchar(255) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT '' COMMENT '参数键值' AFTER `config_key`;
+    `omc_db`.`sys_config` MODIFY COLUMN `config_value` varchar(255) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT '' COMMENT '参数键值' AFTER `config_key`;
 
 INSERT
-    IGNORE INTO `sys_config` (
+    IGNORE INTO `omc_db`.`sys_config` (
         `config_id`,
         `config_name`,
         `config_key`,
@@ -32,7 +32,7 @@ VALUES (
     );
 
 INSERT
-    IGNORE INTO `sys_config` (
+    IGNORE INTO `omc_db`.`sys_config` (
         `config_id`,
         `config_name`,
         `config_key`,
@@ -58,7 +58,7 @@ VALUES (
     );
 
 INSERT
-    IGNORE INTO `sys_config` (
+    IGNORE INTO `omc_db`.`sys_config` (
         `config_id`,
         `config_name`,
         `config_key`,
@@ -84,7 +84,7 @@ VALUES (
     );
 
 INSERT
-    IGNORE INTO `sys_config` (
+    IGNORE INTO `omc_db`.`sys_config` (
         `config_id`,
         `config_name`,
         `config_key`,
@@ -110,7 +110,7 @@ VALUES (
     );
 
 INSERT
-    IGNORE INTO `sys_config` (
+    IGNORE INTO `omc_db`.`sys_config` (
         `config_id`,
         `config_name`,
         `config_key`,
@@ -136,7 +136,7 @@ VALUES (
     );
 
 INSERT
-    IGNORE INTO `sys_config` (
+    IGNORE INTO `omc_db`.`sys_config` (
         `config_id`,
         `config_name`,
         `config_key`,
@@ -162,7 +162,7 @@ VALUES (
     );
 
 INSERT
-    IGNORE INTO `sys_config` (
+    IGNORE INTO `omc_db`.`sys_config` (
         `config_id`,
         `config_name`,
         `config_key`,
@@ -188,7 +188,7 @@ VALUES (
     );
 
 INSERT
-    IGNORE INTO `sys_config` (
+    IGNORE INTO `omc_db`.`sys_config` (
         `config_id`,
         `config_name`,
         `config_key`,
@@ -214,7 +214,7 @@ VALUES (
     );
 
 INSERT
-    IGNORE INTO `sys_config` (
+    IGNORE INTO `omc_db`.`sys_config` (
         `config_id`,
         `config_name`,
         `config_key`,
@@ -240,7 +240,7 @@ VALUES (
     );
 
 INSERT
-    IGNORE INTO `sys_config` (
+    IGNORE INTO `omc_db`.`sys_config` (
         `config_id`,
         `config_name`,
         `config_key`,
@@ -266,7 +266,7 @@ VALUES (
     );
 
 INSERT
-    IGNORE INTO `sys_config` (
+    IGNORE INTO `omc_db`.`sys_config` (
         `config_id`,
         `config_name`,
         `config_key`,
@@ -292,7 +292,7 @@ VALUES (
     );
 
 INSERT
-    IGNORE INTO `sys_config` (
+    IGNORE INTO `omc_db`.`sys_config` (
         `config_id`,
         `config_name`,
         `config_key`,
@@ -318,7 +318,7 @@ VALUES (
     );
 
 INSERT
-    IGNORE INTO `sys_config` (
+    IGNORE INTO `omc_db`.`sys_config` (
         `config_id`,
         `config_name`,
         `config_key`,
@@ -344,7 +344,7 @@ VALUES (
     );
 
 INSERT
-    IGNORE INTO `sys_config` (
+    IGNORE INTO `omc_db`.`sys_config` (
         `config_id`,
         `config_name`,
         `config_key`,
@@ -370,7 +370,7 @@ VALUES (
     );
 
 INSERT IGNORE INTO
-    `sys_config` (
+    `omc_db`.`sys_config` (
         `config_id`,
         `config_name`,
         `config_key`,
@@ -396,7 +396,7 @@ VALUES (
     );
 
 INSERT IGNORE INTO
-    `sys_config` (
+    `omc_db`.`sys_config` (
         `config_id`,
         `config_name`,
         `config_key`,
@@ -421,7 +421,7 @@ VALUES (
         'config.sys.i18nDefaultRemark'
     );
 
-UPDATE `sys_config`
+UPDATE `omc_db`.`sys_config`
 SET
     `config_name` = 'config.sys.helpDoc',
     `config_key` = 'sys.helpDoc',
@@ -434,7 +434,7 @@ SET
     `remark` = 'config.sys.helpDocRemark'
 WHERE `config_id` = 7;
 
-UPDATE `sys_config`
+UPDATE `omc_db`.`sys_config`
 SET
     `config_name` = 'config.sys.logo.type',
     `config_key` = 'sys.logo.type',
@@ -447,7 +447,7 @@ SET
     `remark` = 'config.sys.logo.typeRemark'
 WHERE `config_id` = 102;
 
-UPDATE `sys_config`
+UPDATE `omc_db`.`sys_config`
 SET
     `config_name` = 'config.sys.logo.filePathIcon',
     `config_key` = 'sys.logo.filePathIcon',
@@ -460,7 +460,7 @@ SET
     `remark` = 'config.sys.logo.filePathIconRemark'
 WHERE `config_id` = 103;
 
-UPDATE `sys_config`
+UPDATE `omc_db`.`sys_config`
 SET
     `config_name` = 'config.sys.logo.filePathBrand',
     `config_key` = 'sys.logo.filePathBrand',
@@ -474,7 +474,7 @@ SET
 WHERE `config_id` = 104;
 
 INSERT
-    IGNORE INTO `sys_config` (
+    IGNORE INTO `omc_db`.`sys_config` (
         `config_id`,
         `config_name`,
         `config_key`,

database/upgvue3/upg_sys_dept.sql

@@ -1,7 +1,7 @@
 SET FOREIGN_KEY_CHECKS=0;
 
-DROP TABLE IF EXISTS `sys_dept`;
+DROP TABLE IF EXISTS `omc_db`.`sys_dept`;
-CREATE TABLE  `sys_dept` (
+CREATE TABLE  `omc_db`.`sys_dept` (
         `dept_id` bigint(20) NOT NULL AUTO_INCREMENT COMMENT '部门id',
         `parent_id` bigint(20) NULL DEFAULT 0 COMMENT '父部门id 默认0',
         `ancestors` varchar(50) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT '' COMMENT '祖级列表',
@@ -22,7 +22,7 @@ CREATE TABLE  `sys_dept` (
 -- -- add default dept
 
 INSERT
-    IGNORE INTO `sys_dept` (
+    IGNORE INTO `omc_db`.`sys_dept` (
         `dept_id`,
         `parent_id`,
         `ancestors`,
@@ -56,7 +56,7 @@ VALUES (
     );
 
 INSERT
-    IGNORE INTO `sys_dept` (
+    IGNORE INTO `omc_db`.`sys_dept` (
         `dept_id`,
         `parent_id`,
         `ancestors`,
@@ -90,7 +90,7 @@ VALUES (
     );
 
 -- for cn/en locale
-UPDATE `sys_dept`
+UPDATE `omc_db`.`sys_dept`
 SET
     `parent_id` = 0,
     `ancestors` = '0',
@@ -107,7 +107,7 @@ SET
     `update_time` = 0
 WHERE `dept_id` = 100;
 
-UPDATE `sys_dept`
+UPDATE `omc_db`.`sys_dept`
 SET
     `parent_id` = 100,
     `ancestors` = '0,100',

database/upgvue3/upg_sys_job.sql

@@ -18,7 +18,7 @@ SET FOREIGN_KEY_CHECKS = 0;
 -- ----------------------------
 -- Table structure for sys_job
 -- ----------------------------
-CREATE TABLE IF NOT EXISTS `sys_job` (
+CREATE TABLE IF NOT EXISTS `omc_db`.`sys_job` (
   `job_id` bigint(20) NOT NULL AUTO_INCREMENT COMMENT '任务ID',
   `job_name` varchar(50) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NOT NULL DEFAULT '' COMMENT '任务名称',
   `job_group` varchar(50) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NOT NULL DEFAULT 'DEFAULT' COMMENT '任务组名',
@@ -38,7 +38,7 @@ CREATE TABLE IF NOT EXISTS `sys_job` (
 ) ENGINE = InnoDB AUTO_INCREMENT = 8 CHARACTER SET = utf8mb4 COLLATE = utf8mb4_general_ci COMMENT = '调度任务调度表' ROW_FORMAT = Dynamic;
 
 ALTER TABLE
-    `sys_job` DROP PRIMARY KEY,
+    `omc_db`.`sys_job` DROP PRIMARY KEY,
 ADD
     PRIMARY KEY (`job_id`) USING BTREE,
 ADD
@@ -48,7 +48,7 @@ ADD
 -- Records of sys_job
 -- ----------------------------
 INSERT IGNORE INTO
-    `sys_job` (
+    `omc_db`.`sys_job` (
         `job_id`,
         `job_name`,
         `job_group`,
@@ -84,7 +84,7 @@ VALUES (
     );
 
 INSERT IGNORE INTO
-    `sys_job` (
+    `omc_db`.`sys_job` (
         `job_id`,
         `job_name`,
         `job_group`,
@@ -120,7 +120,7 @@ VALUES (
     );
 
 INSERT IGNORE INTO
-    `sys_job` (
+    `omc_db`.`sys_job` (
         `job_id`,
         `job_name`,
         `job_group`,
@@ -156,7 +156,7 @@ VALUES (
     );
 
 INSERT IGNORE INTO
-    `sys_job` (
+    `omc_db`.`sys_job` (
         `job_id`,
         `job_name`,
         `job_group`,
@@ -192,7 +192,7 @@ VALUES (
     );
 
 INSERT IGNORE INTO
-    `sys_job` (
+    `omc_db`.`sys_job` (
         `job_id`,
         `job_name`,
         `job_group`,
@@ -228,7 +228,7 @@ VALUES (
     );
 
 INSERT IGNORE INTO
-    `sys_job` (
+    `omc_db`.`sys_job` (
         `job_id`,
         `job_name`,
         `job_group`,
@@ -264,7 +264,7 @@ VALUES (
     );
 
 INSERT IGNORE INTO
-    `sys_job` (
+    `omc_db`.`sys_job` (
         `job_id`,
         `job_name`,
         `job_group`,
@@ -300,7 +300,7 @@ VALUES (
     );
 
 INSERT IGNORE INTO
-    `sys_job` (
+    `omc_db`.`sys_job` (
         `job_id`,
         `job_name`,
         `job_group`,
@@ -335,7 +335,7 @@ VALUES (
         'job.genNeStateAlarmRemark'
     );
 
-UPDATE `sys_job`
+UPDATE `omc_db`.`sys_job`
 SET
     `target_params` = '{\"duration\":1,\"tableName\":\"ne_state\",\"colName\":\"timestamp\"}'
 WHERE

database/upgvue3/upg_sys_menu.sql

@@ -265,14 +265,14 @@ INSERT IGNORE INTO `sys_menu` VALUES (2141, 'menu.monitor.event', 2087, 50, 'eve
 
 -- 指定记录条件更新
 
-UPDATE `sys_menu` SET `is_cache` = '1' WHERE `menu_id` = 2118;
+UPDATE `omc_db`.`sys_menu` SET `is_cache` = '1' WHERE `menu_id` = 2118;
-UPDATE `sys_menu` SET `is_cache` = '1' WHERE `menu_id` = 2134;
+UPDATE `omc_db`.`sys_menu` SET `is_cache` = '1' WHERE `menu_id` = 2134;
-UPDATE `sys_menu` SET  `path` = 'imsCDR', `component` = 'dashboard/imsCDR/index' WHERE `menu_id` = 2133;
+UPDATE `omc_db`.`sys_menu` SET  `path` = 'imsCDR', `component` = 'dashboard/imsCDR/index' WHERE `menu_id` = 2133;
 
-DELETE FROM `sys_menu` WHERE `menu_id` = 2142;
+DELETE FROM `omc_db`.`sys_menu` WHERE `menu_id` = 2142;
-DELETE FROM `sys_menu` WHERE `menu_id` = 2143;
+DELETE FROM `omc_db`.`sys_menu` WHERE `menu_id` = 2143;
 
-UPDATE `sys_menu`
+UPDATE `omc_db`.`sys_menu`
 SET
     `menu_name` = 'menu.system.cacheInfo',
     `parent_id` = 1,
@@ -294,7 +294,7 @@ SET
 WHERE
     `menu_id` = 113;
 
-UPDATE `sys_menu`
+UPDATE `omc_db`.`sys_menu`
 SET
     `menu_name` = 'menu.system.cache',
     `parent_id` = 1,
@@ -316,7 +316,7 @@ SET
 WHERE
     `menu_id` = 114;
 
-UPDATE `sys_menu`
+UPDATE `omc_db`.`sys_menu`
 SET
     `menu_name` = 'menu.ueUser.authUDM',
     `parent_id` = 5,
@@ -338,7 +338,7 @@ SET
 WHERE
     `menu_id` = 2009;
 
-UPDATE `sys_menu`
+UPDATE `omc_db`.`sys_menu`
 SET
     `menu_name` = 'menu.ueUser.subUDM',
     `parent_id` = 5,
@@ -360,7 +360,7 @@ SET
 WHERE
     `menu_id` = 2010;
 
-UPDATE `sys_menu`
+UPDATE `omc_db`.`sys_menu`
 SET
     `menu_name` = 'menu.ueUser.onlineIMS',
     `parent_id` = 5,
@@ -382,7 +382,7 @@ SET
 WHERE
     `menu_id` = 2080;
 
-UPDATE `sys_menu`
+UPDATE `omc_db`.`sys_menu`
 SET
     `menu_name` = 'menu.ueUser.onlineUE',
     `parent_id` = 5,
@@ -404,7 +404,7 @@ SET
 WHERE
     `menu_id` = 2081;
 
-UPDATE `sys_menu`
+UPDATE `omc_db`.`sys_menu`
 SET
     `menu_name` = 'menu.ueUser.base5G',
     `parent_id` = 5,
@@ -426,7 +426,7 @@ SET
 WHERE
     `menu_id` = 2082;
 
-UPDATE `sys_menu`
+UPDATE `omc_db`.`sys_menu`
 SET
     `menu_name` = 'menu.perf.customTarget',
     `parent_id` = 2099,
@@ -450,7 +450,7 @@ WHERE
 
 
 
-UPDATE `sys_menu`
+UPDATE `omc_db`.`sys_menu`
 SET
     `menu_name` = 'menu.tools.help',
     `parent_id` = 3,
@@ -472,7 +472,7 @@ SET
 WHERE
     `menu_id` = 118;
 
-UPDATE `sys_menu`
+UPDATE `omc_db`.`sys_menu`
 SET
     `menu_name` = 'menu.ueUser.authUDM',
     `parent_id` = 5,
@@ -494,7 +494,7 @@ SET
 WHERE
     `menu_id` = 2009;
 
-UPDATE `sys_menu`
+UPDATE `omc_db`.`sys_menu`
 SET
     `menu_name` = 'menu.ueUser.subUDM',
     `parent_id` = 5,
@@ -516,7 +516,7 @@ SET
 WHERE
     `menu_id` = 2010;
 
-UPDATE `sys_menu`
+UPDATE `omc_db`.`sys_menu`
 SET
     `menu_name` = 'menu.config.neManage',
     `parent_id` = 4,
@@ -538,7 +538,7 @@ SET
 WHERE
     `menu_id` = 2075;
 
-UPDATE `sys_menu`
+UPDATE `omc_db`.`sys_menu`
 SET
     `menu_name` = 'menu.config.configNE',
     `parent_id` = 4,
@@ -560,7 +560,7 @@ SET
 WHERE
     `menu_id` = 2076;
 
-UPDATE `sys_menu`
+UPDATE `omc_db`.`sys_menu`
 SET
     `menu_name` = 'menu.config.backupManage',
     `parent_id` = 4,
@@ -582,7 +582,7 @@ SET
 WHERE
     `menu_id` = 2078;
 
-UPDATE `sys_menu`
+UPDATE `omc_db`.`sys_menu`
 SET
     `menu_name` = 'menu.config.softwareManage',
     `parent_id` = 4,
@@ -604,7 +604,7 @@ SET
 WHERE
     `menu_id` = 2079;
 
-UPDATE `sys_menu`
+UPDATE `omc_db`.`sys_menu`
 SET
     `menu_name` = 'menu.ueUser.base5G',
     `parent_id` = 5,
@@ -626,7 +626,7 @@ SET
 WHERE
     `menu_id` = 2082;
 
-UPDATE `sys_menu`
+UPDATE `omc_db`.`sys_menu`
 SET
     `menu_name` = 'menu.trace.task',
     `parent_id` = 2083,
@@ -648,7 +648,7 @@ SET
 WHERE
     `menu_id` = 2084;
 
-UPDATE `sys_menu`
+UPDATE `omc_db`.`sys_menu`
 SET
     `menu_name` = 'menu.trace.analysis',
     `parent_id` = 2083,
@@ -670,7 +670,7 @@ SET
 WHERE
     `menu_id` = 2085;
 
-UPDATE `sys_menu`
+UPDATE `omc_db`.`sys_menu`
 SET
     `menu_name` = 'menu.log.alarm',
     `parent_id` = 2089,
@@ -692,7 +692,7 @@ SET
 WHERE
     `menu_id` = 2092;
 
-UPDATE `sys_menu`
+UPDATE `omc_db`.`sys_menu`
 SET
     `menu_name` = 'menu.perf.task',
     `parent_id` = 2099,
@@ -714,7 +714,7 @@ SET
 WHERE
     `menu_id` = 2100;
 
-UPDATE `sys_menu`
+UPDATE `omc_db`.`sys_menu`
 SET
     `menu_name` = 'menu.perf.data',
     `parent_id` = 2099,
@@ -736,7 +736,7 @@ SET
 WHERE
     `menu_id` = 2101;
 
-UPDATE `sys_menu`
+UPDATE `omc_db`.`sys_menu`
 SET
     `menu_name` = 'menu.perf.threshold',
     `parent_id` = 2099,
@@ -758,7 +758,7 @@ SET
 WHERE
     `menu_id` = 2103;
 
-UPDATE `sys_menu`
+UPDATE `omc_db`.`sys_menu`
 SET
     `menu_name` = 'menu.perf.customTarget',
     `parent_id` = 2099,
@@ -780,7 +780,7 @@ SET
 WHERE
     `menu_id` = 2105;
 
-UPDATE `sys_menu`
+UPDATE `omc_db`.`sys_menu`
 SET
     `menu_name` = 'menu.mml.set',
     `parent_id` = 2107,
@@ -802,7 +802,7 @@ SET
 WHERE
     `menu_id` = 2110;
 
-UPDATE `sys_menu`
+UPDATE `omc_db`.`sys_menu`
 SET
     `menu_name` = 'menu.dashboard.cdr',
     `parent_id` = 2140,
@@ -824,7 +824,7 @@ SET
 WHERE
     `menu_id` = 2133;
 
-UPDATE `sys_menu`
+UPDATE `omc_db`.`sys_menu`
 SET
     `menu_name` = 'menu.config.neHost',
     `parent_id` = 4,
@@ -846,7 +846,7 @@ SET
 WHERE
     `menu_id` = 2135;
 
-UPDATE `sys_menu`
+UPDATE `omc_db`.`sys_menu`
 SET
     `menu_name` = 'menu.dashboard.amfUE',
     `parent_id` = 2141,
@@ -868,7 +868,7 @@ SET
 WHERE
     `menu_id` = 2138;
 
-UPDATE `sys_menu`
+UPDATE `omc_db`.`sys_menu`
 SET
     `menu_name` = 'menu.logs.log',
     `parent_id` = 2089,
@@ -890,7 +890,7 @@ SET
 WHERE
     `menu_id` = 2139;
 
-UPDATE `sys_menu`
+UPDATE `omc_db`.`sys_menu`
 SET
     `menu_name` = 'menu.monitor.cdr',
     `parent_id` = 2087,
@@ -912,7 +912,7 @@ SET
 WHERE
     `menu_id` = 2140;
 
-UPDATE `sys_menu`
+UPDATE `omc_db`.`sys_menu`
 SET
     `menu_name` = 'menu.monitor.event',
     `parent_id` = 2087,
@@ -935,171 +935,171 @@ WHERE
     `menu_id` = 2141;
 
 -- begin: remove some excess old menus at 2024/05/10, r2.2405.1
-DELETE FROM `sys_menu` WHERE `menu_id` = 2;
+DELETE FROM `omc_db`.`sys_menu` WHERE `menu_id` = 2;
 
-DELETE FROM `sys_menu` WHERE `menu_id` = 3;
+DELETE FROM `omc_db`.`sys_menu` WHERE `menu_id` = 3;
 
-DELETE FROM `sys_menu` WHERE `menu_id` = 6;
+DELETE FROM `omc_db`.`sys_menu` WHERE `menu_id` = 6;
 
-DELETE FROM `sys_menu` WHERE `menu_id` = 7;
+DELETE FROM `omc_db`.`sys_menu` WHERE `menu_id` = 7;
 
-DELETE FROM `sys_menu` WHERE `menu_id` = 8;
+DELETE FROM `omc_db`.`sys_menu` WHERE `menu_id` = 8;
 
-DELETE FROM `sys_menu` WHERE `menu_id` = 9;
+DELETE FROM `omc_db`.`sys_menu` WHERE `menu_id` = 9;
 
-DELETE FROM `sys_menu` WHERE `menu_id` = 10;
+DELETE FROM `omc_db`.`sys_menu` WHERE `menu_id` = 10;
 
-DELETE FROM `sys_menu` WHERE `menu_id` = 11;
+DELETE FROM `omc_db`.`sys_menu` WHERE `menu_id` = 11;
 
-DELETE FROM `sys_menu` WHERE `menu_id` = 12;
+DELETE FROM `omc_db`.`sys_menu` WHERE `menu_id` = 12;
 
-DELETE FROM `sys_menu` WHERE `menu_id` = 13;
+DELETE FROM `omc_db`.`sys_menu` WHERE `menu_id` = 13;
 
-DELETE FROM `sys_menu` WHERE `menu_id` = 14;
+DELETE FROM `omc_db`.`sys_menu` WHERE `menu_id` = 14;
 
-DELETE FROM `sys_menu` WHERE `menu_id` = 15;
+DELETE FROM `omc_db`.`sys_menu` WHERE `menu_id` = 15;
 
-DELETE FROM `sys_menu` WHERE `menu_id` = 118;
+DELETE FROM `omc_db`.`sys_menu` WHERE `menu_id` = 118;
 
-DELETE FROM `sys_menu` WHERE `menu_id` = 2011;
+DELETE FROM `omc_db`.`sys_menu` WHERE `menu_id` = 2011;
 
-DELETE FROM `sys_menu` WHERE `menu_id` = 2012;
+DELETE FROM `omc_db`.`sys_menu` WHERE `menu_id` = 2012;
 
-DELETE FROM `sys_menu` WHERE `menu_id` = 2013;
+DELETE FROM `omc_db`.`sys_menu` WHERE `menu_id` = 2013;
 
-DELETE FROM `sys_menu` WHERE `menu_id` = 2014;
+DELETE FROM `omc_db`.`sys_menu` WHERE `menu_id` = 2014;
 
-DELETE FROM `sys_menu` WHERE `menu_id` = 2015;
+DELETE FROM `omc_db`.`sys_menu` WHERE `menu_id` = 2015;
 
-DELETE FROM `sys_menu` WHERE `menu_id` = 2016;
+DELETE FROM `omc_db`.`sys_menu` WHERE `menu_id` = 2016;
 
-DELETE FROM `sys_menu` WHERE `menu_id` = 2017;
+DELETE FROM `omc_db`.`sys_menu` WHERE `menu_id` = 2017;
 
-DELETE FROM `sys_menu` WHERE `menu_id` = 2018;
+DELETE FROM `omc_db`.`sys_menu` WHERE `menu_id` = 2018;
 
-DELETE FROM `sys_menu` WHERE `menu_id` = 2019;
+DELETE FROM `omc_db`.`sys_menu` WHERE `menu_id` = 2019;
 
-DELETE FROM `sys_menu` WHERE `menu_id` = 2020;
+DELETE FROM `omc_db`.`sys_menu` WHERE `menu_id` = 2020;
 
-DELETE FROM `sys_menu` WHERE `menu_id` = 2021;
+DELETE FROM `omc_db`.`sys_menu` WHERE `menu_id` = 2021;
 
-DELETE FROM `sys_menu` WHERE `menu_id` = 2022;
+DELETE FROM `omc_db`.`sys_menu` WHERE `menu_id` = 2022;
 
-DELETE FROM `sys_menu` WHERE `menu_id` = 2023;
+DELETE FROM `omc_db`.`sys_menu` WHERE `menu_id` = 2023;
 
-DELETE FROM `sys_menu` WHERE `menu_id` = 2024;
+DELETE FROM `omc_db`.`sys_menu` WHERE `menu_id` = 2024;
 
-DELETE FROM `sys_menu` WHERE `menu_id` = 2025;
+DELETE FROM `omc_db`.`sys_menu` WHERE `menu_id` = 2025;
 
-DELETE FROM `sys_menu` WHERE `menu_id` = 2026;
+DELETE FROM `omc_db`.`sys_menu` WHERE `menu_id` = 2026;
 
-DELETE FROM `sys_menu` WHERE `menu_id` = 2027;
+DELETE FROM `omc_db`.`sys_menu` WHERE `menu_id` = 2027;
 
-DELETE FROM `sys_menu` WHERE `menu_id` = 2028;
+DELETE FROM `omc_db`.`sys_menu` WHERE `menu_id` = 2028;
 
-DELETE FROM `sys_menu` WHERE `menu_id` = 2029;
+DELETE FROM `omc_db`.`sys_menu` WHERE `menu_id` = 2029;
 
-DELETE FROM `sys_menu` WHERE `menu_id` = 2030;
+DELETE FROM `omc_db`.`sys_menu` WHERE `menu_id` = 2030;
 
-DELETE FROM `sys_menu` WHERE `menu_id` = 2031;
+DELETE FROM `omc_db`.`sys_menu` WHERE `menu_id` = 2031;
 
-DELETE FROM `sys_menu` WHERE `menu_id` = 2032;
+DELETE FROM `omc_db`.`sys_menu` WHERE `menu_id` = 2032;
 
-DELETE FROM `sys_menu` WHERE `menu_id` = 2033;
+DELETE FROM `omc_db`.`sys_menu` WHERE `menu_id` = 2033;
 
-DELETE FROM `sys_menu` WHERE `menu_id` = 2034;
+DELETE FROM `omc_db`.`sys_menu` WHERE `menu_id` = 2034;
 
-DELETE FROM `sys_menu` WHERE `menu_id` = 2035;
+DELETE FROM `omc_db`.`sys_menu` WHERE `menu_id` = 2035;
 
-DELETE FROM `sys_menu` WHERE `menu_id` = 2036;
+DELETE FROM `omc_db`.`sys_menu` WHERE `menu_id` = 2036;
 
-DELETE FROM `sys_menu` WHERE `menu_id` = 2037;
+DELETE FROM `omc_db`.`sys_menu` WHERE `menu_id` = 2037;
 
-DELETE FROM `sys_menu` WHERE `menu_id` = 2038;
+DELETE FROM `omc_db`.`sys_menu` WHERE `menu_id` = 2038;
 
-DELETE FROM `sys_menu` WHERE `menu_id` = 2039;
+DELETE FROM `omc_db`.`sys_menu` WHERE `menu_id` = 2039;
 
-DELETE FROM `sys_menu` WHERE `menu_id` = 2040;
+DELETE FROM `omc_db`.`sys_menu` WHERE `menu_id` = 2040;
 
-DELETE FROM `sys_menu` WHERE `menu_id` = 2041;
+DELETE FROM `omc_db`.`sys_menu` WHERE `menu_id` = 2041;
 
-DELETE FROM `sys_menu` WHERE `menu_id` = 2042;
+DELETE FROM `omc_db`.`sys_menu` WHERE `menu_id` = 2042;
 
-DELETE FROM `sys_menu` WHERE `menu_id` = 2043;
+DELETE FROM `omc_db`.`sys_menu` WHERE `menu_id` = 2043;
 
-DELETE FROM `sys_menu` WHERE `menu_id` = 2044;
+DELETE FROM `omc_db`.`sys_menu` WHERE `menu_id` = 2044;
 
-DELETE FROM `sys_menu` WHERE `menu_id` = 2045;
+DELETE FROM `omc_db`.`sys_menu` WHERE `menu_id` = 2045;
 
-DELETE FROM `sys_menu` WHERE `menu_id` = 2046;
+DELETE FROM `omc_db`.`sys_menu` WHERE `menu_id` = 2046;
 
-DELETE FROM `sys_menu` WHERE `menu_id` = 2047;
+DELETE FROM `omc_db`.`sys_menu` WHERE `menu_id` = 2047;
 
-DELETE FROM `sys_menu` WHERE `menu_id` = 2048;
+DELETE FROM `omc_db`.`sys_menu` WHERE `menu_id` = 2048;
 
-DELETE FROM `sys_menu` WHERE `menu_id` = 2049;
+DELETE FROM `omc_db`.`sys_menu` WHERE `menu_id` = 2049;
 
-DELETE FROM `sys_menu` WHERE `menu_id` = 2050;
+DELETE FROM `omc_db`.`sys_menu` WHERE `menu_id` = 2050;
 
-DELETE FROM `sys_menu` WHERE `menu_id` = 2051;
+DELETE FROM `omc_db`.`sys_menu` WHERE `menu_id` = 2051;
 
-DELETE FROM `sys_menu` WHERE `menu_id` = 2052;
+DELETE FROM `omc_db`.`sys_menu` WHERE `menu_id` = 2052;
 
-DELETE FROM `sys_menu` WHERE `menu_id` = 2053;
+DELETE FROM `omc_db`.`sys_menu` WHERE `menu_id` = 2053;
 
-DELETE FROM `sys_menu` WHERE `menu_id` = 2054;
+DELETE FROM `omc_db`.`sys_menu` WHERE `menu_id` = 2054;
 
-DELETE FROM `sys_menu` WHERE `menu_id` = 2055;
+DELETE FROM `omc_db`.`sys_menu` WHERE `menu_id` = 2055;
 
-DELETE FROM `sys_menu` WHERE `menu_id` = 2056;
+DELETE FROM `omc_db`.`sys_menu` WHERE `menu_id` = 2056;
 
-DELETE FROM `sys_menu` WHERE `menu_id` = 2057;
+DELETE FROM `omc_db`.`sys_menu` WHERE `menu_id` = 2057;
 
-DELETE FROM `sys_menu` WHERE `menu_id` = 2058;
+DELETE FROM `omc_db`.`sys_menu` WHERE `menu_id` = 2058;
 
-DELETE FROM `sys_menu` WHERE `menu_id` = 2059;
+DELETE FROM `omc_db`.`sys_menu` WHERE `menu_id` = 2059;
 
-DELETE FROM `sys_menu` WHERE `menu_id` = 2060;
+DELETE FROM `omc_db`.`sys_menu` WHERE `menu_id` = 2060;
 
-DELETE FROM `sys_menu` WHERE `menu_id` = 2065;
+DELETE FROM `omc_db`.`sys_menu` WHERE `menu_id` = 2065;
 
-DELETE FROM `sys_menu` WHERE `menu_id` = 2066;
+DELETE FROM `omc_db`.`sys_menu` WHERE `menu_id` = 2066;
 
-DELETE FROM `sys_menu` WHERE `menu_id` = 2067;
+DELETE FROM `omc_db`.`sys_menu` WHERE `menu_id` = 2067;
 
-DELETE FROM `sys_menu` WHERE `menu_id` = 2068;
+DELETE FROM `omc_db`.`sys_menu` WHERE `menu_id` = 2068;
 
-DELETE FROM `sys_menu` WHERE `menu_id` = 2069;
+DELETE FROM `omc_db`.`sys_menu` WHERE `menu_id` = 2069;
 
-DELETE FROM `sys_menu` WHERE `menu_id` = 2070;
+DELETE FROM `omc_db`.`sys_menu` WHERE `menu_id` = 2070;
 
-DELETE FROM `sys_menu` WHERE `menu_id` = 2071;
+DELETE FROM `omc_db`.`sys_menu` WHERE `menu_id` = 2071;
 
-DELETE FROM `sys_menu` WHERE `menu_id` = 2072;
+DELETE FROM `omc_db`.`sys_menu` WHERE `menu_id` = 2072;
 
-DELETE FROM `sys_menu` WHERE `menu_id` = 2073;
+DELETE FROM `omc_db`.`sys_menu` WHERE `menu_id` = 2073;
 
-DELETE FROM `sys_menu` WHERE `menu_id` = 2074;
+DELETE FROM `omc_db`.`sys_menu` WHERE `menu_id` = 2074;
 
-DELETE FROM `sys_menu` WHERE `menu_id` = 2076;
+DELETE FROM `omc_db`.`sys_menu` WHERE `menu_id` = 2076;
 
-DELETE FROM `sys_menu` WHERE `menu_id` = 2077;
+DELETE FROM `omc_db`.`sys_menu` WHERE `menu_id` = 2077;
 
-DELETE FROM `sys_menu` WHERE `menu_id` = 2090;
+DELETE FROM `omc_db`.`sys_menu` WHERE `menu_id` = 2090;
 
-DELETE FROM `sys_menu` WHERE `menu_id` = 2093;
+DELETE FROM `omc_db`.`sys_menu` WHERE `menu_id` = 2093;
 
-DELETE FROM `sys_menu` WHERE `menu_id` = 2096;
+DELETE FROM `omc_db`.`sys_menu` WHERE `menu_id` = 2096;
 
-DELETE FROM `sys_menu` WHERE `menu_id` = 2116;
+DELETE FROM `omc_db`.`sys_menu` WHERE `menu_id` = 2116;
 
-DELETE FROM `sys_menu` WHERE `menu_id` = 2117;
+DELETE FROM `omc_db`.`sys_menu` WHERE `menu_id` = 2117;
 
-DELETE FROM `sys_menu` WHERE `menu_id` = 2134;
+DELETE FROM `omc_db`.`sys_menu` WHERE `menu_id` = 2134;
 
-DELETE FROM `sys_menu` WHERE `menu_id` = 2139;
+DELETE FROM `omc_db`.`sys_menu` WHERE `menu_id` = 2139;
 
-UPDATE `sys_menu`
+UPDATE `omc_db`.`sys_menu`
 SET
     `menu_name` = 'menu.log.set',
     `parent_id` = 2089,
@@ -1121,7 +1121,7 @@ SET
 WHERE
     `menu_id` = 2095;
 
-UPDATE `sys_menu`
+UPDATE `omc_db`.`sys_menu`
 SET
     `menu_name` = 'menu.perf.threshold',
     `parent_id` = 2099,
@@ -1146,7 +1146,7 @@ WHERE
 -- end: remove 
 
 INSERT IGNORE INTO
-    `sys_menu` (
+    `omc_db`.`sys_menu` (
         `menu_id`,
         `menu_name`,
         `parent_id`,

database/upgvue3/upg_sys_post.sql

@@ -1,7 +1,7 @@
 SET FOREIGN_KEY_CHECKS=0;
 
-DROP TABLE IF EXISTS `sys_post`;
+DROP TABLE IF EXISTS `omc_db`.`sys_post`;
-CREATE TABLE `sys_post` (
+CREATE TABLE `omc_db`.`sys_post` (
         `post_id` bigint(20) NOT NULL AUTO_INCREMENT COMMENT '岗位ID',
         `post_code` varchar(50) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NOT NULL COMMENT '岗位编码',
         `post_name` varchar(50) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NOT NULL COMMENT '岗位名称',
@@ -16,7 +16,7 @@ CREATE TABLE `sys_post` (
     ) ENGINE = InnoDB CHARACTER SET = utf8mb4 COLLATE = utf8mb4_general_ci COMMENT = '岗位信息表' ROW_FORMAT = Dynamic;
 
 INSERT IGNORE INTO
-    `sys_post` (
+    `omc_db`.`sys_post` (
         `post_id`,
         `post_code`,
         `post_name`,
@@ -42,7 +42,7 @@ VALUES (
     );
 
 INSERT IGNORE INTO
-    `sys_post` (
+    `omc_db`.`sys_post` (
         `post_id`,
         `post_code`,
         `post_name`,
@@ -68,7 +68,7 @@ VALUES (
     );
 
 INSERT IGNORE INTO
-    `sys_post` (
+    `omc_db`.`sys_post` (
         `post_id`,
         `post_code`,
         `post_name`,
@@ -94,7 +94,7 @@ VALUES (
     );
 
 INSERT IGNORE INTO
-    `sys_post` (
+    `omc_db`.`sys_post` (
         `post_id`,
         `post_code`,
         `post_name`,
@@ -120,7 +120,7 @@ VALUES (
     );
 
 -- for cn/en locales
-UPDATE `sys_post`
+UPDATE `omc_db`.`sys_post`
 SET
     `post_code` = 'administator',
     `post_name` = 'post.admin',
@@ -133,7 +133,7 @@ SET
     `remark` = NULL
 WHERE `post_id` = 1;
 
-UPDATE `sys_post`
+UPDATE `omc_db`.`sys_post`
 SET
     `post_code` = 'operator',
     `post_name` = 'post.operator',
@@ -146,7 +146,7 @@ SET
     `remark` = NULL
 WHERE `post_id` = 2;
 
-UPDATE `sys_post`
+UPDATE `omc_db`.`sys_post`
 SET
     `post_code` = 'monitor',
     `post_name` = 'post.monitor',
@@ -159,7 +159,7 @@ SET
     `remark` = NULL
 WHERE `post_id` = 3;
 
-UPDATE `sys_post`
+UPDATE `omc_db`.`sys_post`
 SET
     `post_code` = 'visitor',
     `post_name` = 'post.visitor',

database/upgvue3/upg_sys_role.sql

@@ -1,9 +1,9 @@
 SET FOREIGN_KEY_CHECKS=0;
 
-DELETE FROM `sys_role` WHERE `role_id` IN (1,2,3,4,5);
+DELETE FROM `omc_db`.`sys_role` WHERE `role_id` IN (1,2,3,4,5);
 
 INSERT IGNORE INTO
-    `sys_role` (
+    `omc_db`.`sys_role` (
         `role_id`,
         `role_name`,
         `role_key`,
@@ -37,7 +37,7 @@ VALUES (
     );
 
 INSERT IGNORE INTO
-    `sys_role` (
+    `omc_db`.`sys_role` (
         `role_id`,
         `role_name`,
         `role_key`,
@@ -71,7 +71,7 @@ VALUES (
     );
 
 INSERT IGNORE INTO
-    `sys_role` (
+    `omc_db`.`sys_role` (
         `role_id`,
         `role_name`,
         `role_key`,
@@ -105,7 +105,7 @@ VALUES (
     );
 
 INSERT IGNORE INTO
-    `sys_role` (
+    `omc_db`.`sys_role` (
         `role_id`,
         `role_name`,
         `role_key`,
@@ -139,7 +139,7 @@ VALUES (
     );
 
 INSERT IGNORE INTO
-    `sys_role` (
+    `omc_db`.`sys_role` (
         `role_id`,
         `role_name`,
         `role_key`,
@@ -173,7 +173,7 @@ VALUES (
     );
 
 -- for cn/en locales
-UPDATE `sys_role`
+UPDATE `omc_db`.`sys_role`
 SET
     `role_name` = 'role.admin',
     `role_key` = 'supervisor',
@@ -190,7 +190,7 @@ SET
     `remark` = 'role.adminRemark'
 WHERE `role_id` = 1;
 
-UPDATE `sys_role`
+UPDATE `omc_db`.`sys_role`
 SET
     `role_name` = 'role.adminAssign',
     `role_key` = 'administrator',
@@ -207,7 +207,7 @@ SET
     `remark` = 'role.adminAssignRemark'
 WHERE `role_id` = 2;
 
-UPDATE `sys_role`
+UPDATE `omc_db`.`sys_role`
 SET
     `role_name` = 'role.operator',
     `role_key` = 'operator',
@@ -224,7 +224,7 @@ SET
     `remark` = 'role.operatorRemark'
 WHERE `role_id` = 3;
 
-UPDATE `sys_role`
+UPDATE `omc_db`.`sys_role`
 SET
     `role_name` = 'role.monitor',
     `role_key` = 'monitor',
@@ -241,7 +241,7 @@ SET
     `remark` = 'role.monitorRemark'
 WHERE `role_id` = 4;
 
-UPDATE `sys_role`
+UPDATE `omc_db`.`sys_role`
 SET
     `role_name` = 'role.vistor',
     `role_key` = 'vistor',

database/upgvue3/upg_sys_role_dept.sql

@@ -1,7 +1,7 @@
 SET FOREIGN_KEY_CHECKS=0;
 
 CREATE TABLE
-    IF NOT EXISTS `sys_role_dept` (
+    IF NOT EXISTS `omc_db`.`sys_role_dept` (
         `role_id` bigint(20) NOT NULL COMMENT '角色ID',
         `dept_id` bigint(20) NOT NULL COMMENT '部门ID',
         PRIMARY KEY (`role_id`, `dept_id`) USING BTREE

database/upgvue3/upg_sys_role_menu.sql

@@ -264,62 +264,62 @@ INSERT IGNORE INTO `sys_role_menu` VALUES (100, 1);
 INSERT IGNORE INTO `sys_role_menu` VALUES (100, 100);
 INSERT IGNORE INTO `sys_role_menu` VALUES (100, 1000);
 
-DELETE FROM `sys_role_menu`
+DELETE FROM `omc_db`.`sys_role_menu`
 WHERE
     `role_id` = 2
     AND `menu_id` = 106;
 
-DELETE FROM `sys_role_menu`
+DELETE FROM `omc_db`.`sys_role_menu`
 WHERE
     `role_id` = 2
     AND `menu_id` = 107;
 
-DELETE FROM `sys_role_menu`
+DELETE FROM `omc_db`.`sys_role_menu`
 WHERE
     `role_id` = 2
     AND `menu_id` = 113;
 
-DELETE FROM `sys_role_menu`
+DELETE FROM `omc_db`.`sys_role_menu`
 WHERE
     `role_id` = 2
     AND `menu_id` = 1025;
 
-DELETE FROM `sys_role_menu`
+DELETE FROM `omc_db`.`sys_role_menu`
 WHERE
     `role_id` = 2
     AND `menu_id` = 1026;
 
-DELETE FROM `sys_role_menu`
+DELETE FROM `omc_db`.`sys_role_menu`
 WHERE
     `role_id` = 2
     AND `menu_id` = 1027;
 
-DELETE FROM `sys_role_menu`
+DELETE FROM `omc_db`.`sys_role_menu`
 WHERE
     `role_id` = 2
     AND `menu_id` = 1028;
 
-DELETE FROM `sys_role_menu`
+DELETE FROM `omc_db`.`sys_role_menu`
 WHERE
     `role_id` = 2
     AND `menu_id` = 1029;
 
-INSERT IGNORE INTO `sys_role_menu` (`role_id`, `menu_id`) VALUES (2, 2133);
+INSERT IGNORE INTO `omc_db`.`sys_role_menu` (`role_id`, `menu_id`) VALUES (2, 2133);
-INSERT IGNORE INTO `sys_role_menu` (`role_id`, `menu_id`) VALUES (2, 2138);
+INSERT IGNORE INTO `omc_db`.`sys_role_menu` (`role_id`, `menu_id`) VALUES (2, 2138);
-INSERT IGNORE INTO `sys_role_menu` (`role_id`, `menu_id`) VALUES (2, 2140);
+INSERT IGNORE INTO `omc_db`.`sys_role_menu` (`role_id`, `menu_id`) VALUES (2, 2140);
-INSERT IGNORE INTO `sys_role_menu` (`role_id`, `menu_id`) VALUES (2, 2141);
+INSERT IGNORE INTO `omc_db`.`sys_role_menu` (`role_id`, `menu_id`) VALUES (2, 2141);
-INSERT IGNORE INTO `sys_role_menu` (`role_id`, `menu_id`) VALUES (3, 2133);
+INSERT IGNORE INTO `omc_db`.`sys_role_menu` (`role_id`, `menu_id`) VALUES (3, 2133);
-INSERT IGNORE INTO `sys_role_menu` (`role_id`, `menu_id`) VALUES (3, 2138);
+INSERT IGNORE INTO `omc_db`.`sys_role_menu` (`role_id`, `menu_id`) VALUES (3, 2138);
-INSERT IGNORE INTO `sys_role_menu` (`role_id`, `menu_id`) VALUES (3, 2140);
+INSERT IGNORE INTO `omc_db`.`sys_role_menu` (`role_id`, `menu_id`) VALUES (3, 2140);
-INSERT IGNORE INTO `sys_role_menu` (`role_id`, `menu_id`) VALUES (3, 2141);
+INSERT IGNORE INTO `omc_db`.`sys_role_menu` (`role_id`, `menu_id`) VALUES (3, 2141);
-INSERT IGNORE INTO `sys_role_menu` (`role_id`, `menu_id`) VALUES (4, 2133);
+INSERT IGNORE INTO `omc_db`.`sys_role_menu` (`role_id`, `menu_id`) VALUES (4, 2133);
-INSERT IGNORE INTO `sys_role_menu` (`role_id`, `menu_id`) VALUES (4, 2138);
+INSERT IGNORE INTO `omc_db`.`sys_role_menu` (`role_id`, `menu_id`) VALUES (4, 2138);
-INSERT IGNORE INTO `sys_role_menu` (`role_id`, `menu_id`) VALUES (4, 2140);
+INSERT IGNORE INTO `omc_db`.`sys_role_menu` (`role_id`, `menu_id`) VALUES (4, 2140);
-INSERT IGNORE INTO `sys_role_menu` (`role_id`, `menu_id`) VALUES (4, 2141);
+INSERT IGNORE INTO `omc_db`.`sys_role_menu` (`role_id`, `menu_id`) VALUES (4, 2141);
 
 -- alarm event to role
-INSERT IGNORE INTO `sys_role_menu` (`role_id`, `menu_id`) VALUES (2, 2144);
+INSERT IGNORE INTO `omc_db`.`sys_role_menu` (`role_id`, `menu_id`) VALUES (2, 2144);
-INSERT IGNORE INTO `sys_role_menu` (`role_id`, `menu_id`) VALUES (3, 2144);
+INSERT IGNORE INTO `omc_db`.`sys_role_menu` (`role_id`, `menu_id`) VALUES (3, 2144);
-INSERT IGNORE INTO `sys_role_menu` (`role_id`, `menu_id`) VALUES (4, 2144);
+INSERT IGNORE INTO `omc_db`.`sys_role_menu` (`role_id`, `menu_id`) VALUES (4, 2144);
 
 SET FOREIGN_KEY_CHECKS = 1;

database/upgvue3/upg_sys_user.sql

@@ -1,7 +1,7 @@
 SET FOREIGN_KEY_CHECKS=0;
 
-DROP TABLE IF EXISTS `sys_user`;
+DROP TABLE IF EXISTS `omc_db`.`sys_user`;
-CREATE TABLE `sys_user`  (
+CREATE TABLE `omc_db`.`sys_user`  (
   `user_id` bigint(20) NOT NULL AUTO_INCREMENT COMMENT '用户ID',
   `dept_id` bigint(20) NULL DEFAULT NULL COMMENT '部门ID',
   `user_name` varchar(30) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NOT NULL COMMENT '用户账号',
@@ -25,7 +25,7 @@ CREATE TABLE `sys_user`  (
 ) ENGINE = InnoDB CHARACTER SET = utf8mb4 COLLATE = utf8mb4_general_ci COMMENT = '用户信息表' ROW_FORMAT = Dynamic;
 
 INSERT IGNORE INTO
-    `sys_user` (
+    `omc_db`.`sys_user` (
         `user_id`,
         `dept_id`,
         `user_name`,
@@ -69,7 +69,7 @@ VALUES (
     );
 
 INSERT IGNORE INTO
-    `sys_user` (
+    `omc_db`.`sys_user` (
         `user_id`,
         `dept_id`,
         `user_name`,
@@ -113,7 +113,7 @@ VALUES (
     );
 
 INSERT IGNORE INTO
-    `sys_user` (
+    `omc_db`.`sys_user` (
         `user_id`,
         `dept_id`,
         `user_name`,
@@ -157,7 +157,7 @@ VALUES (
     );
 
 INSERT IGNORE INTO
-    `sys_user` (
+    `omc_db`.`sys_user` (
         `user_id`,
         `dept_id`,
         `user_name`,

database/upgvue3/upg_sys_user_post.sql

@@ -1,14 +1,14 @@
 SET FOREIGN_KEY_CHECKS=0;
 
-DROP TABLE IF EXISTS `sys_user_post`;
+DROP TABLE IF EXISTS `omc_db`.`sys_user_post`;
-CREATE TABLE `sys_user_post` (
+CREATE TABLE `omc_db`.`sys_user_post` (
         `user_id` bigint(20) NOT NULL COMMENT '用户ID',
         `post_id` bigint(20) NOT NULL COMMENT '岗位ID',
         PRIMARY KEY (`user_id`, `post_id`) USING BTREE
     ) ENGINE = InnoDB CHARACTER SET = utf8mb4 COLLATE = utf8mb4_general_ci COMMENT = '用户与岗位关联表' ROW_FORMAT = Dynamic;
 
 INSERT IGNORE INTO
-    `sys_user_post` (`user_id`, `post_id`)
+    `omc_db`.`sys_user_post` (`user_id`, `post_id`)
 VALUES (1, 1);
 
 SET FOREIGN_KEY_CHECKS=1;

database/upgvue3/upg_sys_user_role.sql

@@ -1,19 +1,19 @@
 SET FOREIGN_KEY_CHECKS=0;
 
 INSERT IGNORE INTO
-    `sys_user_role` (`user_id`, `role_id`)
+    `omc_db`.`sys_user_role` (`user_id`, `role_id`)
 VALUES (1, 1);
 
 INSERT IGNORE INTO
-    `sys_user_role` (`user_id`, `role_id`)
+    `omc_db`.`sys_user_role` (`user_id`, `role_id`)
 VALUES (2, 2);
 
 INSERT IGNORE INTO
-    `sys_user_role` (`user_id`, `role_id`)
+    `omc_db`.`sys_user_role` (`user_id`, `role_id`)
 VALUES (103, 3);
 
 INSERT IGNORE INTO
-    `sys_user_role` (`user_id`, `role_id`)
+    `omc_db`.`sys_user_role` (`user_id`, `role_id`)
 VALUES (104, 4);
 
 SET FOREIGN_KEY_CHECKS=1;

database/upgvue3/vue3_20231017.sql

@@ -1,7 +1,7 @@
 SET FOREIGN_KEY_CHECKS=0;
 
-DROP TABLE IF EXISTS `sys_job_log`;
+DROP TABLE IF EXISTS `omc_db`.`sys_job_log`;
-CREATE TABLE `sys_job_log`  (
+CREATE TABLE `omc_db`.`sys_job_log`  (
   `job_log_id` bigint(20) NOT NULL AUTO_INCREMENT COMMENT '任务日志ID',
   `job_name` varchar(64) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NOT NULL COMMENT '任务名称',
   `job_group` varchar(64) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NOT NULL COMMENT '任务组名',
@@ -14,8 +14,8 @@ CREATE TABLE `sys_job_log`  (
   PRIMARY KEY (`job_log_id`) USING BTREE
 ) ENGINE = InnoDB CHARACTER SET = utf8mb4 COLLATE = utf8mb4_general_ci COMMENT = '调度任务调度日志表' ROW_FORMAT = Dynamic;
 
-DROP TABLE IF EXISTS `sys_log_login`;
+DROP TABLE IF EXISTS `omc_db`.`sys_log_login`;
-CREATE TABLE `sys_log_login`  (
+CREATE TABLE `omc_db`.`sys_log_login`  (
   `login_id` bigint(20) NOT NULL AUTO_INCREMENT COMMENT '登录ID',
   `user_name` varchar(50) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT '' COMMENT '用户账号',
   `ipaddr` varchar(128) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT '' COMMENT '登录IP地址',
@@ -28,8 +28,8 @@ CREATE TABLE `sys_log_login`  (
   PRIMARY KEY (`login_id`) USING BTREE
 ) ENGINE = InnoDB CHARACTER SET = utf8mb4 COLLATE = utf8mb4_general_ci COMMENT = '系统登录日志表' ROW_FORMAT = Dynamic;
 
-DROP TABLE IF EXISTS `sys_log_operate`;
+DROP TABLE IF EXISTS `omc_db`.`sys_log_operate`;
-CREATE TABLE `sys_log_operate`  (
+CREATE TABLE `omc_db`.`sys_log_operate`  (
   `oper_id` bigint(20) NOT NULL AUTO_INCREMENT COMMENT '日志主键',
   `title` varchar(50) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT '' COMMENT '模块标题',
   `business_type` char(1) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT '0' COMMENT '业务类型（0其它 1新增 2修改 3删除 4授权 5导出 6导入 7强退 8清空数据）',

database/upgvue3/vue3_20231028.sql

@@ -2,93 +2,93 @@
 
 -- 创建表 监控_基本信息
 
-ALTER TABLE `monitor_base` DROP COLUMN IF EXISTS `created_at`;
+ALTER TABLE `omc_db`.`monitor_base` DROP COLUMN IF EXISTS `created_at`;
 ALTER TABLE
-    `monitor_base` DROP COLUMN IF EXISTS `updated_at`;
+    `omc_db`.`monitor_base` DROP COLUMN IF EXISTS `updated_at`;
-ALTER TABLE `monitor_base` DROP COLUMN IF EXISTS `db_size`;
+ALTER TABLE `omc_db`.`monitor_base` DROP COLUMN IF EXISTS `db_size`;
 ALTER TABLE
-    `monitor_base` MODIFY COLUMN `id` bigint(20) NOT NULL COMMENT 'id' FIRST;
+    `omc_db`.`monitor_base` MODIFY COLUMN `id` bigint(20) NOT NULL COMMENT 'id' FIRST;
 ALTER TABLE
-    `monitor_base`
+    `omc_db`.`monitor_base`
 ADD
     COLUMN IF NOT EXISTS `create_time` bigint(20) NULL DEFAULT 0 COMMENT '创建时间' AFTER `id`;
 ALTER TABLE
-    `monitor_base` MODIFY COLUMN `cpu` float NULL DEFAULT 0 COMMENT 'cpu使用率' AFTER `create_time`;
+    `omc_db`.`monitor_base` MODIFY COLUMN `cpu` float NULL DEFAULT 0 COMMENT 'cpu使用率' AFTER `create_time`;
 ALTER TABLE
-    `monitor_base` MODIFY COLUMN `load_usage` float NULL DEFAULT 0 COMMENT 'cpu平均使用率' AFTER `cpu`;
+    `omc_db`.`monitor_base` MODIFY COLUMN `load_usage` float NULL DEFAULT 0 COMMENT 'cpu平均使用率' AFTER `cpu`;
 ALTER TABLE
-    `monitor_base` MODIFY COLUMN `cpu_load1` float NULL DEFAULT 0 COMMENT 'cpu使用1分钟' AFTER `load_usage`;
+    `omc_db`.`monitor_base` MODIFY COLUMN `cpu_load1` float NULL DEFAULT 0 COMMENT 'cpu使用1分钟' AFTER `load_usage`;
 ALTER TABLE
-    `monitor_base` MODIFY COLUMN `cpu_load5` float NULL DEFAULT 0 COMMENT 'cpu使用5分钟' AFTER `cpu_load1`;
+    `omc_db`.`monitor_base` MODIFY COLUMN `cpu_load5` float NULL DEFAULT 0 COMMENT 'cpu使用5分钟' AFTER `cpu_load1`;
 ALTER TABLE
-    `monitor_base` MODIFY COLUMN `cpu_load15` float NULL DEFAULT 0 COMMENT 'cpu使用15分钟' AFTER `cpu_load5`;
+    `omc_db`.`monitor_base` MODIFY COLUMN `cpu_load15` float NULL DEFAULT 0 COMMENT 'cpu使用15分钟' AFTER `cpu_load5`;
 ALTER TABLE
-    `monitor_base` MODIFY COLUMN `memory` float NULL DEFAULT 0 COMMENT '内存使用率' AFTER `cpu_load15`;
+    `omc_db`.`monitor_base` MODIFY COLUMN `memory` float NULL DEFAULT 0 COMMENT '内存使用率' AFTER `cpu_load15`;
 ALTER TABLE
-    `monitor_base`
+    `omc_db`.`monitor_base`
 ADD
     COLUMN IF NOT EXISTS `ne_type` varchar(32) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL COMMENT '网元类型' AFTER `memory`;
 ALTER TABLE
-    `monitor_base`
+    `omc_db`.`monitor_base`
 ADD
     COLUMN IF NOT EXISTS `ne_id` varchar(32) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL COMMENT '网元ID' AFTER `ne_type`;
 ALTER TABLE
-    `monitor_base` MODIFY COLUMN `id` bigint(20) NOT NULL AUTO_INCREMENT COMMENT 'id';
+    `omc_db`.`monitor_base` MODIFY COLUMN `id` bigint(20) NOT NULL AUTO_INCREMENT COMMENT 'id';
 
 -- 创建表 监控_磁盘IO
 
-ALTER TABLE `monitor_io` DROP COLUMN IF EXISTS `created_at`;
+ALTER TABLE `omc_db`.`monitor_io` DROP COLUMN IF EXISTS `created_at`;
-ALTER TABLE `monitor_io` DROP COLUMN IF EXISTS `updated_at`;
+ALTER TABLE `omc_db`.`monitor_io` DROP COLUMN IF EXISTS `updated_at`;
 ALTER TABLE
-    `monitor_io` MODIFY COLUMN `id` bigint(20) NOT NULL COMMENT 'id' FIRST;
+    `omc_db`.`monitor_io` MODIFY COLUMN `id` bigint(20) NOT NULL COMMENT 'id' FIRST;
 ALTER TABLE
-    `monitor_io`
+    `omc_db`.`monitor_io`
 ADD
     COLUMN IF NOT EXISTS `create_time` bigint(20) NULL DEFAULT 0 COMMENT '创建时间' AFTER `id`;
 ALTER TABLE
-    `monitor_io` MODIFY COLUMN `name` varchar(50) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NOT NULL COMMENT '磁盘名' AFTER `create_time`;
+    `omc_db`.`monitor_io` MODIFY COLUMN `name` varchar(50) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NOT NULL COMMENT '磁盘名' AFTER `create_time`;
 ALTER TABLE
-    `monitor_io` MODIFY COLUMN `read` int(11) NULL DEFAULT 0 COMMENT '读取K' AFTER `name`;
+    `omc_db`.`monitor_io` MODIFY COLUMN `read` int(11) NULL DEFAULT 0 COMMENT '读取K' AFTER `name`;
 ALTER TABLE
-    `monitor_io` MODIFY COLUMN `write` int(11) NULL DEFAULT 0 COMMENT '写入K' AFTER `read`;
+    `omc_db`.`monitor_io` MODIFY COLUMN `write` int(11) NULL DEFAULT 0 COMMENT '写入K' AFTER `read`;
 ALTER TABLE
-    `monitor_io` MODIFY COLUMN `count` int(11) NULL DEFAULT 0 COMMENT '次数' AFTER `write`;
+    `omc_db`.`monitor_io` MODIFY COLUMN `count` int(11) NULL DEFAULT 0 COMMENT '次数' AFTER `write`;
 ALTER TABLE
-    `monitor_io` MODIFY COLUMN `time` int(11) NULL DEFAULT 0 COMMENT '耗时' AFTER `count`;
+    `omc_db`.`monitor_io` MODIFY COLUMN `time` int(11) NULL DEFAULT 0 COMMENT '耗时' AFTER `count`;
 ALTER TABLE
-    `monitor_io`
+    `omc_db`.`monitor_io`
 ADD
     COLUMN IF NOT EXISTS `ne_type` varchar(32) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL COMMENT '网元类型' AFTER `time`;
 ALTER TABLE
-    `monitor_io`
+    `omc_db`.`monitor_io`
 ADD
     COLUMN IF NOT EXISTS `ne_id` varchar(32) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL COMMENT '网元ID' AFTER `ne_type`;
 ALTER TABLE
-    `monitor_io` MODIFY COLUMN `id` bigint(20) NOT NULL AUTO_INCREMENT COMMENT 'id';
+    `omc_db`.`monitor_io` MODIFY COLUMN `id` bigint(20) NOT NULL AUTO_INCREMENT COMMENT 'id';
 
 -- 创建表 监控_网络IO
 
-ALTER TABLE `monitor_network` DROP COLUMN IF EXISTS `created_at`;
+ALTER TABLE `omc_db`.`monitor_network` DROP COLUMN IF EXISTS `created_at`;
-ALTER TABLE `monitor_network` DROP COLUMN IF EXISTS `updated_at`;
+ALTER TABLE `omc_db`.`monitor_network` DROP COLUMN IF EXISTS `updated_at`;
 ALTER TABLE
-    `monitor_network` MODIFY COLUMN `id` bigint(20) NOT NULL COMMENT 'id' FIRST;
+    `omc_db`.`monitor_network` MODIFY COLUMN `id` bigint(20) NOT NULL COMMENT 'id' FIRST;
 ALTER TABLE
-    `monitor_network`
+    `omc_db`.`monitor_network`
 ADD
     COLUMN IF NOT EXISTS `create_time` bigint(20) NULL DEFAULT 0 COMMENT '创建时间' AFTER `id`;
 ALTER TABLE
-    `monitor_network` MODIFY COLUMN `name` varchar(50) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NOT NULL COMMENT '网卡名' AFTER `create_time`;
+    `omc_db`.`monitor_network` MODIFY COLUMN `name` varchar(50) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NOT NULL COMMENT '网卡名' AFTER `create_time`;
 ALTER TABLE
-    `monitor_network` MODIFY COLUMN `up` float NULL DEFAULT 0 COMMENT '上行' AFTER `name`;
+    `omc_db`.`monitor_network` MODIFY COLUMN `up` float NULL DEFAULT 0 COMMENT '上行' AFTER `name`;
 ALTER TABLE
-    `monitor_network` MODIFY COLUMN `down` float NULL DEFAULT 0 COMMENT '下行' AFTER `up`;
+    `omc_db`.`monitor_network` MODIFY COLUMN `down` float NULL DEFAULT 0 COMMENT '下行' AFTER `up`;
 ALTER TABLE
-    `monitor_network`
+    `omc_db`.`monitor_network`
 ADD
     COLUMN IF NOT EXISTS `ne_type` varchar(32) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL COMMENT '网元类型' AFTER `down`;
 ALTER TABLE
-    `monitor_network`
+    `omc_db`.`monitor_network`
 ADD
     COLUMN IF NOT EXISTS `ne_id` varchar(32) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL COMMENT '网元ID' AFTER `ne_type`;
 ALTER TABLE
-    `monitor_network` MODIFY COLUMN `id` bigint(20) NOT NULL AUTO_INCREMENT COMMENT 'id';
+    `omc_db`.`monitor_network` MODIFY COLUMN `id` bigint(20) NOT NULL AUTO_INCREMENT COMMENT 'id';

database/upgvue3/zupgrade.sql

@@ -1,29 +1,29 @@
 DROP TRIGGER IF EXISTS `tg_account_menu`;
 
-ALTER TABLE `gold_kpi` 
+ALTER TABLE `omc_db`.`gold_kpi` 
 MODIFY COLUMN `value` bigint NULL DEFAULT 0 AFTER `kpi_id`;
 
-ALTER TABLE `user` 
+ALTER TABLE `omc_db`.`user` 
 DROP INDEX IF EXISTS `account_id`,
 DROP INDEX IF EXISTS `idx_uni_user_acc_id`,
 ADD UNIQUE INDEX `idx_uni_user_acc_id`(`account_id`) USING BTREE;
 
-ALTER TABLE `ne_link` DROP INDEX IF EXISTS `idx_netype_neid`;
+ALTER TABLE `omc_db`.`ne_link` DROP INDEX IF EXISTS `idx_netype_neid`;
 
-ALTER TABLE `user` 
+ALTER TABLE `omc_db`.`user` 
 MODIFY COLUMN `password_expiration` date NULL DEFAULT NULL AFTER `change_password_flag`,
 MODIFY COLUMN `user_expiration` date NULL DEFAULT NULL AFTER `status`;
 
-ALTER TABLE `config` 
+ALTER TABLE `omc_db`.`config` 
 ADD COLUMN IF NOT EXISTS `comment` varchar(255) NULL AFTER `update_time`;
 
-ALTER TABLE `nbi_operation_log` 
+ALTER TABLE `omc_db`.`nbi_operation_log` 
 MODIFY COLUMN `created_at` datetime NULL DEFAULT NULL AFTER `log_time`;
 
-ALTER TABLE `permission` 
+ALTER TABLE `omc_db`.`permission` 
 ADD COLUMN IF NOT EXISTS `management` varchar(32) NULL DEFAULT '*' AFTER `method`;
 
-ALTER TABLE `permission` 
+ALTER TABLE `omc_db`.`permission` 
 CHANGE COLUMN IF EXISTS `create_at` `created_at` datetime NULL DEFAULT current_timestamp AFTER `description`,
 MODIFY COLUMN `method` varchar(10) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT '*' AFTER `permission_name`,
 MODIFY COLUMN `management` varchar(32) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT '*' AFTER `method`,
@@ -32,54 +32,54 @@ MODIFY COLUMN `object` varchar(16) CHARACTER SET utf8mb4 COLLATE utf8mb4_general
 ADD COLUMN IF NOT EXISTS `updated_at` datetime NULL AFTER `created_at`,
 ADD COLUMN IF NOT EXISTS `deleted_at` datetime NULL AFTER `updated_at`;
 
-ALTER TABLE `permission` 
+ALTER TABLE `omc_db`.`permission` 
 ADD UNIQUE INDEX IF NOT EXISTS `permission_name`(`permission_name`) USING BTREE;
 
-ALTER TABLE `alarm_log` 
+ALTER TABLE `omc_db`.`alarm_log` 
 ADD COLUMN IF NOT EXISTS `alarm_seq` int NULL AFTER `ne_id`;
 
-ALTER TABLE `ne_software` 
+ALTER TABLE `omc_db`.`ne_software` 
 ADD COLUMN IF NOT EXISTS `patch_time` datetime NULL AFTER `update_time`;
 
-ALTER TABLE `nbi_alarm_log` 
+ALTER TABLE `omc_db`.`nbi_alarm_log` 
 ADD COLUMN IF NOT EXISTS `alarm_status` int NULL COMMENT '0/1: 清除告警/活动告警' AFTER `alarm_code`;
 
-ALTER TABLE `cert_info` DROP INDEX IF EXISTS `idx_netype_neid`;
+ALTER TABLE `omc_db`.`cert_info` DROP INDEX IF EXISTS `idx_netype_neid`;
 
-ALTER TABLE `user` 
+ALTER TABLE `omc_db`.`user` 
 MODIFY COLUMN `name` varchar(128) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL AFTER `account_id`;
 
-ALTER TABLE `measure_threshold` 
+ALTER TABLE `omc_db`.`measure_threshold` 
 CHANGE COLUMN IF EXISTS `alarm_id` `alarm_code` varchar(16) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT '10200' AFTER `orig_severity`;
 
-ALTER TABLE `measure_task` 
+ALTER TABLE `omc_db`.`measure_task` 
 ADD COLUMN IF NOT EXISTS `account_id` varchar(32) NULL AFTER `status`,
 ADD COLUMN IF NOT EXISTS `comment` varchar(255) NULL AFTER `account_id`;
 
-ALTER TABLE `trace_task` 
+ALTER TABLE `omc_db`.`trace_task` 
 ADD COLUMN IF NOT EXISTS `account_id` varchar(32) NULL AFTER `status`,
 ADD COLUMN IF NOT EXISTS `comment` varchar(255) NULL AFTER `account_id`;
 
-ALTER TABLE `u_auth_user` ENGINE = InnoDB;
+ALTER TABLE `omc_db`.`u_auth_user` ENGINE = InnoDB;
-ALTER TABLE `u_sub_user` ENGINE = InnoDB;
+ALTER TABLE `omc_db`.`u_sub_user` ENGINE = InnoDB;
 
-INSERT IGNORE INTO `config` (`id`, `module_name`, `config_tag`, `title_json`, `value`, `value_json`, `comment`) 
+INSERT IGNORE INTO `omc_db`.`config` (`id`, `module_name`, `config_tag`, `title_json`, `value`, `value_json`, `comment`) 
 VALUES ('37', 'System', 'logo', '{\"cn\":\"系统LOGO\",\"en\":\"System LOGO\"}', 'logo30.png', '', '');
 
-ALTER TABLE `security_log` 
+ALTER TABLE `omc_db`.`security_log` 
 MODIFY COLUMN `id` int(10) NOT NULL AUTO_INCREMENT FIRST;
 
-ALTER TABLE `param_config` 
+ALTER TABLE `omc_db`.`param_config` 
 ADD COLUMN IF NOT EXISTS `method` varchar(64) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT '*' COMMENT 'method allow: \"get\", \"get,post,put\", \"*\"' AFTER `top_display`;
 
 DELETE FROM trace_data WHERE timestamp LIKE '2023-%';
-ALTER TABLE `trace_data` 
+ALTER TABLE `omc_db`.`trace_data` 
 MODIFY COLUMN `timestamp` bigint NULL DEFAULT NULL AFTER `msg_direct`;
 
-ALTER TABLE `param_config` 
+ALTER TABLE `omc_db`.`param_config` 
 MODIFY COLUMN `method` varchar(64) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL COMMENT 'method allow: \"get\", \"get,post,put\", \"delete\"' AFTER `top_display`;
 
-ALTER TABLE `ne_license` 
+ALTER TABLE `omc_db`.`ne_license` 
 MODIFY COLUMN `status` enum('ACTIVE','INACTIVE','PENDING') CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT 'ACTIVE' AFTER `expiration_date`,
 ADD COLUMN IF NOT EXISTS `path` varchar(128) NULL AFTER `status`,
 ADD COLUMN IF NOT EXISTS `file_name` varchar(64) NULL AFTER `path`,
@@ -87,45 +87,45 @@ ADD COLUMN IF NOT EXISTS `comment` varchar(255) NULL AFTER `file_name`;
 
 DELETE FROM ne_license WHERE file_name IS NULL;
 
-ALTER TABLE `trace_data` 
+ALTER TABLE `omc_db`.`trace_data` 
 ADD COLUMN IF NOT EXISTS `length` int NULL AFTER `msg_direct`;
 
 -- UDM签约存储长度不足
-ALTER TABLE `u_sub_user` 
+ALTER TABLE `omc_db`.`u_sub_user` 
 MODIFY COLUMN `sm_data` varchar(1500) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL COMMENT 'smData' AFTER `cn`,
 MODIFY COLUMN `eps_dat` varchar(1500) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL COMMENT 'Eps' AFTER `smf_sel`;
 
 ALTER TABLE
-    `ne_backup`
+    `omc_db`.`ne_backup`
 ADD
     COLUMN IF NOT EXISTS `comment` varchar(255) NULL AFTER `md5_sum`;
 
 ALTER TABLE
-    `sys_dict_data` MODIFY COLUMN `dict_label` varchar(255) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT '' COMMENT '字典标签' AFTER `dict_sort`,
+    `omc_db`.`sys_dict_data` MODIFY COLUMN `dict_label` varchar(255) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT '' COMMENT '字典标签' AFTER `dict_sort`,
     MODIFY COLUMN `dict_value` varchar(512) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT '' COMMENT '字典键值' AFTER `dict_label`;
 
 ALTER TABLE
-    `mml_command`
+    `omc_db`.`mml_command`
 ADD
     COLUMN IF NOT EXISTS `status` enum('Active', 'Inactive') CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT 'Active' COMMENT '激活: Active 未激活: Inactive' AFTER `param_json`;
 
-UPDATE `mml_command`
+UPDATE `omc_db`.`mml_command`
 SET `status` = 'Inactive'
 WHERE
     `category` = 'licenseManagement';
 
 ALTER TABLE
-    `mml_subscriber`
+    `omc_db`.`mml_subscriber`
 ADD
     COLUMN IF NOT EXISTS `status` enum('Active', 'Inactive') CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT 'Active' COMMENT '激活: Active 未激活: Inactive' AFTER `param_json`;
 
 ALTER TABLE
-    `mml_system`
+    `omc_db`.`mml_system`
 ADD
     COLUMN IF NOT EXISTS `status` enum('Active', 'Inactive') CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT 'Active' COMMENT '激活: Active 未激活: Inactive' AFTER `param_json`;
 
 ALTER TABLE
-    `system_log`
+    `omc_db`.`system_log`
 ADD
     COLUMN IF NOT EXISTS `operation` varchar(16) NULL AFTER `process_id`;
 
@@ -139,54 +139,54 @@ WHERE `vendor_name` = "AGT";
 UPDATE ne_info SET `dn` = "-" WHERE `dn` = "TN";
 
 ALTER TABLE
-    `sys_dept` MODIFY COLUMN `dept_name` varchar(128) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT '' COMMENT '部门名称' AFTER `ancestors`;
+    `omc_db`.`sys_dept` MODIFY COLUMN `dept_name` varchar(128) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT '' COMMENT '部门名称' AFTER `ancestors`;
 
-ALTER TABLE `sys_dict_data`
+ALTER TABLE `omc_db`.`sys_dict_data`
 MODIFY COLUMN `dict_code` bigint(20) NOT NULL AUTO_INCREMENT COMMENT '字典编码' FIRST;    
 
-ALTER TABLE `gold_kpi`
+ALTER TABLE `omc_db`.`gold_kpi`
 ADD COLUMN IF NOT EXISTS `granularity` tinyint NULL DEFAULT 60 COMMENT '时间颗粒度: 5/10/.../60/300 (秒)' AFTER `index`;
 
-ALTER TABLE `ne_info`
+ALTER TABLE `omc_db`.`ne_info`
 DROP PRIMARY KEY,
 ADD PRIMARY KEY (`id`) USING BTREE;
 
-ALTER TABLE `gold_kpi`
+ALTER TABLE `omc_db`.`gold_kpi`
 ADD INDEX IF NOT EXISTS `idx_kpiid` (`kpi_id`) USING BTREE,
 ADD INDEX IF NOT EXISTS `idx_timestamp` (`timestamp`) USING BTREE;
 
-ALTER TABLE `gold_kpi`
+ALTER TABLE `omc_db`.`gold_kpi`
 DROP INDEX `idx_st_nt_id`,
 ADD INDEX IF NOT EXISTS `idx_nt_id` (`ne_type`, `rm_uid`) USING BTREE;
 
-ALTER TABLE `gold_kpi`
+ALTER TABLE `omc_db`.`gold_kpi`
 ADD INDEX IF NOT EXISTS `idx_date` (`date`) USING BTREE;
 
-ALTER TABLE `gold_kpi`
+ALTER TABLE `omc_db`.`gold_kpi`
 ADD UNIQUE INDEX IF NOT EXISTS `idx_pk_id` (`id`) USING BTREE;
 
-ALTER TABLE `kpi_title`
+ALTER TABLE `omc_db`.`kpi_title`
 ADD INDEX IF NOT EXISTS `idx_kpi_id` (`kpi_id`) USING BTREE;
 
-ALTER TABLE `alarm`
+ALTER TABLE `omc_db`.`alarm`
 ADD UNIQUE INDEX IF NOT EXISTS `idx_pk_id` (`id`) USING BTREE;
 
 REPLACE INTO
-    `sys_dict_data`
+    `omc_db`.`sys_dict_data`
 VALUES (
         4034, 4034, 'menu.dashboard.overview', 'Overview', 'i18n_en', NULL, NULL, '1', 'supervisor', 1705550000000, NULL, 0, NULL
     );
 
-ALTER TABLE `alarm`
+ALTER TABLE `omc_db`.`alarm`
 ADD INDEX IF NOT EXISTS `idx_severity_status` (
     `alarm_status`, `orig_severity`
 ) USING BTREE; 
 
-ALTER TABLE `mml_system`
+ALTER TABLE `omc_db`.`mml_system`
 ADD COLUMN IF NOT EXISTS `object_type` varchar(16) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT 'mml' AFTER `mml_display`;
 
-ALTER TABLE `ne_state`
+ALTER TABLE `omc_db`.`ne_state`
 MODIFY COLUMN `expiry_date` varchar(11) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT '-' AFTER `serial_num`;
 
-ALTER TABLE `alarm_forward_log`
+ALTER TABLE `omc_db`.`alarm_forward_log`
 ADD COLUMN IF NOT EXISTS `interface` varchar(16) NULL AFTER `event_time`;

features/cdr/cdrevent.go

@@ -29,7 +29,6 @@ type CDREvent struct {
 	RmUID     string         `json:"rmUID" xorm:"rm_uid"`
 	Timestamp int            `json:"timestamp" xorm:"timestamp"`
 	CDR       map[string]any `json:"CDR" xorm:"cdr_json"`
-	TenantID  string         `json:"tenantID" xorm:"tenant_id"`
 }
 
 // PostCDREventFrom 接收CDR数据请求
@@ -41,39 +40,13 @@ func PostCDREventFrom(w http.ResponseWriter, r *http.Request) {
 		services.ResponseInternalServerError500ProcessError(w, err)
 		return
 	}
+
 	neTypeLower := strings.ToLower(cdrEvent.NeType)
 	if neType == "" || neType != neTypeLower {
 		services.ResponseInternalServerError500ProcessError(w, fmt.Errorf("inconsistent network element types"))
 		return
 	}
 
-	// for multi-tenancy
-	switch neTypeLower {
-	case "ims", "smsc":
-		if v, ok := cdrEvent.CDR["callerParty"]; ok {
-			where := fmt.Sprintf("'%v' like msisdn", v)
-			tenantID, err := dborm.XormGetSingleColStringByWhere("u_sub_user", "tenant_id", where)
-			if err != nil {
-				log.Errorf("failed to get tenant_id:%v", err)
-			}
-			if tenantID != "" {
-				cdrEvent.TenantID = tenantID
-			}
-		}
-	case "smf":
-		if v, ok := cdrEvent.CDR["subscriberIdentifier"]; ok {
-			subscriptionIDData := v.(map[string]any)["subscriptionIDData"]
-			where := fmt.Sprintf("'%v' like imsi or '%v' like msisdn", subscriptionIDData, subscriptionIDData)
-			tenantID, err := dborm.XormGetSingleColStringByWhere("u_sub_user", "tenant_id", where)
-			if err != nil {
-				log.Errorf("failed to get tenant_id:%v", err)
-			}
-			if tenantID != "" {
-				cdrEvent.TenantID = tenantID
-			}
-		}
-	}
-
 	tableName := fmt.Sprintf("cdr_event_%s", neTypeLower)
 	affected, err := dborm.XormInsertTableOne(tableName, cdrEvent)
 	if err != nil && affected <= 0 {

features/event/event.go

@@ -34,7 +34,6 @@ type UEEvent struct {
 	Timestamp int64          `json:"timestamp" xorm:"timestamp"`
 	EventType string         `json:"eventType" xorm:"event_type"`
 	EventJson map[string]any `json:"eventJSON" xorm:"event_json"`
-	TenantID  string         `json:"tenantID" xorm:"tenant_id"`
 }
 
 func PostUEEventFromAMF(c *gin.Context) {
@@ -66,16 +65,6 @@ func PostUEEventFromAMF(c *gin.Context) {
 	ueEvent.EventType = eventType
 	log.Trace("ueEvent AMF:", ueEvent)
 
-	// for multi-tenancy
-	where := fmt.Sprintf("status='1' and tenancy_type='IMSI' and '%v' like tenancy_key", ueEvent.EventJson["imsi"])
-	tenantID, err := dborm.XormGetSingleColStringByWhere("sys_tenant", "parent_id", where)
-	if err != nil {
-		log.Errorf("failed to get tenant_id:%v", err)
-	}
-	if tenantID != "" {
-		ueEvent.TenantID = tenantID
-	}
-
 	affected, err := dborm.XormInsertTableOne("ue_event_amf", ueEvent)
 	if err != nil && affected <= 0 {
 		log.Error("Failed to insert ue_event_amf:", err)
@@ -100,16 +89,6 @@ func PostUEEvent(w http.ResponseWriter, r *http.Request) {
 		return
 	}
 
-	// for multi-tenancy
-	where := fmt.Sprintf("status='1' and tenancy_type='IMSI' and '%v' like tenancy_key", ueEvent.EventJson["imsi"])
-	tenantID, err := dborm.XormGetSingleColStringByWhere("sys_tenant", "parent_id", where)
-	if err != nil {
-		log.Errorf("failed to get tenant_id:%v", err)
-	}
-	if tenantID != "" {
-		ueEvent.TenantID = tenantID
-	}
-
 	ueEvent.NeType = strings.ToUpper(neType)
 	tableName := fmt.Sprintf("ue_event_%s", strings.ToLower(neType))
 	affected, err := dborm.XormInsertTableOne(tableName, ueEvent)

features/pm/kpi_c_report/controller.go

@@ -40,11 +40,11 @@ func (k *KpiCReport) Get(c *gin.Context) {
 		return
 	}
 	if querys.StartTime != "" {
-		conditions = append(conditions, "(UNIX_TIMESTAMP(created_at) * 1000) >= ?")
+		conditions = append(conditions, "created_at >= ?")
 		params = append(params, querys.StartTime)
 	}
 	if querys.EndTime != "" {
-		conditions = append(conditions, "(UNIX_TIMESTAMP(created_at) * 1000) <= ?")
+		conditions = append(conditions, "created_at <= ?")
 		params = append(params, querys.EndTime)
 	}
 
@@ -106,11 +106,11 @@ func (k *KpiCReport) GetReport2FE(c *gin.Context) {
 		return
 	}
 	if querys.StartTime != "" {
-		conditions = append(conditions, "(UNIX_TIMESTAMP(created_at) * 1000) >= ?")
+		conditions = append(conditions, "created_at >= ?")
 		params = append(params, querys.StartTime)
 	}
 	if querys.EndTime != "" {
-		conditions = append(conditions, "(UNIX_TIMESTAMP(created_at) * 1000) <= ?")
+		conditions = append(conditions, "created_at <= ?")
 		params = append(params, querys.EndTime)
 	}
 
@@ -185,11 +185,11 @@ func (k *KpiCReport) GetTotalList(c *gin.Context) {
 	dbg := dborm.DefaultDB().Table(tableName)
 
 	if querys.StartTime != "" {
-		conditions = append(conditions, "(UNIX_TIMESTAMP(created_at) * 1000) >= ?")
+		conditions = append(conditions, "created_at >= ?")
 		params = append(params, querys.StartTime)
 	}
 	if querys.EndTime != "" {
-		conditions = append(conditions, "(UNIX_TIMESTAMP(created_at) * 1000) <= ?")
+		conditions = append(conditions, "created_at <= ?")
 		params = append(params, querys.EndTime)
 	}
 
@@ -253,11 +253,11 @@ func (k *KpiCReport) Total(c *gin.Context) {
 	dbg := dborm.DefaultDB().Table(tableName)
 
 	if querys.StartTime != "" {
-		conditions = append(conditions, "(UNIX_TIMESTAMP(created_at) * 1000) >= ?")
+		conditions = append(conditions, "created_at >= ?")
 		params = append(params, querys.StartTime)
 	}
 	if querys.EndTime != "" {
-		conditions = append(conditions, "(UNIX_TIMESTAMP(created_at) * 1000) <= ?")
+		conditions = append(conditions, "created_at <= ?")
 		params = append(params, querys.EndTime)
 	}
 

features/pm/kpi_c_report/model.go

@@ -27,7 +27,6 @@ type KpiCReport struct {
 	Granularity *int8      `gorm:"column:granularity;default:60" json:"granularity,omitempty"` //Time granualarity: 5/10/.../60/300 (second)
 	KpiValues   KpiCValues `gorm:"column:kpi_values;type:json" json:"kpiValues,omitempty"`
 	CreatedAt   *time.Time `gorm:"column:created_at;default:current_timestamp()" json:"createdAt,omitempty"`
-	TenantID    *string    `gorm:"column:tenant_id;default:NULL" json:"tenantID,omitempty"`
 }
 
 type KpiCReportQuery struct {
@@ -36,7 +35,6 @@ type KpiCReportQuery struct {
 	RmUID     string `json:"rmUID" form:"rmUID"`
 	StartTime string `json:"startTime" form:"startTime"`
 	EndTime   string `json:"endTime" form:"endTime"`
-	TenantName string `json:"tenantName" form:"tenantName"`
 	UserName  string `json:"userName" form:"userName"`
 	SortField string `json:"sortField" form:"sortField" binding:"omitempty,oneof=created_at"` // 排序字段，填写结果字段
 	SortOrder string `json:"sortOrder" form:"sortOrder" binding:"omitempty,oneof=asc desc"`   // 排序升降序，asc desc
@@ -52,7 +50,6 @@ type KpiCReport2FE struct {
 	TimeGroup   string `json:"timeGroup"`
 	StartIndex  int16  `json:"startIndex" gorm:"column:index"`
 	Granularity int8   `json:"granularity" gorm:"column:granularity"`
-	TenantID    string `json:"tenantID" gorm:"column:tenant_id"`
 }
 
 func TableName() string {

features/pm/kpi_c_title/controller.go

@@ -3,14 +3,10 @@ package kpi_c_title
 import (
 	"fmt"
 	"net/http"
-	"regexp"
-	"strconv"
 	"strings"
 
 	"be.ems/lib/dborm"
-	"be.ems/lib/log"
 	"be.ems/lib/services"
-	"be.ems/src/framework/utils/ctx"
 	"github.com/gin-gonic/gin"
 )
 
@@ -18,7 +14,6 @@ func (k *KpiCTitle) GetToalList(c *gin.Context) {
 	var titles []KpiCTitle
 	var conditions []string
 	var params []any
-	i18n := ctx.AcceptLanguage(c)
 
 	var querys KpiCTitleQuery
 	if err := c.ShouldBindQuery(&querys); err != nil {
@@ -67,8 +62,6 @@ func (k *KpiCTitle) GetToalList(c *gin.Context) {
 		return
 	}
 
-	k.expressionAlias(titles, i18n)
-
 	c.JSON(http.StatusOK, services.TotalDataResp(titles, total))
 	//c.JSON(http.StatusOK, titles)
 }
@@ -77,7 +70,6 @@ func (k *KpiCTitle) Get(c *gin.Context) {
 	var titles []KpiCTitle
 	var conditions []string
 	var params []any
-	i18n := ctx.AcceptLanguage(c)
 
 	// construct condition to get
 	if neType := c.Query("neType"); neType != "" {
@@ -97,37 +89,10 @@ func (k *KpiCTitle) Get(c *gin.Context) {
 		return
 	}
 
-	k.expressionAlias(titles, i18n)
-
 	c.JSON(http.StatusOK, services.DataResp(titles))
 	//c.JSON(http.StatusOK, titles)
 }
 
-func (k *KpiCTitle) expressionAlias(titles []KpiCTitle, i18n string) {
-	var title *KpiCTitle
-	for i := 0; i < len(titles); i++ {
-		title = &titles[i]
-		title.ExprAlias = *title.Expression
-		re := regexp.MustCompile(`'([^']+)'`)
-		matches := re.FindAllStringSubmatch(title.ExprAlias, -1)
-
-		for _, match := range matches {
-			var alias, sql string
-			if i18n == "zh" {
-				sql = fmt.Sprintf("SELECT cn_title FROM kpi_title WHERE kpi_id='%s'", match[1])
-			} else {
-				sql = fmt.Sprintf("SELECT en_title FROM kpi_title WHERE kpi_id='%s'", match[1])
-			}
-			err := dborm.XCoreDB().QueryRow(sql).Scan(&alias)
-			if err != nil {
-				log.Warn("Failed to QueryRow:", err)
-				continue
-			}
-			title.ExprAlias = regexp.MustCompile(match[1]).ReplaceAllString(title.ExprAlias, alias)
-		}
-	}
-}
-
 func (k *KpiCTitle) Total(c *gin.Context) {
 	var conditions []string
 	var params []any
@@ -155,45 +120,17 @@ func (k *KpiCTitle) Total(c *gin.Context) {
 }
 
 func (k *KpiCTitle) Post(c *gin.Context) {
-	var title, res KpiCTitle
+	var title KpiCTitle
 
 	if err := c.ShouldBindJSON(&title); err != nil {
 		c.JSON(http.StatusOK, services.ErrResp(err.Error()))
 		return
 	}
-	userName := ctx.LoginUserToUserName(c)
-	title.CreatedBy = &userName
 	result := dborm.DefaultDB().Where("ne_type=? and (kpi_id=? or title=?)", title.NeType, title.KpiID, title.Title).First(&title)
 	if result.RowsAffected > 0 {
 		c.JSON(http.StatusOK, services.ErrResp("custom indicator already exist"))
 		return
 	}
-	ret := dborm.DefaultDB().Table("kpi_c_title").Where("ne_type=? ORDER BY kpi_id DESC LIMIT 1", title.NeType).Scan(&res)
-	if err := ret.Error; err != nil {
-		c.JSON(http.StatusOK, services.ErrResp(err.Error()))
-		return
-	}
-	newKpiID := *title.NeType + ".C" + ".01"
-	if ret.RowsAffected != 0 {
-		maxKpiID := *res.KpiID
-		prefix := maxKpiID[:len(maxKpiID)-2]
-		suffix := maxKpiID[len(maxKpiID)-2:]
-		suffixInt, err := strconv.Atoi(suffix)
-		if err != nil {
-			c.JSON(http.StatusOK, services.ErrResp(err.Error()))
-			return
-		}
-		if suffixInt >= MAX_KPI_C_ID {
-			err := fmt.Errorf("exceed the max customized KPI ID")
-			c.JSON(http.StatusOK, services.ErrResp(err.Error()))
-			return
-		}
-
-		suffixInt++
-		newSuffix := fmt.Sprintf("%02d", suffixInt)
-		newKpiID = prefix + newSuffix
-	}
-	title.KpiID = &newKpiID
 	if err := dborm.DefaultDB().Create(&title).Error; err != nil {
 		c.JSON(http.StatusOK, services.ErrResp(err.Error()))
 		return

features/pm/kpi_c_title/model.go

@@ -2,17 +2,12 @@ package kpi_c_title
 
 import "time"
 
-const (
-	MAX_KPI_C_ID = 99
-)
-
 type KpiCTitle struct {
 	ID          int        `gorm:"column:id;primary_key;auto_increment" json:"id"`
 	NeType      *string    `gorm:"column:ne_type;default:NULL," json:"neType,omitempty"`
 	KpiID       *string    `gorm:"column:kpi_id;default:NULL," json:"kpiId,omitempty"`
 	Title       *string    `gorm:"column:title;default:NULL," json:"title,omitempty"`
 	Expression  *string    `gorm:"column:expression;default:NULL," json:"expression,omitempty"`
-	ExprAlias   string     `gorm:"-" json:"exprAlias"`
 	Status      string     `gorm:"column:status;default:'Active'" json:"status"`
 	Unit        *string    `gorm:"column:unit" json:"unit,omitempty"`
 	Description *string    `gorm:"column:description;default:NULL," json:"description,omitempty"`

features/pm/performance.go

@@ -80,7 +80,6 @@ type KpiData struct {
 	KPIValues   []KPIVal `json:"kpiValues" xorm:"json 'kpi_values'"`
 	//CreatedAt   int64     `json:"createdAt" xorm:"created 'created_at'"`
 	CreatedAt int64 `json:"createdAt" xorm:"'created_at'"`
-	TenantID  string `json:"tenantId" xorm:"tenant_id"`
 }
 type KPIVal struct {
 	KPIID string `json:"kpi_id" xorm:"kpi_id"`
@@ -268,9 +267,6 @@ func PostKPIReportFromNF(w http.ResponseWriter, r *http.Request) {
 	}
 	kpiValMap["granularity"] = kpiData.Granularity
 
-	// set tenant_name if exist
-	where := fmt.Sprintf("status='1' and tenancy_type='UPF' and tenancy_key='%s'", kpiData.RmUid)
-	kpiData.TenantID, _ = dborm.XormGetSingleColStringByWhere("sys_tenant", "parent_id", where)
 	// insert kpi_report table, no session
 	tableName := "kpi_report_" + strings.ToLower(kpiReport.Task.NE.NeType)
 	affected, err := xEngine.Table(tableName).Insert(kpiData)
@@ -289,7 +285,6 @@ func PostKPIReportFromNF(w http.ResponseWriter, r *http.Request) {
 		EndTime:     &kpiData.EndTime,
 		Index:       int16(kpiData.Index),
 		Granularity: &kpiData.Granularity,
-		TenantID:    &kpiData.TenantID,
 	}
 
 	// 发送到匹配的网元
@@ -305,7 +300,6 @@ func PostKPIReportFromNF(w http.ResponseWriter, r *http.Request) {
 		"timeGroup":   kpiData.Date[:10] + " " + kpiData.EndTime,
 		"createdAt":   kpiData.CreatedAt,
 		"granularity": kpiData.Granularity,
-		"tenantID":    kpiData.TenantID,
 	}
 	kpiCList := kpi_c_title.GetActiveKPICList(kpiData.NEType)
 	for _, k := range kpiCList {
@@ -335,8 +329,6 @@ func PostKPIReportFromNF(w http.ResponseWriter, r *http.Request) {
 		wsService.NewWSSend.ByGroupID(fmt.Sprintf("%s%s_%s", wsService.GROUP_KPI_C, neInfo.NeType, neInfo.NeId), kpiCEvent)
 		if neInfo.NeType == "UPF" {
 			wsService.NewWSSend.ByGroupID(wsService.GROUP_KPI_UPF+neInfo.NeId, kpiEvent)
-			// 推送标识为：12_RMUID, exp: 12_4400HXUPF001, for multi-tenancy
-			wsService.NewWSSend.ByGroupID(wsService.GROUP_KPI_UPF+kpiReport.Task.NE.RmUID, kpiEvent)
 		}
 	}
 

features/udm_user/model/udm_sub_user.go

@@ -1,31 +0,0 @@
-package model
-
-// UdmSubUser UDM签约用户
-type UdmSubUser struct {
-	ID     string `json:"id"  xorm:"pk 'id' autoincr"`
-	Msisdn string `json:"msisdn" xorm:"msisdn"` // 相当手机号
-	Imsi   string `json:"imsi" xorm:"imsi"`     // SIM卡号
-	Ambr   string `json:"ambr" xorm:"ambr"`
-	Nssai  string `json:"nssai" xorm:"nssai"`
-	Rat    string `json:"rat" xorm:"rat"`
-	Arfb   string `json:"arfb" xorm:"arfb"`
-	Sar    string `json:"sar" xorm:"sar"`
-	Cn     string `json:"cn" xorm:"cn"`
-	SmData string `json:"smData" xorm:"sm_data"`
-	SmfSel string `json:"smfSel" xorm:"smf_sel"`
-	EpsDat string `json:"epsDat" xorm:"eps_dat"`
-	NeID   string `json:"neId" xorm:"ne_id"` // UDM网元标识-子系统
-
-	EpsFlag    string `json:"epsFlag" xorm:"eps_flag"`
-	EpsOdb     string `json:"epsOdb" xorm:"eps_odb"`
-	HplmnOdb   string `json:"hplmnOdb" xorm:"hplmn_odb"`
-	Ard        string `json:"ard" xorm:"ard"`
-	Epstpl     string `json:"epstpl" xorm:"epstpl"`
-	ContextId  string `json:"contextId" xorm:"context_id"`
-	ApnContext string `json:"apnContext" xorm:"apn_context"`
-	StaticIp   string `json:"staticIp" xorm:"static_ip"`
-	TenantID   string `json:"tenantID" xorm:"tenant_id"`
-	TenantName string `json:"tenantName" xorm:"-"`
-
-	SubNum string `json:"subNum,omitempty" xorm:"-"` // 批量数
-}

features/udm_user/repo/repo_udm_sub_user.go

@@ -1,531 +0,0 @@
-package repo
-
-import (
-	"fmt"
-	"strconv"
-	"strings"
-
-	"be.ems/features/udm_user/model"
-	"be.ems/lib/core/datasource"
-	"be.ems/lib/log"
-	"be.ems/src/framework/utils/parse"
-	"be.ems/src/framework/utils/repo"
-)
-
-// 实例化数据层 RepoUdmSubUser 结构体
-var NewRepoUdmSubUser = &RepoUdmSubUser{
-	selectSql: `select 
-	s.id, s.msisdn, s.imsi, s.ambr, s.nssai, s.rat, s.arfb, s.sar, s.cn, s.sm_data, s.smf_sel, s.eps_dat, 
-	s.ne_id, s.eps_flag, s.eps_odb, s.hplmn_odb, s.ard, s.epstpl, s.context_id, s.apn_context, s.static_ip,
-	t.tenant_id, t.tenant_name
-	from u_sub_user s 
-	left join sys_tenant t on t.tenant_id = s.tenant_id and t.status = 1`,
-
-	resultMap: map[string]string{
-		"id":          "ID",
-		"msisdn":      "Msisdn",
-		"imsi":        "Imsi",
-		"ambr":        "Ambr",
-		"nssai":       "Nssai",
-		"rat":         "Rat",
-		"arfb":        "Arfb",
-		"sar":         "Sar",
-		"cn":          "Cn",
-		"sm_data":     "SmData",
-		"smf_sel":     "SmfSel",
-		"eps_dat":     "EpsDat",
-		"ne_id":       "NeID",
-		"eps_flag":    "EpsFlag",
-		"eps_odb":     "EpsOdb",
-		"hplmn_odb":   "HplmnOdb",
-		"ard":         "Ard",
-		"epstpl":      "Epstpl",
-		"context_id":  "ContextId",
-		"apn_context": "ApnContext",
-		"static_ip":   "StaticIp",
-		"tenant_id":   "TenantID",
-		"tenant_name": "TenantName",
-	},
-}
-
-// RepoUdmSubUser UDM签约用户 数据层处理
-type RepoUdmSubUser struct {
-	// 查询视图对象SQL
-	selectSql string
-	// 结果字段与实体映射
-	resultMap map[string]string
-}
-
-// convertResultRows 将结果记录转实体结果组
-func (r *RepoUdmSubUser) convertResultRows(rows []map[string]any) []model.UdmSubUser {
-	arr := make([]model.UdmSubUser, 0)
-	for _, row := range rows {
-		UdmUser := model.UdmSubUser{}
-		for key, value := range row {
-			if keyMapper, ok := r.resultMap[key]; ok {
-				repo.SetFieldValue(&UdmUser, keyMapper, value)
-			}
-		}
-		arr = append(arr, UdmUser)
-	}
-	return arr
-}
-
-// SelectPage 根据条件分页查询字典类型
-func (r *RepoUdmSubUser) SelectPage(query map[string]any) map[string]any {
-	// 查询条件拼接
-	var conditions []string
-	var params []any
-	if v, ok := query["msisdn"]; ok && v != "" {
-		conditions = append(conditions, "msisdn like concat(concat('%', ?), '%')")
-		params = append(params, v)
-	}
-	if v, ok := query["imsi"]; ok && v != "" {
-		conditions = append(conditions, "imsi like concat(concat('%', ?), '%')")
-		params = append(params, v)
-	}
-	if v, ok := query["neId"]; ok && v != "" {
-		conditions = append(conditions, "ne_id = ?")
-		params = append(params, v)
-	}
-	// for multi-tenancy solution
-	if v, ok := query["tenantName"]; ok && v != "" {
-		var tenantID []string
-		err := datasource.DefaultDB().Table("sys_tenant").
-			Where("tenant_name='?' and status=1", v).Select("tenant_id").Distinct().Find(&tenantID)
-		if err != nil {
-			log.Errorf("Find tenant_id err => %v", err)
-		}
-		if len(tenantID) > 0 {
-			conditions = append(conditions, "s.tenant_id = ?")
-			params = append(params, tenantID[0])
-		}
-	}
-
-	// 构建查询条件语句
-	whereSql := ""
-	if len(conditions) > 0 {
-		whereSql += " where " + strings.Join(conditions, " and ")
-	}
-
-	result := map[string]any{
-		"total": 0,
-		"rows":  []model.UdmSubUser{},
-	}
-
-	// 查询数量 长度为0直接返回
-	totalSql := "select count(1) as 'total' from u_sub_user s"
-	totalRows, err := datasource.RawDB("", totalSql+whereSql, params)
-	if err != nil {
-		log.Errorf("total err => %v", err)
-		return result
-	}
-	total := parse.Number(totalRows[0]["total"])
-	if total == 0 {
-		return result
-	} else {
-		result["total"] = total
-	}
-
-	// 分页
-	pageNum, pageSize := repo.PageNumSize(query["pageNum"], query["pageSize"])
-	pageSql := " limit ?,? "
-	params = append(params, pageNum*pageSize)
-	params = append(params, pageSize)
-
-	// 排序
-	sortSql := ""
-	if v, ok := query["sortField"]; ok && v != "" {
-		if v == "imsi" {
-			sortSql += " order by imsi "
-		}
-		if v == "msisdn" {
-			sortSql += " order by msisdn "
-		}
-		if o, ok := query["sortOrder"]; ok && o != nil && v != "" {
-			if o == "desc" {
-				sortSql += " desc "
-			} else {
-				sortSql += " asc "
-			}
-		}
-	}
-
-	// 查询数据
-	querySql := r.selectSql + whereSql + sortSql + pageSql
-	results, err := datasource.RawDB("", querySql, params)
-	if err != nil {
-		log.Errorf("query err => %v", err)
-		return result
-	}
-
-	// 转换实体
-	result["rows"] = r.convertResultRows(results)
-	return result
-}
-
-// SelectList 根据实体查询
-func (r *RepoUdmSubUser) SelectList(auth model.UdmSubUser) []model.UdmSubUser {
-	// 查询条件拼接
-	var conditions []string
-	var params []any
-	if auth.Imsi != "" {
-		conditions = append(conditions, "imsi = ?")
-		params = append(params, auth.Imsi)
-	}
-	if auth.NeID != "" {
-		conditions = append(conditions, "ne_id = ?")
-		params = append(params, auth.NeID)
-	}
-	// multi-tenancy
-	if auth.TenantName != "" {
-		var tenantID []string
-		err := datasource.DefaultDB().Table("sys_tenant").
-			Where("tenant_name='?' and status=1", auth.TenantName).Cols("tenant_id").Distinct().Find(&tenantID)
-		if err != nil {
-			log.Errorf("Find tenant_id err => %v", err)
-		}
-		if len(tenantID) > 0 {
-			conditions = append(conditions, "s.tenant_id = ?")
-			params = append(params, tenantID[0])
-		}
-	}
-
-	// 构建查询条件语句
-	whereSql := ""
-	if len(conditions) > 0 {
-		whereSql += " where " + strings.Join(conditions, " and ")
-	}
-
-	// 查询数据
-	querySql := r.selectSql + whereSql + " order by imsi asc "
-	results, err := datasource.RawDB("", querySql, params)
-	if err != nil {
-		log.Errorf("query err => %v", err)
-	}
-
-	// 转换实体
-	return r.convertResultRows(results)
-}
-
-// ClearAndInsert 清空ne_id后新增实体
-func (r *RepoUdmSubUser) ClearAndInsert(neID string, subArr []model.UdmSubUser) int64 {
-	var num int64 = 0
-
-	// 清空指定ne_id
-	_, err := datasource.ExecDB("", "TRUNCATE TABLE u_sub_user", nil)
-	// _, err := datasource.ExecDB("", "DELETE FROM u_sub_user WHERE ne_id = ?", []any{neID})
-	if err != nil {
-		log.Errorf("TRUNCATE err => %v", err)
-	}
-
-	n := len(subArr)
-	batchSize := 2000
-	for i := 0; i < n; i += batchSize {
-		end := i + batchSize
-		if end > n {
-			end = n
-		}
-		batch := subArr[i:end]
-
-		// multi-tenancy
-		r.SetTenantID(&batch)
-
-		// 调用 InsertMulti 函数将批量数据插入数据库
-		results, err := datasource.DefaultDB().Table("u_sub_user").InsertMulti(batch)
-		if err != nil {
-			log.Errorf("InsertMulti err => %v", err)
-			continue
-		}
-		num += results
-	}
-
-	// for _, u := range subArr {
-	// 	u.NeID = neID
-	// 	results, err := datasource.DefaultDB().Table("u_sub_user").Insert(u)
-	// 	if err != nil {
-	// 		return num
-	// 	}
-	// 	num += results
-	// }
-	return num
-}
-
-// Insert 新增实体
-func (r *RepoUdmSubUser) Insert(subUser model.UdmSubUser) int64 {
-	// multi-tenancy
-	subUserSlice := []model.UdmSubUser{subUser}
-	r.SetTenantID(&subUserSlice)
-
-	results, err := datasource.DefaultDB().Table("u_sub_user").Insert(subUser)
-	if err != nil {
-		log.Errorf("Insert err => %v", err)
-		return results
-	}
-	return results
-}
-
-// Insert 批量添加
-func (r *RepoUdmSubUser) Inserts(subUser []model.UdmSubUser) int64 {
-	var num int64
-	n := len(subUser)
-	batchSize := 2000
-	for i := 0; i < n; i += batchSize {
-		end := i + batchSize
-		if end > n {
-			end = n
-		}
-		batch := subUser[i:end]
-
-		// multi-tenancy
-		r.SetTenantID(&batch)
-
-		// 调用 InsertMulti 函数将批量数据插入数据库
-		results, err := datasource.DefaultDB().Table("u_sub_user").InsertMulti(batch)
-		if err != nil {
-			log.Errorf("Insert err => %v", err)
-			continue
-		}
-		num += results
-	}
-	return num
-}
-
-// Insert4G 批量添加4G用户
-func (r *RepoUdmSubUser) Insert4G(neID string, subUser model.UdmSubUser) int64 {
-	var insertNum int64
-
-	imsiV, err := strconv.Atoi(subUser.Imsi)
-	if err != nil {
-		return 0
-	}
-	numV, err := strconv.Atoi(subUser.SubNum)
-	if err != nil {
-		return 0
-	}
-
-	subUser.NeID = neID
-	for i := 0; i < numV; i++ {
-		subUser.Imsi = fmt.Sprint(imsiV + i)
-
-		// multi-tenancy
-		subUserSlice := []model.UdmSubUser{subUser}
-		r.SetTenantID(&subUserSlice)
-
-		results, err := datasource.DefaultDB().Table("u_sub_user").Insert(subUser)
-		if err == nil {
-			log.Errorf("Insert err => %v", err)
-			insertNum += results
-		}
-	}
-
-	return insertNum
-}
-
-// Update 修改更新
-func (r *RepoUdmSubUser) Update(neID string, authUser model.UdmSubUser) int64 {
-	// 查询先
-	var user model.UdmSubUser
-	has, err := datasource.DefaultDB().Table("u_sub_user").Where("imsi = ? and ne_id = ?", authUser.Imsi, neID).Get(&user)
-	if !has || err != nil {
-		return 0
-	}
-
-	if authUser.Msisdn != "" && authUser.Msisdn != user.Msisdn {
-		user.Msisdn = authUser.Msisdn
-	}
-	if authUser.Ambr != "" && authUser.Ambr != user.Ambr {
-		user.Ambr = authUser.Ambr
-	}
-	if authUser.Arfb != "" && authUser.Arfb != user.Arfb {
-		user.Arfb = authUser.Arfb
-	}
-	if authUser.Sar != "" && authUser.Sar != user.Sar {
-		user.Sar = authUser.Sar
-	}
-	if authUser.Rat != "" && authUser.Rat != user.Rat {
-		user.Rat = authUser.Rat
-	}
-	if authUser.Cn != "" && authUser.Cn != user.Cn {
-		user.Cn = authUser.Cn
-	}
-	if authUser.SmfSel != "" && authUser.SmfSel != user.SmfSel {
-		user.SmfSel = authUser.SmfSel
-	}
-	if authUser.SmData != "" && authUser.SmData != user.SmData {
-		user.SmData = authUser.SmData
-	}
-	if authUser.EpsDat != "" && authUser.EpsDat != user.EpsDat {
-		user.EpsDat = authUser.EpsDat
-	}
-	if authUser.EpsFlag != "" && authUser.EpsFlag != user.EpsFlag {
-		user.EpsFlag = authUser.EpsFlag
-	}
-	if authUser.EpsOdb != "" && authUser.EpsDat != user.EpsDat {
-		user.EpsOdb = authUser.EpsOdb
-	}
-	if authUser.HplmnOdb != "" && authUser.HplmnOdb != user.HplmnOdb {
-		user.HplmnOdb = authUser.HplmnOdb
-	}
-	if authUser.Epstpl != "" && authUser.Epstpl != user.Epstpl {
-		user.Epstpl = authUser.Epstpl
-	}
-	if authUser.Ard != "" && authUser.Ard != user.Ard {
-		user.Ard = authUser.Ard
-	}
-	if authUser.ContextId != "" && authUser.ContextId != user.ContextId {
-		user.ContextId = authUser.ContextId
-	}
-	if authUser.ApnContext != "" && authUser.ApnContext != user.ApnContext {
-		user.ApnContext = authUser.ApnContext
-	}
-	if authUser.StaticIp != "" && authUser.StaticIp != user.StaticIp {
-		user.StaticIp = authUser.StaticIp
-	}
-	// for multi-tenancy solution
-	if authUser.TenantName != "" && authUser.TenantName != user.TenantName {
-		user.TenantName = authUser.TenantName
-	}
-
-	results, err := datasource.DefaultDB().Table("u_sub_user").Where("imsi = ? and ne_id = ?", user.Imsi, user.NeID).Update(user)
-	if err != nil {
-		log.Errorf("Update err => %v", err)
-		return 0
-	}
-	return results
-}
-
-// Update4GIP 批量修改4G IP
-func (r *RepoUdmSubUser) Update4GIP(neID string, subUser model.UdmSubUser) int64 {
-	var insertNum int64
-
-	imsiV, err := strconv.Atoi(subUser.Imsi)
-	if err != nil || subUser.StaticIp == "" {
-		return insertNum
-	}
-	numV, err := strconv.Atoi(subUser.SubNum)
-	if err != nil {
-		return insertNum
-	}
-
-	for i := 0; i < numV; i++ {
-		subUser.Imsi = fmt.Sprint(imsiV + i)
-
-		// 查询先
-		var user model.UdmSubUser
-		has, err := datasource.DefaultDB().Table("u_sub_user").Where("imsi = ? and ne_id = ?", subUser.Imsi, neID).Get(&user)
-		if has && err == nil {
-			// IP会自动递增
-			parts := strings.Split(subUser.StaticIp, ".")
-			lastPart := parts[3]
-			lastNum, _ := strconv.Atoi(lastPart)
-			lastNum += i
-			newLastPart := strconv.Itoa(lastNum)
-			parts[3] = newLastPart
-			newIP := strings.Join(parts, ".")
-			user.StaticIp = newIP
-			// 更新
-			results, err := datasource.DefaultDB().Table("u_sub_user").Update(user)
-			if err == nil {
-				log.Errorf("Update err => %v", err)
-				insertNum += results
-			}
-		}
-	}
-	return insertNum
-}
-
-// UpdateSmData 批量修改sm-data
-func (r *RepoUdmSubUser) UpdateSmData(neID string, subUser model.UdmSubUser) int64 {
-	var insertNum int64
-
-	imsiV, err := strconv.Atoi(subUser.Imsi)
-	if err != nil || subUser.StaticIp == "" {
-		return insertNum
-	}
-	numV, err := strconv.Atoi(subUser.SubNum)
-	if err != nil {
-		return insertNum
-	}
-
-	for i := 0; i < numV; i++ {
-		subUser.Imsi = fmt.Sprint(imsiV + i)
-
-		// 查询先
-		var user model.UdmSubUser
-		has, err := datasource.DefaultDB().Table("u_sub_user").Where("imsi = ? and ne_id = ?", subUser.Imsi, neID).Get(&user)
-		if has && err == nil {
-			// IP会自动递增，需提前规划好DNN对应的IP；如dnn不需要绑定IP则不带此字段名
-			// parts := strings.Split(subUser.SmData, "&")
-			user.SmData = subUser.SmData
-			// 更新
-			results, err := datasource.DefaultDB().Table("u_sub_user").Update(user)
-			if err == nil {
-				log.Errorf("Update err => %v", err)
-				insertNum += results
-			}
-		}
-	}
-	return insertNum
-}
-
-// Delete 删除实体
-func (r *RepoUdmSubUser) Delete(neID, imsi string) int64 {
-	results, err := datasource.DefaultDB().Table("u_sub_user").Where("imsi = ? and ne_id = ?", imsi, neID).Delete()
-	if err != nil {
-		log.Errorf("Delete err => %v", err)
-		return results
-	}
-	return results
-}
-
-// Delete 删除范围实体
-func (r *RepoUdmSubUser) Deletes(neID, imsi, num string) int64 {
-	imsiV, err := strconv.Atoi(imsi)
-	if err != nil {
-		return 0
-	}
-
-	numV, err := strconv.Atoi(num)
-	if err != nil {
-		return 0
-	}
-
-	results, err := datasource.DefaultDB().Table("u_sub_user").Where("imsi >= ? and imsi < ? and ne_id = ?", imsiV, imsiV+numV, neID).Delete()
-	if err != nil {
-		log.Errorf("Delete err => %v", err)
-		return results
-	}
-	return results
-}
-
-// multi-tenancy solution, get tenant_name by imsi
-func (r *RepoUdmSubUser) SetTenantName(subArr *[]model.UdmSubUser) {
-	for s := 0; s < len(*subArr); s++ {
-		var tenantName []string
-		err := datasource.DefaultDB().Table("sys_tenant").
-			Where("tenancy_type='IMSI' and tenancy_key='?' and status=1", (*subArr)[s].Imsi).Cols("tenant_name").Find(&tenantName)
-		if err != nil {
-			log.Errorf("Find tenant_name err => %v", err)
-			continue
-		}
-		if len(tenantName) > 0 {
-			(*subArr)[s].TenantID = tenantName[0]
-		}
-	}
-}
-
-func (r *RepoUdmSubUser) SetTenantID(subArr *[]model.UdmSubUser) {
-	for s := 0; s < len(*subArr); s++ {
-		var tenantID []string
-		err := datasource.DefaultDB().Table("sys_tenant").
-			Where("tenancy_type='IMSI' and tenancy_key='?' and status=1", (*subArr)[s].Imsi).Cols("parent_id").Distinct().Find(&tenantID)
-		if err != nil {
-			log.Errorf("Find tenant_id err => %v", err)
-			continue
-		}
-		if len(tenantID) > 0 {
-			(*subArr)[s].TenantID = tenantID[0]
-		}
-	}
-}

features/ue/ue.go

@@ -15,12 +15,53 @@ import (
 	"be.ems/lib/services"
 	"be.ems/restagent/config"
 	tokenConst "be.ems/src/framework/constants/token"
-	"be.ems/src/modules/network_element/model"
 	neService "be.ems/src/modules/network_element/service"
 	"github.com/go-resty/resty/v2"
 	"github.com/gorilla/mux"
 )
 
+// AmfNBInfo AMF的NodeB信息
+type AmfNBInfo struct {
+	ID      string `json:"id"`      //NodeB ID
+	Name    string `json:"name"`    // NodeB name
+	Address string `json:"address"` // 基站地址
+	UENum   int    `jons:"ueNum"`   // UE数量
+}
+
+// SmfUENum SMF在线用户数
+type SmfUENum struct {
+	UENum int `json:"ueNum"` // 当前在线用户数
+}
+
+// SmfUEInfo SMF在线用户信息
+type SmfUEInfo struct {
+	IMSI           string `json:"imsi"`
+	MSISDN         string `json:"msisdn"`
+	RatType        string `json:"ratType"`
+	PduSessionInfo []struct {
+		PduSessionID int    `json:"pduSessionID"`
+		IPv4         string `json:"ipv4"`
+		IPv6         string `json:"ipv6"`
+		Dnn          string `json:"dnn"`
+		Tai          string `json:"tai"`
+		SstSD        string `json:"sstSD"`
+		UpfN3IP      string `json:"upfN3IP"`
+		RanN3IP      string `json:"ranN3IP"`
+		Activetime   string `json:"activeTime"`
+		UpState      string `json:"upState"`
+	} `json:"pduSessionInfo"`
+}
+
+// ImsUEInfo IMS在线用户信息
+type ImsUEInfo struct {
+	IMSI       string `json:"imsi"`
+	MSISDN     string `json:"msisdn"`
+	IMPU       string `json:"impu"`
+	Barring    int    `json:"barring"`
+	RegState   int    `json:"regState"`
+	Activetime string `json:"activeTime"`
+}
+
 // N3iwfUEInfo N3IWF在线用户信息
 type N3iwfUEInfo struct {
 	IMSI string `json:"imsi"`
@@ -36,8 +77,7 @@ type N3iwfUEData struct {
 
 var (
 	UriNBInfo            = config.DefaultUriPrefix + "/ueManagement/{apiVersion}/elementType/{elementTypeValue}/objectType/nbInfo"
-	UriSMFUEInfo         = config.DefaultUriPrefix + "/ueManagement/{apiVersion}/elementType/smf/objectType/ueInfo"
+	UriUEInfo            = config.DefaultUriPrefix + "/ueManagement/{apiVersion}/elementType/{elementTypeValue}/objectType/ueInfo"
-	UriIMSUEInfo         = config.DefaultUriPrefix + "/ueManagement/{apiVersion}/elementType/ims/objectType/ueInfo"
 	UriUENum             = config.DefaultUriPrefix + "/ueManagement/{apiVersion}/elementType/{elementTypeValue}/objectType/ueNum"
 	UriPCFUser           = config.DefaultUriPrefix + "/ueManagement/{apiVersion}/elementType/pcf/objectType/ueInfo"
 	UriPCFUserM          = config.DefaultUriPrefix + "/ueManagement/{apiVersion}/elementType/pcf/objectType/ueInfo/batch/{number}"
@@ -47,8 +87,7 @@ var (
 	UriNSSFSubscriptions = config.DefaultUriPrefix + "/ueManagement/{apiVersion}/elementType/{elementTypeValue}/objectType/subscriptions"
 
 	CustomUriNBInfo            = config.UriPrefix + "/ueManagement/{apiVersion}/elementType/{elementTypeValue}/objectType/nbInfo"
-	CustomUriSMFUEInfo         = config.UriPrefix + "/ueManagement/{apiVersion}/elementType/smf/objectType/ueInfo"
+	CustomUriUEInfo            = config.UriPrefix + "/ueManagement/{apiVersion}/elementType/{elementTypeValue}/objectType/ueInfo"
-	CustomUriIMSUEInfo         = config.UriPrefix + "/ueManagement/{apiVersion}/elementType/ims/objectType/ueInfo"
 	CustomUriUENum             = config.UriPrefix + "/ueManagement/{apiVersion}/elementType/{elementTypeValue}/objectType/ueNum"
 	CustomUriPCFUser           = config.UriPrefix + "/ueManagement/{apiVersion}/elementType/pcf/objectType/ueInfo"
 	CustomUriPCFUserM          = config.UriPrefix + "/ueManagement/{apiVersion}/elementType/pcf/objectType/ueInfo/batch/{number}"
@@ -202,293 +241,18 @@ func GetSubscriptionsFromNSSF(w http.ResponseWriter, r *http.Request) {
 	}
 }
 
-// SmfUEInfo SMF在线用户信息
+// Get UEInfo from NF/NFs
-type SmfUEInfo struct {
+func GetUEInfoFromNF(w http.ResponseWriter, r *http.Request) {
-	IMSI           string `json:"imsi"`
-	MSISDN         string `json:"msisdn"`
-	RatType        string `json:"ratType"`
-	PduSessionInfo []struct {
-		PduSessionID int    `json:"pduSessionID"`
-		IPv4         string `json:"ipv4"`
-		IPv6         string `json:"ipv6"`
-		Dnn          string `json:"dnn"`
-		Tai          string `json:"tai"`
-		SstSD        string `json:"sstSD"`
-		UpfN3IP      string `json:"upfN3IP"`
-		RanN3IP      string `json:"ranN3IP"`
-		Activetime   string `json:"activeTime"`
-		UpState      string `json:"upState"`
-	} `json:"pduSessionInfo"`
-}
-
-type TenantUEInfo struct {
-	NeType         string `json:"neType"`
-	NeID           string `json:"neId"`
-	IMSI           string `json:"imsi"`
-	MSISDN         string `json:"msisdn"`
-	RatType        string `json:"ratType"`
-	PduSessionInfo []struct {
-		PduSessionID int    `json:"pduSessionID"`
-		IPv4         string `json:"ipv4"`
-		IPv6         string `json:"ipv6"`
-		Dnn          string `json:"dnn"`
-		Tai          string `json:"tai"`
-		SstSD        string `json:"sstSD"`
-		UpfN3IP      string `json:"upfN3IP"`
-		RanN3IP      string `json:"ranN3IP"`
-		Activetime   string `json:"activeTime"`
-		UpState      string `json:"upState"`
-	} `json:"pduSessionInfo"`
-	TenantName string `json:"tenantName"`
-}
-
-type SmfUEInfoResponse struct {
-	Data []SmfUEInfo `json:"data"`
-}
-
-type UEInfoResponse struct {
-	Data []TenantUEInfo `json:"data"`
-}
-
-// Get UEInfo from NF/NFs, SMF Online users
-func GetSMFUEInfoFromNF(w http.ResponseWriter, r *http.Request) {
 	log.Debug("GetUEInfoFromNF processing... ")
 
 	neId := ctx.GetQuery(r, "neId")
-	neType := "smf"
+	neType := ctx.GetParam(r, "elementTypeValue")
-	// if neType == "" || neId == "" {
+	if neType == "" || neId == "" {
-	// 	log.Error("elementTypeValue/neId is empty")
+		log.Error("elementTypeValue/neId is empty")
-	// 	services.ResponseNotFound404UriNotExist(w, r)
+		services.ResponseNotFound404UriNotExist(w, r)
-	// 	return
+		return
-	// }
-	var tenantName string
-	tenantNames := services.GetParamsArrByName("tenantName", r)
-	if len(tenantNames) > 0 {
-		tenantName = tenantNames[0]
 	}
 
-	var neInfos []model.NeInfo
-	if neId != "" {
-		neInfo := neService.NewNeInfo.SelectNeInfoByNeTypeAndNeID(neType, neId)
-		neInfos = append(neInfos, neInfo)
-	} else {
-		neInfos = neService.NewNeInfo.SelectNeInfoByNeType(neType)
-	}
-
-	var response UEInfoResponse
-	for _, neInfo := range neInfos {
-		//if neInfo.NeId == neId && neInfo.NeId != "" {
-		requestURI2NF := fmt.Sprintf("http://%s:%v%s", neInfo.IP, neInfo.Port, r.RequestURI)
-		//requestURI2NF := "http://127.0.0.1:4523/m1/3157310-1528434-default/api/rest/ueManagement/v1/elementType/smf/objectType/ueInfo?apifoxApiId=128609449"
-		log.Debug("requestURI2NF:", requestURI2NF)
-		resp, err := client.R().
-			EnableTrace().
-			SetHeaders(map[string]string{"User-Agent": config.GetDefaultUserAgent()}).
-			SetHeaders(map[string]string{"Content-Type": "application/json;charset=UTF-8"}).
-			Get(requestURI2NF)
-		if err != nil {
-			log.Error("Failed to Get from NF:", err)
-			// services.ResponseInternalServerError500ProcessError(w, err)
-			// return
-			continue
-		}
-		// multi-tenancy solution
-		var tenantID, where string
-		//var cols []string
-		if tenantName != "" {
-			where = fmt.Sprintf("status='1' and tenant_name='%s'", tenantName)
-			tenantID, _ = dborm.XormGetSingleColStringByWhere("sys_tenant", "tenant_id", where)
-		} else {
-			userName := ctx.LoginUserToUserName(r)
-			where = fmt.Sprintf("status='1' and user_name='%s'", userName)
-			tenantID, _ = dborm.XormGetSingleColStringByWhere("sys_user", "tenant_id", where)
-			where = fmt.Sprintf("status='1' and tenant_id='%s'", tenantID)
-			tenantName, _ = dborm.XormGetSingleColStringByWhere("sys_tenant", "tenant_name", where)
-		}
-		if tenantID == "" {
-			var ueInfos UEInfoResponse
-			_ = json.Unmarshal(resp.Body(), &ueInfos)
-			for i := 0; i < len(ueInfos.Data); i++ {
-				where = fmt.Sprintf("status='1' and tenancy_type='IMSI' and '%s' like tenancy_key", ueInfos.Data[i].IMSI[5:])
-				tenantID, _ = dborm.XormGetSingleColStringByWhere("sys_tenant", "parent_id", where)
-				where = fmt.Sprintf("status='1' and tenant_id='%s'", tenantID)
-				tenantName, _ = dborm.XormGetSingleColStringByWhere("sys_tenant", "tenant_name", where)
-				log.Tracef("tenantName: %s tenantID: %s", tenantName, tenantID)
-				ueInfos.Data[i].NeType = strings.ToUpper(neType)
-				ueInfos.Data[i].NeID = neInfo.NeId
-				ueInfos.Data[i].TenantName = tenantName
-				response.Data = append(response.Data, ueInfos.Data[i])
-			}
-			// services.ResponseWithJson(w, resp.StatusCode(), &response)
-			// return
-		} else {
-			//var tenantUEInfos []TenantUEInfo
-			var ueInfos UEInfoResponse
-			log.Trace("body:", string(resp.Body()))
-			_ = json.Unmarshal(resp.Body(), &ueInfos)
-			log.Trace("ueInfos:", ueInfos)
-			for _, n := range ueInfos.Data {
-				log.Trace("tenantID, n.IMSI[5:]:", tenantID, n.IMSI[5:])
-				// "imsi": "imsi-460000100029999",
-				where = fmt.Sprintf("status='1' and parent_id='%s' and tenancy_type='IMSI' and '%s' like tenancy_key", tenantID, n.IMSI[5:])
-				has, err := dborm.XormExistTableOne("sys_tenant", where)
-				if err == nil && has {
-					n.NeType = strings.ToUpper(neType)
-					n.NeID = neInfo.NeId
-					n.TenantName = tenantName
-					response.Data = append(response.Data, n)
-				}
-			}
-			// var response UEInfoResponse
-			// response.Data = tenantUEInfos
-			// services.ResponseWithJson(w, resp.StatusCode(), &response)
-			// return
-		}
-	}
-
-	services.ResponseWithJson(w, http.StatusOK, response)
-}
-
-// ImsUEInfo IMS在线用户信息
-type ImsUEInfo struct {
-	IMSI       string `json:"imsi"`
-	MSISDN     string `json:"msisdn"`
-	IMPU       string `json:"impu"`
-	Barring    int    `json:"barring"`
-	RegState   int    `json:"regState"`
-	Activetime string `json:"activeTime"`
-}
-
-// ImsUEInfo IMS在线用户信息
-type TenantImsUEInfo struct {
-	NeType     string `json:"neType"`
-	NeID       string `json:"neId"`
-	IMSI       string `json:"imsi"`
-	MSISDN     string `json:"msisdn"`
-	IMPU       string `json:"impu"`
-	Barring    int    `json:"barring"`
-	RegState   int    `json:"regState"`
-	Activetime string `json:"activeTime"`
-	TenantName string `json:"tenantName"`
-}
-
-type ImsUEInfoResponse struct {
-	Data []ImsUEInfo `json:"data"`
-}
-
-type TenantImsUEInfoResponse struct {
-	Data []TenantImsUEInfo `json:"data"`
-}
-
-// Get UEInfo from NF/NFs, IMS Online users
-func GetIMSUEInfoFromNF(w http.ResponseWriter, r *http.Request) {
-	log.Debug("GetIMSUEInfoFromNF processing... ")
-
-	neId := ctx.GetQuery(r, "neId")
-	neType := "ims"
-	// if neType == "" || neId == "" {
-	// 	log.Error("elementTypeValue/neId is empty")
-	// 	services.ResponseNotFound404UriNotExist(w, r)
-	// 	return
-	// }
-	var tenantName string
-	tenantNames := services.GetParamsArrByName("tenantName", r)
-	if len(tenantNames) > 0 {
-		tenantName = tenantNames[0]
-	}
-
-	var neInfos []model.NeInfo
-	if neId != "" {
-		neInfo := neService.NewNeInfo.SelectNeInfoByNeTypeAndNeID(neType, neId)
-		neInfos = append(neInfos, neInfo)
-	} else {
-		neInfos = neService.NewNeInfo.SelectNeInfoByNeType(neType)
-	}
-
-	var response TenantImsUEInfoResponse
-	for _, neInfo := range neInfos {
-		requestURI2NF := fmt.Sprintf("http://%s:%v%s", neInfo.IP, neInfo.Port, r.RequestURI)
-		//requestURI2NF := "http://127.0.0.1:4523/m1/3157310-1528434-default/api/rest/ueManagement/v1/elementType/ims/objectType/ueInfo?apifoxApiId=128609458"
-		log.Debug("requestURI2NF:", requestURI2NF)
-		resp, err := client.R().
-			EnableTrace().
-			SetHeaders(map[string]string{"User-Agent": config.GetDefaultUserAgent()}).
-			SetHeaders(map[string]string{"Content-Type": "application/json;charset=UTF-8"}).
-			Get(requestURI2NF)
-		if err != nil {
-			log.Error("Failed to Get from NF:", err)
-			// services.ResponseInternalServerError500ProcessError(w, err)
-			// return
-			continue
-		}
-		// multi-tenancy solution
-		var tenantID, where string
-		//var cols []string
-		if tenantName != "" {
-			where = fmt.Sprintf("status='1' and tenant_name='%s'", tenantName)
-			tenantID, _ = dborm.XormGetSingleColStringByWhere("sys_tenant", "tenant_id", where)
-		} else {
-			userName := ctx.LoginUserToUserName(r)
-			where = fmt.Sprintf("status='1' and user_name='%s'", userName)
-			tenantID, _ = dborm.XormGetSingleColStringByWhere("sys_user", "tenant_id", where)
-			where = fmt.Sprintf("status='1' and tenant_id='%s'", tenantID)
-			tenantName, _ = dborm.XormGetSingleColStringByWhere("sys_tenant", "tenant_name", where)
-		}
-		if tenantID == "" {
-			var ueInfos TenantImsUEInfoResponse
-			_ = json.Unmarshal(resp.Body(), &ueInfos)
-			for i := 0; i < len(ueInfos.Data); i++ {
-				where = fmt.Sprintf("status='1' and tenancy_type='IMSI' and '%s' like tenancy_key", ueInfos.Data[i].IMSI)
-				tenantID, _ = dborm.XormGetSingleColStringByWhere("sys_tenant", "parent_id", where)
-				where = fmt.Sprintf("status='1' and tenant_id='%s'", tenantID)
-				tenantName, _ = dborm.XormGetSingleColStringByWhere("sys_tenant", "tenant_name", where)
-				log.Tracef("tenantName: %s tenantID: %s", tenantName, tenantID)
-				ueInfos.Data[i].NeType = strings.ToUpper(neType)
-				ueInfos.Data[i].NeID = neInfo.NeId
-				ueInfos.Data[i].TenantName = tenantName
-				response.Data = append(response.Data, ueInfos.Data[i])
-			}
-			// services.ResponseWithJson(w, resp.StatusCode(), &response)
-			// return
-		} else {
-			//var tenantUEInfos []TenantImsUEInfo
-			var ueInfos TenantImsUEInfoResponse
-			log.Trace("body:", string(resp.Body()))
-			_ = json.Unmarshal(resp.Body(), &ueInfos)
-			log.Trace("ueInfos:", ueInfos)
-			for _, n := range ueInfos.Data {
-				log.Trace("tenantID, n.IMSI:", tenantID, n.IMSI)
-				// "imsi": "460000100029999",
-				where = fmt.Sprintf("status='1' and parent_id='%s' and tenancy_type='IMSI' and '%s' like tenancy_key", tenantID, n.IMSI)
-				has, err := dborm.XormExistTableOne("sys_tenant", where)
-				if err == nil && has {
-					n.NeType = strings.ToUpper(neType)
-					n.NeID = neInfo.NeId
-					n.TenantName = tenantName
-					response.Data = append(response.Data, n)
-				}
-			}
-			// var response TenantImsUEInfoResponse
-			// response.Data = tenantUEInfos
-			// services.ResponseWithJson(w, resp.StatusCode(), &response)
-			// return
-		}
-	}
-	services.ResponseWithJson(w, http.StatusOK, response)
-}
-
-// Get UEInfo from NF/NFs, PCF Online users
-func GetPCFUEInfoFromNF(w http.ResponseWriter, r *http.Request) {
-	log.Debug("GetPCFUEInfoFromNF processing... ")
-
-	neId := ctx.GetQuery(r, "neId")
-	neType := "pcf"
-	// if neType == "" || neId == "" {
-	// 	log.Error("elementTypeValue/neId is empty")
-	// 	services.ResponseNotFound404UriNotExist(w, r)
-	// 	return
-	// }
-
 	neInfo := neService.NewNeInfo.SelectNeInfoByNeTypeAndNeID(neType, neId)
 
 	var response services.MapResponse
@@ -513,7 +277,7 @@ func GetPCFUEInfoFromNF(w http.ResponseWriter, r *http.Request) {
 	services.ResponseWithJson(w, http.StatusOK, response)
 }
 
-// POST PCF User Info from NF/NFs
+// POST User Info from NF/NFs
 func PostPCFUserInfo(w http.ResponseWriter, r *http.Request) {
 	log.Info("PostPCFUserInfo processing... ")
 
@@ -790,129 +554,7 @@ func GetUENumFromNF(w http.ResponseWriter, r *http.Request) {
 	}
 }
 
-// SmfUENum SMF在线用户数
+// Get Radio Info from NF/NFs
-// type SmfUENum struct {
-// 	UENum int `json:"ueNum"` // 当前在线用户数
-// }
-
-// UENumInfo IMS/SMF在线用户数
-type UENumInfo struct {
-	NeType string `json:"neType"`
-	NeId   string `json:"neId"`
-	Data   struct {
-		UENum int `json:"ueNum"` // 当前在线用户数
-	} `json:"data"`
-}
-type UENumResponse struct {
-	UENums []UENumInfo
-}
-
-// Get UEInfo from SMF
-func NewGetUENumFromNF(w http.ResponseWriter, r *http.Request) {
-	log.Info("NewGetUENumFromNF processing... ")
-
-	vars := mux.Vars(r)
-	neType := vars["elementTypeValue"]
-	if neType == "" {
-		services.ResponseNotFound404UriNotExist(w, r)
-		return
-	}
-	//neTypeLower := strings.ToLower(neType)
-	//var neId string
-	//neIds := services.GetParamsArrByName("neId", r)
-	neId := ctx.GetQuery(r, "neId")
-	// if len(neIds) == 1 {
-	// 	neId = neIds[0]
-	// } else {
-	// 	services.ResponseNotFound404UriNotExist(w, r)
-	// 	return
-	// }
-
-	// token, err := services.CheckFrontValidRequest(w, r)
-	// if err != nil {
-	// 	log.Error("Request error:", err)
-	// 	return
-	// }
-	// log.Debug("token:", token)
-
-	// neInfo, err := dborm.XormGetNeInfo(neType, neId)
-	// if err != nil {
-	// 	log.Error("Failed to XormGetNeInfo:", err)
-	// 	services.ResponseInternalServerError500ProcessError(w, err)
-	// 	return
-	// } else if neInfo == nil {
-	// 	err := global.ErrCMNotFoundTargetNE
-	// 	log.Error(global.ErrCMNotFoundTargetNE)
-	// 	services.ResponseInternalServerError500ProcessError(w, err)
-	// 	return
-	// }
-	// log.Trace("neInfo:", neInfo)
-
-	var neInfos []model.NeInfo
-	if neId != "" {
-		neInfo := neService.NewNeInfo.SelectNeInfoByNeTypeAndNeID(neType, neId)
-		neInfos = append(neInfos, neInfo)
-	} else {
-		neInfos = neService.NewNeInfo.SelectNeInfoByNeType(neType)
-	}
-
-	var response []UENumInfo
-
-	for _, neInfo := range neInfos {
-		hostUri := fmt.Sprintf("http://%s:%v", neInfo.IP, neInfo.Port)
-		requestURI2NF := fmt.Sprintf("%s%s", hostUri, r.RequestURI)
-
-		log.Debug("requestURI2NF:", requestURI2NF)
-
-		resp, err := client.R().
-			EnableTrace().
-			SetHeaders(map[string]string{tokenConst.HEADER_KEY: r.Header.Get(tokenConst.HEADER_KEY)}).
-			// SetHeaders(map[string]string{"accessToken": token}).
-			SetHeaders(map[string]string{"User-Agent": config.GetDefaultUserAgent()}).
-			SetHeaders(map[string]string{"Content-Type": "application/json;charset=UTF-8"}).
-			Get(requestURI2NF)
-		if err != nil {
-			log.Error("failed to get UENum from NF:", err)
-			services.ResponseInternalServerError500ProcessError(w, err)
-			return
-		} else {
-			var ueNum UENumInfo
-			_ = json.Unmarshal(resp.Body(), &ueNum)
-			ueNum.NeType = strings.ToUpper(neType)
-			ueNum.NeId = neInfo.NeId
-			response = append(response, ueNum)
-			// services.ResponseWithJson(w, resp.StatusCode(), response)
-			// return
-		}
-	}
-	if neId != "" {
-		services.ResponseWithJson(w, http.StatusOK, response[0])
-	} else {
-		services.ResponseWithJson(w, http.StatusOK, response)
-	}
-}
-
-// AmfNBInfo AMF的NodeB信息
-type AmfNBInfo struct {
-	ID      string `json:"id"`      //NodeB ID
-	Name    string `json:"name"`    // NodeB name
-	Address string `json:"address"` // 基站地址
-	UENum   int    `json:"ueNum"`   // UE数量
-}
-
-type TenantNBInfo struct {
-	ID         string `json:"id"`         //NodeB ID
-	Name       string `json:"name"`       // NodeB name
-	Address    string `json:"address"`    // 基站地址
-	UENum      int    `json:"ueNum"`      // UE数量
-	TenantName string `json:"tenantName"` // Tenant Name
-}
-
-type NBInfoResponse struct {
-	Data []TenantNBInfo `json:"data"`
-}
-
-// Get AMF Radio Info from NF/NFs
 func GetNBInfoFromNF(w http.ResponseWriter, r *http.Request) {
 	log.Info("GetNBInfoFromNF processing... ")
 
@@ -922,7 +564,6 @@ func GetNBInfoFromNF(w http.ResponseWriter, r *http.Request) {
 		services.ResponseNotFound404UriNotExist(w, r)
 		return
 	}
-
 	//neTypeLower := strings.ToLower(neType)
 	var neId string
 	neIds := services.GetParamsArrByName("neId", r)
@@ -932,11 +573,7 @@ func GetNBInfoFromNF(w http.ResponseWriter, r *http.Request) {
 		services.ResponseNotFound404UriNotExist(w, r)
 		return
 	}
-	var tenantName string
+
-	tenantNames := services.GetParamsArrByName("tenantName", r)
-	if len(tenantNames) > 0 {
-		tenantName = tenantNames[0]
-	}
 	// token, err := services.CheckFrontValidRequest(w, r)
 	// if err != nil {
 	// 	log.Error("Request error:", err)
@@ -960,9 +597,6 @@ func GetNBInfoFromNF(w http.ResponseWriter, r *http.Request) {
 	hostUri := fmt.Sprintf("http://%s:%v", neInfo.Ip, neInfo.Port)
 	requestURI2NF := fmt.Sprintf("%s%s", hostUri, r.RequestURI)
 
-	// for apifox mock test
-	//requestURI2NF := "http://127.0.0.1:4523/m1/3157310-1528434-default/api/rest/ueManagement/v1/elementType/" + strings.ToLower(neType) + "/objectType/nbInfo?apifoxApiId=128848301"
-
 	log.Debug("requestURI2NF:", requestURI2NF)
 
 	resp, err := client.R().
@@ -976,59 +610,10 @@ func GetNBInfoFromNF(w http.ResponseWriter, r *http.Request) {
 		log.Error("Get system state from NF is failed:", err)
 		services.ResponseInternalServerError500ProcessError(w, err)
 		return
-	}
-
-	// multi-tenancy solution
-	var tenantID, where, userName, radioType string
-	if strings.ToLower(neType) == "mme" {
-		radioType = "4G"
-	} else if strings.ToLower(neType) == "amf" {
-		radioType = "5G"
-	}
-	if tenantName != "" {
-		where = fmt.Sprintf("status='1' and tenant_name='%s'", tenantName)
-		tenantID, _ = dborm.XormGetSingleColStringByWhere("sys_tenant", "tenant_id", where)
 	} else {
-		userName = ctx.LoginUserToUserName(r)
+		var response services.MapResponse
-		where = fmt.Sprintf("status='1' and user_name='%s'", userName)
-		tenantID, _ = dborm.XormGetSingleColStringByWhere("sys_user", "tenant_id", where)
-		where = fmt.Sprintf("status='1' and tenant_id='%s'", tenantID)
-		tenantName, _ = dborm.XormGetSingleColStringByWhere("sys_tenant", "tenant_name", where)
-	}
-	log.Tracef("tenantName: %s userName: %s tenantID: %s", tenantName, userName, tenantID)
-	if tenantID == "" {
-		var response NBInfoResponse
-		//var nbInfo *TenantNBInfo
 		_ = json.Unmarshal(resp.Body(), &response)
-
+		services.ResponseWithJson(w, resp.StatusCode(), response)
-		for i := 0; i < len(response.Data); i++ {
-			where = fmt.Sprintf("status='1' and tenancy_type='RADIO' and tenancy_key='%v'", radioType+"_"+response.Data[i].ID)
-			tenantID, _ = dborm.XormGetSingleColStringByWhere("sys_tenant", "parent_id", where)
-			where = fmt.Sprintf("status='1' and tenant_id='%s'", tenantID)
-			tenantName, _ = dborm.XormGetSingleColStringByWhere("sys_tenant", "tenant_name", where)
-			log.Tracef("tenantName: %s tenantID: %s", tenantName, tenantID)
-			response.Data[i].TenantName = tenantName
-		}
-		services.ResponseWithJson(w, resp.StatusCode(), &response)
-		return
-	} else {
-		// var response services.MapResponse
-		var tenantNBInfos []TenantNBInfo
-		var nbInfos NBInfoResponse
-		var nbIDs []string
-		// Get nodeB IDs by tenantID
-		where = fmt.Sprintf("status='1' and tenancy_type='RADIO' and parent_id='%v'", tenantID)
-		dborm.XormFindColStringArrayByWhere("sys_tenant", "tenancy_key", where, &nbIDs)
-		_ = json.Unmarshal(resp.Body(), &nbInfos)
-		for _, n := range nbInfos.Data {
-			if global.IsMember(radioType+"_"+n.ID, nbIDs) {
-				n.TenantName = tenantName
-				tenantNBInfos = append(tenantNBInfos, n)
-			}
-		}
-		log.Tracef("nbIDs: %v", nbIDs)
-		nbInfos.Data = tenantNBInfos
-		services.ResponseWithJson(w, resp.StatusCode(), &nbInfos)
 		return
 	}
 }

go.mod

@@ -43,17 +43,17 @@ require (
 )
 
 require (
-	filippo.io/edwards25519 v1.1.0 // indirect // indirect
+	filippo.io/edwards25519 v1.1.0 // indirect
-	github.com/beorn7/perks v1.0.1 // indirect // indirect
+	github.com/beorn7/perks v1.0.1 // indirect
-	github.com/bytedance/sonic v1.12.1 // indirect // indirect
+	github.com/bytedance/sonic v1.12.1 // indirect
-	github.com/bytedance/sonic/loader v0.2.0 // indirect // indirect
+	github.com/bytedance/sonic/loader v0.2.0 // indirect
-	github.com/cespare/xxhash/v2 v2.3.0 // indirect // indirect
+	github.com/cespare/xxhash/v2 v2.3.0 // indirect
 	github.com/chenjiandongx/ginprom v0.0.0-20210617023641-6c809602c38a
 	github.com/cloudwego/base64x v0.1.4 // indirect
 	github.com/cloudwego/iasm v0.2.0 // indirect
 	github.com/dgryski/go-rendezvous v0.0.0-20200823014737-9f7001d12a5f // indirect
 	github.com/fastly/go-utils v0.0.0-20180712184237-d95a45783239 // indirect
-	github.com/fsnotify/fsnotify v1.7.0
+	github.com/fsnotify/fsnotify v1.7.0 // indirect
 	github.com/gabriel-vasile/mimetype v1.4.5 // indirect
 	github.com/gin-contrib/sse v0.1.0 // indirect
 	github.com/go-forks/fsnotify v1.4.7 // indirect
@@ -71,11 +71,11 @@ require (
 	github.com/jinzhu/now v1.1.5 // indirect
 	github.com/jonboulle/clockwork v0.4.0 // indirect
 	github.com/json-iterator/go v1.1.12 // indirect
-	github.com/klauspost/compress v1.17.9 // indirect // indirect
+	github.com/klauspost/compress v1.17.9 // indirect
-	github.com/klauspost/cpuid/v2 v2.2.8 // indirect // indirect
+	github.com/klauspost/cpuid/v2 v2.2.8 // indirect
 	github.com/konsorten/go-windows-terminal-sequences v1.0.1 // indirect
-	github.com/kr/fs v0.1.0 // indirect // indirect
+	github.com/kr/fs v0.1.0 // indirect
-	github.com/leodido/go-urn v1.4.0 // indirect // indirect
+	github.com/leodido/go-urn v1.4.0 // indirect
 	github.com/lestrrat/go-envload v0.0.0-20180220120943-6ed08b54a570 // indirect
 	github.com/lestrrat/go-strftime v0.0.0-20180220042222-ba3bf9c1d042 // indirect
 	github.com/lufia/plan9stats v0.0.0-20240513124658-fba389f38bae // indirect
@@ -100,15 +100,15 @@ require (
 	github.com/richardlehane/mscfb v1.0.4 // indirect
 	github.com/richardlehane/msoleps v1.0.3 // indirect
 	github.com/sagikazarmark/locafero v0.6.0 // indirect
-	github.com/sagikazarmark/slog-shim v0.1.0 // indirect // indirect
+	github.com/sagikazarmark/slog-shim v0.1.0 // indirect
 	github.com/shirou/gopsutil/v3 v3.23.11 // indirect
 	github.com/shoenig/go-m1cpu v0.1.6 // indirect
 	github.com/sirupsen/logrus v1.4.2 // indirect
-	github.com/sourcegraph/conc v0.3.0 // indirect // indirect
+	github.com/sourcegraph/conc v0.3.0 // indirect
-	github.com/spf13/afero v1.11.0 // indirect // indirect
+	github.com/spf13/afero v1.11.0 // indirect
-	github.com/spf13/cast v1.7.0 // indirect // indirect
+	github.com/spf13/cast v1.7.0 // indirect
-	github.com/subosito/gotenv v1.6.0 // indirect // indirect
+	github.com/subosito/gotenv v1.6.0 // indirect
-	github.com/syndtr/goleveldb v1.0.0 // indirect // indirect
+	github.com/syndtr/goleveldb v1.0.0 // indirect
 	github.com/tebeka/strftime v0.1.5 // indirect
 	github.com/tklauser/go-sysconf v0.3.14 // indirect
 	github.com/tklauser/numcpus v0.8.0 // indirect

lib/core/datasource/datasource.go

@@ -1,49 +0,0 @@
-package datasource
-
-import (
-	"database/sql"
-	"regexp"
-
-	"be.ems/lib/dborm"
-	"xorm.io/xorm"
-)
-
-// 获取默认数据源
-func DefaultDB() *xorm.Engine {
-	return dborm.DbClient.XEngine
-}
-
-// RawDB 原生查询语句
-func RawDB(source string, sql string, parameters []any) ([]map[string]any, error) {
-	// 数据源
-	db := DefaultDB()
-
-	// 使用正则表达式替换连续的空白字符为单个空格
-	fmtSql := regexp.MustCompile(`\s+`).ReplaceAllString(sql, " ")
-
-	// log.Infof("sql=> %v", fmtSql)
-	// log.Infof("parameters=> %v", parameters)
-
-	// 查询结果
-	var rows []map[string]any
-	err := db.SQL(fmtSql, parameters...).Find(&rows)
-	if err != nil {
-		return nil, err
-	}
-	return rows, nil
-}
-
-// ExecDB 原生执行语句
-func ExecDB(source string, sql string, parameters []any) (sql.Result, error) {
-	// 数据源
-	db := DefaultDB()
-
-	// 使用正则表达式替换连续的空白字符为单个空格
-	fmtSql := regexp.MustCompile(`\s+`).ReplaceAllString(sql, " ")
-	// 执行结果
-	res, err := db.Exec(append([]any{fmtSql}, parameters...)...)
-	if err != nil {
-		return nil, err
-	}
-	return res, err
-}

lib/core/datasource/repo.go

@@ -1,126 +0,0 @@
-package datasource
-
-import (
-	"fmt"
-	"reflect"
-	"strconv"
-	"strings"
-)
-
-// PageNumSize 分页页码记录数
-func PageNumSize(pageNum, pageSize any) (int, int) {
-	// 记录起始索引
-	pageNumStr := fmt.Sprintf("%v", pageNum)
-	num := 1
-	if v, err := strconv.Atoi(pageNumStr); err == nil && v > 0 {
-		num = v
-	}
-
-	// 显示记录数
-	pageSizeStr := fmt.Sprintf("%v", pageSize)
-	size := 10
-	if v, err := strconv.Atoi(pageSizeStr); err == nil && v > 0 {
-		size = v
-	}
-	return num - 1, size
-}
-
-// SetFieldValue 判断结构体内是否存在指定字段并设置值
-func SetFieldValue(obj any, fieldName string, value any) {
-	// 获取结构体的反射值
-	userValue := reflect.ValueOf(obj)
-
-	// 获取字段的反射值
-	fieldValue := userValue.Elem().FieldByName(fieldName)
-
-	// 检查字段是否存在
-	if fieldValue.IsValid() && fieldValue.CanSet() {
-		// 获取字段的类型
-		fieldType := fieldValue.Type()
-
-		// 转换传入的值类型为字段类型
-		switch fieldType.Kind() {
-		case reflect.String:
-			if value == nil {
-				fieldValue.SetString("")
-			} else {
-				fieldValue.SetString(fmt.Sprintf("%v", value))
-			}
-		case reflect.Int, reflect.Int8, reflect.Int16, reflect.Int32, reflect.Int64:
-			intValue, err := strconv.ParseInt(fmt.Sprintf("%v", value), 10, 64)
-			if err != nil {
-				intValue = 0
-			}
-			fieldValue.SetInt(intValue)
-		case reflect.Uint, reflect.Uint8, reflect.Uint16, reflect.Uint32, reflect.Uint64:
-			uintValue, err := strconv.ParseUint(fmt.Sprintf("%v", value), 10, 64)
-			if err != nil {
-				uintValue = 0
-			}
-			fieldValue.SetUint(uintValue)
-		case reflect.Float32, reflect.Float64:
-			floatValue, err := strconv.ParseFloat(fmt.Sprintf("%v", value), 64)
-			if err != nil {
-				floatValue = 0
-			}
-			fieldValue.SetFloat(floatValue)
-		default:
-			// 设置字段的值
-			fieldValue.Set(reflect.ValueOf(value).Convert(fieldValue.Type()))
-		}
-	}
-}
-
-// ConvertIdsSlice 将 []string 转换为 []any
-func ConvertIdsSlice(ids []string) []any {
-	// 将 []string 转换为 []any
-	arr := make([]any, len(ids))
-	for i, v := range ids {
-		arr[i] = v
-	}
-	return arr
-}
-
-// 查询-参数值的占位符
-func KeyPlaceholderByQuery(sum int) string {
-	placeholders := make([]string, sum)
-	for i := 0; i < sum; i++ {
-		placeholders[i] = "?"
-	}
-	return strings.Join(placeholders, ",")
-}
-
-// 插入-参数映射键值占位符 keys, placeholder, values
-func KeyPlaceholderValueByInsert(params map[string]any) ([]string, string, []any) {
-	// 参数映射的键
-	keys := make([]string, len(params))
-	// 参数映射的值
-	values := make([]any, len(params))
-	sum := 0
-	for k, v := range params {
-		keys[sum] = k
-		values[sum] = v
-		sum++
-	}
-	// 参数值的占位符
-	placeholders := make([]string, sum)
-	for i := 0; i < sum; i++ {
-		placeholders[i] = "?"
-	}
-	return keys, strings.Join(placeholders, ","), values
-}
-
-// 更新-参数映射键值占位符 keys, values
-func KeyValueByUpdate(params map[string]any) ([]string, []any) {
-	// 参数映射的键
-	keys := make([]string, len(params))
-	// 参数映射的值
-	values := make([]any, len(params))
-	sum := 0
-	for k, v := range params {
-		keys[sum] = k + "=?"
-		values[sum] = v
-		sum++
-	}
-	return keys, values
-}

lib/dborm/dborm.go

@@ -1233,9 +1233,9 @@ func XormGetColStringArrayByWhere(table, coln, where string, colv *[]string) err
 func XormFindColStringArrayByWhere(table, col, where string, cols *[]string) error {
 	log.Debug("XormFindColStringArrayByWhere processing... ")
 
-	err := xEngine.Table(table).Where(where).Cols(col).Find(cols)
+	err := xEngine.Table(table).Where(where).Cols(col).Distinct().Find(cols)
 	if err != nil {
-		log.Errorf("Failed to find %s from table %s: %v", col, table, err)
+		log.Errorf("Failed to Find %s from table %s:%v", col, table, err)
 		return err
 	}
 	return nil
@@ -1247,7 +1247,7 @@ func XormGetSingleColStringByWhere(table, col, where string) (string, error) {
 	var colv string
 	_, err := xEngine.Table(table).Where(where).Cols(col).Get(&colv)
 	if err != nil {
-		log.Errorf("Failed to find %s from table %s: %v", col, table, err)
+		log.Errorf("Failed to Find %s from table %s:%v", col, table, err)
 		return colv, err
 	}
 	return colv, nil

lib/global/kits.go

@@ -726,12 +726,3 @@ func RecurseStructToMap(obj any) map[string]any {
 	}
 	return out
 }
-
-func IsMember(target string, group []string) bool {
-	for _, str := range group {
-		if target == str {
-			return true
-		}
-	}
-	return false
-}

lib/routes/routes.go

@@ -232,16 +232,12 @@ func init() {
 	Register("GET", aaaa.CustomUriAAAASSO, aaaa.GetSSOFromAAAA, nil)
 
 	// UEInfo: SMF
-	Register("GET", ue.UriSMFUEInfo, ue.GetSMFUEInfoFromNF, nil)
+	Register("GET", ue.UriUEInfo, ue.GetUEInfoFromNF, nil)
-	Register("GET", ue.CustomUriSMFUEInfo, ue.GetSMFUEInfoFromNF, nil)
+	Register("GET", ue.CustomUriUEInfo, ue.GetUEInfoFromNF, nil)
-
-	// UEInfo: IMS
-	Register("GET", ue.UriIMSUEInfo, ue.GetIMSUEInfoFromNF, nil)
-	Register("GET", ue.CustomUriIMSUEInfo, ue.GetIMSUEInfoFromNF, nil)
 
 	// UEInfo: PCF
-	Register("GET", ue.UriPCFUser, ue.GetPCFUEInfoFromNF, nil)
+	Register("GET", ue.UriPCFUser, ue.GetUEInfoFromNF, nil)
-	Register("GET", ue.CustomUriPCFUser, ue.GetPCFUEInfoFromNF, nil)
+	Register("GET", ue.CustomUriPCFUser, ue.GetUEInfoFromNF, nil)
 	Register("POST", ue.UriPCFUser, ue.PostPCFUserInfo, nil)
 	Register("POST", ue.CustomUriPCFUser, ue.PostPCFUserInfo, nil)
 	Register("PUT", ue.UriPCFUser, ue.PutPCFUserInfo, nil)
@@ -264,7 +260,7 @@ func init() {
 	Register("GET", ue.UriUENum, ue.GetUENumFromNF, nil)
 	Register("GET", ue.CustomUriUENum, ue.GetUENumFromNF, nil)
 
-	// AMF NBInfo
+	// NBInfo
 	Register("GET", ue.UriNBInfo, ue.GetNBInfoFromNF, nil)
 	Register("GET", ue.CustomUriNBInfo, ue.GetNBInfoFromNF, nil)
 

makefile

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

misc/importdb.sh

@@ -4,7 +4,7 @@ USER="root"
 PASSWORD="1000omc@kp!"
 HOST="127.0.0.1"
 PORT="33066"
-DBNAME="tenants_db"
+DBNAME="omc_db"
 UpgradeSQLDir=/usr/local/omc/etc/db/upgrade
 Upgvue3SQLDir=/usr/local/omc/etc/db/upgvue3
 InstallSQLDir=/usr/local/omc/etc/db/install
@@ -120,7 +120,7 @@ esac
 ne_types=$(mysql -u${USER} -p${PASSWORD} -P ${PORT} -h ${HOST} --protocol tcp -D ${DBNAME} -se "SELECT DISTINCT LOWER(ne_type) FROM kpi_title")
 for ne_type in ${ne_types}; do
         TABLE_NAME="kpi_report_${ne_type}"
-    SQL="CREATE TABLE IF NOT EXISTS ${TABLE_NAME} LIKE \`kpi_report\`;"
+        SQL="CREATE TABLE IF NOT EXISTS ${TABLE_NAME} AS SELECT * FROM kpi_report WHERE 1=0;ALTER TABLE ${TABLE_NAME} MODIFY COLUMN \`id\` int(11) NOT NULL AUTO_INCREMENT FIRST,ADD PRIMARY KEY IF NOT EXISTS (\`id\`);"
         echo -n "Create table: ${TABLE_NAME} ..."
         mysql -u${USER} -p${PASSWORD} -P ${PORT} -h ${HOST} --protocol tcp -D ${DBNAME} -e "${SQL}"
         if [ $? = 0 ]; then
@@ -132,23 +132,4 @@ for ne_type in ${ne_types}; do
         if [ $? = 0 ]; then
                 echo "done" 
         fi
-    SQL="ALTER TABLE ${TABLE_NAME} ADD INDEX IF NOT EXISTS \`idx_timestamp\`(\`created_at\`) USING BTREE,ADD INDEX IF NOT EXISTS \`idx_uid_datetime\`(\`rm_uid\`, \`date\`, \`start_time\`) USING BTREE;"
-    echo -n "Create index of ${TABLE_NAME} ..."
-    mysql -u${USER} -p${PASSWORD} -P ${PORT} --protocol tcp -D ${DBNAME} -e "${SQL}"
-    if [ $? = 0 ]; then
-        echo "done" 
-    fi
-    SQL="ALTER TABLE ${TABLE_NAME} ADD COLUMN IF NOT EXISTS \`tenant_id\` varchar(32) NULL DEFAULT NULL AFTER \`created_at\`;"
-    echo -n "Alter table ${TABLE_NAME} ..."
-    mysql -u${USER} -p${PASSWORD} -P ${PORT} --protocol tcp -D ${DBNAME} -e "${SQL}"
-    if [ $? = 0 ]; then
-        echo "done" 
-    fi					
-    TABLE_NAME="kpi_c_report_${ne_type}"
-    SQL="CREATE TABLE IF NOT EXISTS ${TABLE_NAME} LIKE \`kpi_c_report\`;"
-    echo -n "Create table: ${TABLE_NAME} ..."
-    mysql -u${USER} -p${PASSWORD} -P ${PORT} -h ${HOST} --protocol tcp -D ${DBNAME} -e "${SQL}"
-    if [ $? = 0 ]; then
-        echo "done" 
-    fi	
 done

misc/omcsvc.sh

@@ -8,15 +8,11 @@ BinDir=/usr/local/omc/bin
 case "$1" in
         start)
             for procName in $ProcListDesc;do
-                echo -n "Starting $procName process  ... "
                 echo -n "Starting $procName process  ... "
                 systemctl start $procName
                 if [ $? = 0 ]; then
                     echo "done" 
                 fi 
-                if [ $? = 0 ]; then
-                    echo "done" 
-                fi 
                 sleep 1
             done
         ;;

misc/setomc.sh

@@ -42,7 +42,7 @@ check_args() {
 USER="root"
 PASSWORD="1000omc@kp!"
 PORT="33066"
-DBNAME="tenants_db"
+DBNAME="omc_db"
 OMCRootDir=/usr/local/omc
 OMCBinDir=${OMCRootDir}/bin
 UpgradeSQLDir=${OMCRootDir}/etc/db/upgrade

mkpkg.sh

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