fix: 实例命名变更
This commit is contained in:
@@ -349,7 +349,7 @@ func PostKPIReportFromNF(w http.ResponseWriter, r *http.Request) {
|
||||
// 更新UPF总流量
|
||||
upValue := parse.Number(kpiEvent["UPF.03"])
|
||||
downValue := parse.Number(kpiEvent["UPF.06"])
|
||||
neDataService.NewPerfKPI.UPFTodayFlowUpdate(neInfo.RmUID, upValue, downValue)
|
||||
neDataService.NewKpiReport.UPFTodayFlowUpdate(neInfo.RmUID, upValue, downValue)
|
||||
}
|
||||
}
|
||||
|
||||
|
||||
@@ -25,7 +25,7 @@ var NewProcessor = &BackupExportKPIProcessor{
|
||||
count: 0,
|
||||
backupService: neDataService.NewBackup,
|
||||
neInfoService: neService.NewNeInfo,
|
||||
perfKPIService: neDataService.NewPerfKPI,
|
||||
perfKPIService: neDataService.NewKpiReport,
|
||||
kpiCReportService: neDataService.NewKpiCReport,
|
||||
}
|
||||
|
||||
@@ -34,7 +34,7 @@ type BackupExportKPIProcessor struct {
|
||||
count int // 执行次数
|
||||
backupService *neDataService.Backup // 备份相关服务
|
||||
neInfoService *neService.NeInfo // 网元信息服务
|
||||
perfKPIService *neDataService.PerfKPI // 统计信息服务
|
||||
perfKPIService *neDataService.KpiReport // 统计信息服务
|
||||
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,
|
||||
NeID: ne.NeId,
|
||||
RmUID: ne.RmUID,
|
||||
@@ -102,7 +102,7 @@ func (s *BackupExportKPIProcessor) Execute(data any) (any, error) {
|
||||
}
|
||||
|
||||
// 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)
|
||||
if len(rows) == 0 {
|
||||
return "no data"
|
||||
@@ -111,8 +111,8 @@ func (s *BackupExportKPIProcessor) exportKPI(query neDataModel.GoldKPIQuery, fil
|
||||
// 获取数据指标id
|
||||
kpiIdMap := make(map[string]string, 0)
|
||||
kpiTitles := s.perfKPIService.SelectGoldKPITitle(query.NeType)
|
||||
for _, kpiId := range kpiTitles {
|
||||
kpiIdMap[kpiId.KPIID] = kpiId.EnTitle
|
||||
for _, v := range kpiTitles {
|
||||
kpiIdMap[v.KpiId] = v.EnTitle
|
||||
}
|
||||
|
||||
// 导出文件名称
|
||||
|
||||
@@ -19,7 +19,7 @@ import (
|
||||
// 实例化控制层 PerfKPIController 结构体
|
||||
var NewPerfKPI = &PerfKPIController{
|
||||
neInfoService: neService.NewNeInfo,
|
||||
perfKPIService: neDataService.NewPerfKPI,
|
||||
perfKPIService: neDataService.NewKpiReport,
|
||||
}
|
||||
|
||||
// 性能统计
|
||||
@@ -27,7 +27,7 @@ var NewPerfKPI = &PerfKPIController{
|
||||
// PATH /kpi
|
||||
type PerfKPIController struct {
|
||||
neInfoService *neService.NeInfo // 网元信息服务
|
||||
perfKPIService *neDataService.PerfKPI // 统计信息服务
|
||||
perfKPIService *neDataService.KpiReport // 统计信息服务
|
||||
}
|
||||
|
||||
// 获取统计数据
|
||||
@@ -49,7 +49,7 @@ type PerfKPIController struct {
|
||||
// @Router /neData/kpi/data [get]
|
||||
func (s *PerfKPIController) GoldKPI(c *gin.Context) {
|
||||
language := ctx.AcceptLanguage(c)
|
||||
var querys model.GoldKPIQuery
|
||||
var querys model.KPIQuery
|
||||
if err := c.ShouldBindQuery(&querys); err != nil {
|
||||
c.JSON(400, result.CodeMsg(400, i18n.TKey(language, "app.common.err400")))
|
||||
return
|
||||
@@ -162,7 +162,7 @@ func (s *PerfKPIController) TitleList(c *gin.Context) {
|
||||
// @Router /neData/kpi/title [put]
|
||||
func (s PerfKPIController) TitleUpdate(c *gin.Context) {
|
||||
var body struct {
|
||||
ID string `json:"id" binding:"required"`
|
||||
ID int64 `json:"id" binding:"required"`
|
||||
Title string `json:"enTitle"`
|
||||
StatusFlag string `json:"statusFlag"`
|
||||
}
|
||||
@@ -173,7 +173,7 @@ func (s PerfKPIController) TitleUpdate(c *gin.Context) {
|
||||
return
|
||||
}
|
||||
|
||||
item := s.perfKPIService.TitleFind(model.GoldKPITitle{ID: body.ID})
|
||||
item := s.perfKPIService.TitleFind(model.KpiTitle{ID: body.ID})
|
||||
if len(item) != 1 {
|
||||
c.JSON(200, resp.ErrMsg("not found"))
|
||||
return
|
||||
|
||||
@@ -34,7 +34,7 @@ func GetUPFTotalFlow(requestID string, data any) ([]byte, error) {
|
||||
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{
|
||||
"requestId": requestID,
|
||||
|
||||
@@ -36,6 +36,10 @@ const (
|
||||
GROUP_AMF_UE = "1010"
|
||||
// 组号-MME_UE会话事件 1011_neId
|
||||
GROUP_MME_UE = "1011"
|
||||
// 组号-AMF_NB状态事件 1014_neId
|
||||
GROUP_AMF_NB = "1014"
|
||||
// 组号-MME_NB状态事件 1015_neId
|
||||
GROUP_MME_NB = "1015"
|
||||
// 组号-告警 2000_neType_neId
|
||||
GROUP_ALARM = "2000"
|
||||
// 组号-告警事件 2002_neType_neId
|
||||
|
||||
Reference in New Issue
Block a user