OMC/be.ems
1
0
Fork 0
Code Issues Releases 3 Activity

fix: 实例命名变更

Browse Source
This commit is contained in:
TsMask
2025-09-25 15:18:46 +08:00
parent ce993c6fcd
commit 01d3021840
5 changed files with 18 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
features/pm/performance.go
View File

@@ -349,7 +349,7 @@ func PostKPIReportFromNF(w http.ResponseWriter, r *http.Request) {
// 更新UPF总流量 // 更新UPF总流量
upValue := parse.Number(kpiEvent["UPF.03"]) upValue := parse.Number(kpiEvent["UPF.03"])
downValue := parse.Number(kpiEvent["UPF.06"]) downValue := parse.Number(kpiEvent["UPF.06"])
neDataService.NewPerfKPI.UPFTodayFlowUpdate(neInfo.RmUID, upValue, downValue) neDataService.NewKpiReport.UPFTodayFlowUpdate(neInfo.RmUID, upValue, downValue)
} }
} }

12
src/modules/crontask/processor/backup_export_kpi/backup_export_kpi.go
View File

@@ -25,7 +25,7 @@ var NewProcessor = &BackupExportKPIProcessor{
count: 0, count: 0,
backupService: neDataService.NewBackup, backupService: neDataService.NewBackup,
neInfoService: neService.NewNeInfo, neInfoService: neService.NewNeInfo,
perfKPIService: neDataService.NewPerfKPI, perfKPIService: neDataService.NewKpiReport,
kpiCReportService: neDataService.NewKpiCReport, kpiCReportService: neDataService.NewKpiCReport,
} }
@@ -34,7 +34,7 @@ type BackupExportKPIProcessor struct {
count int // 执行次数 count int // 执行次数
backupService *neDataService.Backup // 备份相关服务 backupService *neDataService.Backup // 备份相关服务
neInfoService *neService.NeInfo // 网元信息服务 neInfoService *neService.NeInfo // 网元信息服务
perfKPIService *neDataService.PerfKPI // 统计信息服务 perfKPIService *neDataService.KpiReport // 统计信息服务
kpiCReportService *neDataService.KpiCReport // KPI统计服务 kpiCReportService *neDataService.KpiCReport // KPI统计服务
} }
@@ -74,7 +74,7 @@ func (s *BackupExportKPIProcessor) Execute(data any) (any, error) {
} }
// //
query := neDataModel.GoldKPIQuery{ query := neDataModel.KPIQuery{
NeType: ne.NeType, NeType: ne.NeType,
NeID: ne.NeId, NeID: ne.NeId,
RmUID: ne.RmUID, RmUID: ne.RmUID,
@@ -102,7 +102,7 @@ func (s *BackupExportKPIProcessor) Execute(data any) (any, error) {
} }
// exportKPI 导出KPI数据 // exportKPI 导出KPI数据
func (s *BackupExportKPIProcessor) exportKPI(query neDataModel.GoldKPIQuery, fileType string) string { func (s *BackupExportKPIProcessor) exportKPI(query neDataModel.KPIQuery, fileType string) string {
rows := s.perfKPIService.FindData(query) rows := s.perfKPIService.FindData(query)
if len(rows) == 0 { if len(rows) == 0 {
return "no data" return "no data"
@@ -111,8 +111,8 @@ func (s *BackupExportKPIProcessor) exportKPI(query neDataModel.GoldKPIQuery, fil
// 获取数据指标id // 获取数据指标id
kpiIdMap := make(map[string]string, 0) kpiIdMap := make(map[string]string, 0)
kpiTitles := s.perfKPIService.SelectGoldKPITitle(query.NeType) kpiTitles := s.perfKPIService.SelectGoldKPITitle(query.NeType)
for _, kpiId := range kpiTitles { for _, v := range kpiTitles {
kpiIdMap[kpiId.KPIID] = kpiId.EnTitle kpiIdMap[v.KpiId] = v.EnTitle
} }
// 导出文件名称 // 导出文件名称

12
src/modules/network_data/controller/all_perf_kpi.go
View File

@@ -19,15 +19,15 @@ import (
// 实例化控制层 PerfKPIController 结构体 // 实例化控制层 PerfKPIController 结构体
var NewPerfKPI = &PerfKPIController{ var NewPerfKPI = &PerfKPIController{
neInfoService: neService.NewNeInfo, neInfoService: neService.NewNeInfo,
perfKPIService: neDataService.NewPerfKPI, perfKPIService: neDataService.NewKpiReport,
} }
// 性能统计 // 性能统计
// //
// PATH /kpi // PATH /kpi
type PerfKPIController struct { type PerfKPIController struct {
neInfoService *neService.NeInfo // 网元信息服务 neInfoService *neService.NeInfo // 网元信息服务
perfKPIService *neDataService.PerfKPI // 统计信息服务 perfKPIService *neDataService.KpiReport // 统计信息服务
} }
// 获取统计数据 // 获取统计数据
@@ -49,7 +49,7 @@ type PerfKPIController struct {
// @Router /neData/kpi/data [get] // @Router /neData/kpi/data [get]
func (s *PerfKPIController) GoldKPI(c *gin.Context) { func (s *PerfKPIController) GoldKPI(c *gin.Context) {
language := ctx.AcceptLanguage(c) language := ctx.AcceptLanguage(c)
var querys model.GoldKPIQuery var querys model.KPIQuery
if err := c.ShouldBindQuery(&querys); err != nil { if err := c.ShouldBindQuery(&querys); err != nil {
c.JSON(400, result.CodeMsg(400, i18n.TKey(language, "app.common.err400"))) c.JSON(400, result.CodeMsg(400, i18n.TKey(language, "app.common.err400")))
return return
@@ -162,7 +162,7 @@ func (s *PerfKPIController) TitleList(c *gin.Context) {
// @Router /neData/kpi/title [put] // @Router /neData/kpi/title [put]
func (s PerfKPIController) TitleUpdate(c *gin.Context) { func (s PerfKPIController) TitleUpdate(c *gin.Context) {
var body struct { var body struct {
ID string `json:"id" binding:"required"` ID int64 `json:"id" binding:"required"`
Title string `json:"enTitle"` Title string `json:"enTitle"`
StatusFlag string `json:"statusFlag"` StatusFlag string `json:"statusFlag"`
} }
@@ -173,7 +173,7 @@ func (s PerfKPIController) TitleUpdate(c *gin.Context) {
return return
} }
item := s.perfKPIService.TitleFind(model.GoldKPITitle{ID: body.ID}) item := s.perfKPIService.TitleFind(model.KpiTitle{ID: body.ID})
if len(item) != 1 { if len(item) != 1 {
c.JSON(200, resp.ErrMsg("not found")) c.JSON(200, resp.ErrMsg("not found"))
return return

2
src/modules/ws/processor/upf_total_flow.go
View File

@@ -34,7 +34,7 @@ func GetUPFTotalFlow(requestID string, data any) ([]byte, error) {
return nil, fmt.Errorf("no matching network element information found") return nil, fmt.Errorf("no matching network element information found")
} }
up, down := neDataService.NewPerfKPI.UPFTodayFlowFind(neInfo.RmUID, querys.Day) up, down := neDataService.NewKpiReport.UPFTodayFlowFind(neInfo.RmUID, querys.Day)
resultByte, err := json.Marshal(result.Ok(map[string]any{ resultByte, err := json.Marshal(result.Ok(map[string]any{
"requestId": requestID, "requestId": requestID,

4
src/modules/ws/service/ws_send.go
View File

@@ -36,6 +36,10 @@ const (
GROUP_AMF_UE = "1010" GROUP_AMF_UE = "1010"
// 组号-MME_UE会话事件 1011_neId // 组号-MME_UE会话事件 1011_neId
GROUP_MME_UE = "1011" GROUP_MME_UE = "1011"
// 组号-AMF_NB状态事件 1014_neId
GROUP_AMF_NB = "1014"
// 组号-MME_NB状态事件 1015_neId
GROUP_MME_NB = "1015"
// 组号-告警 2000_neType_neId // 组号-告警 2000_neType_neId
GROUP_ALARM = "2000" GROUP_ALARM = "2000"
// 组号-告警事件 2002_neType_neId // 组号-告警事件 2002_neType_neId