feat: 引入features的gin路由
This commit is contained in:
TsMask
@@ -2,7 +2,6 @@ package pm
|
||||
|
||||
import (
|
||||
"encoding/json"
|
||||
"errors"
|
||||
"fmt"
|
||||
"io"
|
||||
"math"
|
||||
@@ -11,19 +10,22 @@ import (
|
||||
"strings"
|
||||
"time"
|
||||
|
||||
"nms_cxy/features/pm/kpi_c_report"
|
||||
"nms_cxy/features/pm/kpi_c_title"
|
||||
"nms_cxy/lib/dborm"
|
||||
evaluate "nms_cxy/lib/eval"
|
||||
"nms_cxy/lib/global"
|
||||
"nms_cxy/lib/log"
|
||||
"nms_cxy/lib/services"
|
||||
"nms_cxy/omc/config"
|
||||
|
||||
"xorm.io/xorm"
|
||||
|
||||
neService "nms_cxy/src/modules/network_element/service"
|
||||
wsService "nms_cxy/src/modules/ws/service"
|
||||
|
||||
"github.com/go-resty/resty/v2"
|
||||
_ "github.com/go-sql-driver/mysql"
|
||||
"github.com/gorilla/mux"
|
||||
"xorm.io/xorm"
|
||||
)
|
||||
|
||||
type Response struct {
|
||||
@@ -228,14 +230,6 @@ func PostKPIReportFromNF(w http.ResponseWriter, r *http.Request) {
|
||||
granularity = int8(seconds)
|
||||
}
|
||||
|
||||
// 黄金指标事件对象
|
||||
kpiEvent := map[string]any{
|
||||
// kip_id ...
|
||||
"neType": kpiReport.Task.NE.NeType,
|
||||
"neName": kpiReport.Task.NE.NEName,
|
||||
"startIndex": kpiIndex,
|
||||
"timeGroup": startTime,
|
||||
}
|
||||
// insert into new kpi_report_xxx table
|
||||
kpiData := new(KpiData)
|
||||
kpiData.Date = startTime
|
||||
@@ -250,6 +244,19 @@ func PostKPIReportFromNF(w http.ResponseWriter, r *http.Request) {
|
||||
kpiData.RmUid = kpiReport.Task.NE.RmUID
|
||||
kpiVal := new(KPIVal)
|
||||
kpiData.CreatedAt = time.Now().UnixMilli()
|
||||
|
||||
// 黄金指标事件对象
|
||||
kpiEvent := map[string]any{
|
||||
// kip_id ...
|
||||
"neType": kpiReport.Task.NE.NeType,
|
||||
"neName": kpiReport.Task.NE.NEName,
|
||||
"rmUID": kpiReport.Task.NE.RmUID,
|
||||
"startIndex": kpiIndex,
|
||||
"timeGroup": kpiData.CreatedAt,
|
||||
}
|
||||
|
||||
// for custom kpi
|
||||
kpiValMap := map[string]any{}
|
||||
for _, k := range kpiReport.Task.NE.KPIs {
|
||||
kpiEvent[k.KPIID] = k.Value // kip_id
|
||||
|
||||
@@ -257,7 +264,9 @@ func PostKPIReportFromNF(w http.ResponseWriter, r *http.Request) {
|
||||
kpiVal.Value = int64(k.Value)
|
||||
kpiVal.Err = k.Err
|
||||
kpiData.KPIValues = append(kpiData.KPIValues, *kpiVal)
|
||||
kpiValMap[k.KPIID] = k.Value
|
||||
}
|
||||
kpiValMap["granularity"] = kpiData.Granularity
|
||||
|
||||
// insert kpi_report table, no session
|
||||
tableName := "kpi_report_" + strings.ToLower(kpiReport.Task.NE.NeType)
|
||||
@@ -268,15 +277,67 @@ func PostKPIReportFromNF(w http.ResponseWriter, r *http.Request) {
|
||||
return
|
||||
}
|
||||
|
||||
// 推送到ws订阅组
|
||||
wsService.NewWSSendImpl.ByGroupID(wsService.GROUP_KPI, kpiEvent)
|
||||
if kpiReport.Task.NE.NeType == "UPF" {
|
||||
wsService.NewWSSendImpl.ByGroupID(wsService.GROUP_KPI_UPF, kpiEvent)
|
||||
report := kpi_c_report.KpiCReport{
|
||||
NeType: &kpiData.NEType,
|
||||
NeName: &kpiData.NEName,
|
||||
RmUID: &kpiData.RmUid,
|
||||
Date: kpiData.Date,
|
||||
StartTime: &kpiData.StartTime,
|
||||
EndTime: &kpiData.EndTime,
|
||||
Index: int16(kpiData.Index),
|
||||
Granularity: &kpiData.Granularity,
|
||||
}
|
||||
|
||||
// 发送到匹配的网元
|
||||
neInfo := neService.NewNeInfoImpl.SelectNeInfoByRmuid(kpiData.RmUid)
|
||||
// custom kpi report to FE
|
||||
kpiCEvent := map[string]any{
|
||||
// kip_id ...
|
||||
"neType": kpiData.NEType,
|
||||
"neId": neInfo.NeId,
|
||||
"neName": kpiData.NEName,
|
||||
"rmUID": kpiData.RmUid,
|
||||
"startIndex": kpiData.Index,
|
||||
"timeGroup": kpiData.Date[:10] + " " + kpiData.StartTime,
|
||||
"createdAt": kpiData.CreatedAt,
|
||||
"granularity": kpiData.Granularity,
|
||||
}
|
||||
kpiCList := kpi_c_title.GetActiveKPICList(kpiData.NEType)
|
||||
for _, k := range kpiCList {
|
||||
result, err := evaluate.CalcExpr(*k.Expression, kpiValMap)
|
||||
kpiCVal := new(kpi_c_report.KpiCVal)
|
||||
kpiCVal.KPIID = *k.KpiID
|
||||
if err != nil {
|
||||
kpiCVal.Value = 0.0
|
||||
kpiCVal.Err = err.Error()
|
||||
} else {
|
||||
kpiCVal.Value = result
|
||||
}
|
||||
|
||||
report.KpiValues = append(report.KpiValues, *kpiCVal)
|
||||
|
||||
// set KPIC event kpiid and value
|
||||
kpiCEvent[kpiCVal.KPIID] = kpiCVal.Value
|
||||
}
|
||||
|
||||
// KPI自定义指标入库
|
||||
kpi_c_report.InsertKpiCReport(kpiData.NEType, report)
|
||||
|
||||
if neInfo.RmUID == kpiData.RmUid {
|
||||
// 推送到ws订阅组
|
||||
wsService.NewWSSendImpl.ByGroupID(fmt.Sprintf("%s%s_%s", wsService.GROUP_KPI, neInfo.NeType, neInfo.NeId), kpiEvent)
|
||||
// 推送自定义KPI到ws订阅组
|
||||
wsService.NewWSSendImpl.ByGroupID(fmt.Sprintf("%s%s_%s", wsService.GROUP_KPI_C, neInfo.NeType, neInfo.NeId), kpiCEvent)
|
||||
if neInfo.NeType == "UPF" {
|
||||
// 推送标识为：12_RMUID, exp: 12_4400HXUPF001
|
||||
wsService.NewWSSendImpl.ByGroupID(wsService.GROUP_KPI_UPF+kpiReport.Task.NE.RmUID, kpiEvent)
|
||||
}
|
||||
}
|
||||
|
||||
services.ResponseStatusOK204NoContent(w)
|
||||
}
|
||||
|
||||
// PostGoldKPIFromNF 已废弃
|
||||
// post kpi report from NEs, insert insto gold_kpi table, discard...
|
||||
func PostGoldKPIFromNF(w http.ResponseWriter, r *http.Request) {
|
||||
log.Debug("PostKPIReportFromNF processing... ")
|
||||
@@ -324,6 +385,7 @@ func PostGoldKPIFromNF(w http.ResponseWriter, r *http.Request) {
|
||||
// kip_id ...
|
||||
"neType": goldKpi.NEType,
|
||||
"neName": goldKpi.NEName,
|
||||
"rmUID": goldKpi.RmUid,
|
||||
"startIndex": goldKpi.Index,
|
||||
"timeGroup": goldKpi.StartTime,
|
||||
}
|
||||
@@ -641,7 +703,7 @@ func PostMeasureTaskToNF(w http.ResponseWriter, r *http.Request) {
|
||||
return
|
||||
}
|
||||
if neInfo == nil {
|
||||
err := errors.New(fmt.Sprintf("not found target NE neType=%s, neId=%s", neType, neId))
|
||||
err := fmt.Errorf("not found target NE neType=%s, neId=%s", neType, neId)
|
||||
log.Error(err)
|
||||
services.ResponseInternalServerError500ProcessError(w, err)
|
||||
return
|
||||
@@ -694,7 +756,7 @@ func PostMeasureTaskToNF(w http.ResponseWriter, r *http.Request) {
|
||||
return
|
||||
}
|
||||
default:
|
||||
err = errors.New(fmt.Sprintf("measure task status must be inactive id=%d", id))
|
||||
err = fmt.Errorf("measure task status must be inactive id=%d", id)
|
||||
log.Error("Unable to active measure task:", err)
|
||||
services.ResponseInternalServerError500ProcessError(w, err)
|
||||
return
|
||||
@@ -721,7 +783,7 @@ func PostMeasureTaskToNF(w http.ResponseWriter, r *http.Request) {
|
||||
services.TransportResponse(w, response.StatusCode(), response.Body())
|
||||
return
|
||||
} else {
|
||||
err = errors.New(fmt.Sprintf("failed to active measure task, NF return error status=%v", response.Status()))
|
||||
err = fmt.Errorf("failed to active measure task, NF return error status=%v", response.Status())
|
||||
log.Error("Unable to active measure task:", err)
|
||||
services.ResponseInternalServerError500ProcessError(w, err)
|
||||
return
|
||||
@@ -934,8 +996,6 @@ func PatchMeasureTaskToNF(w http.ResponseWriter, r *http.Request) {
|
||||
return
|
||||
}
|
||||
if neInfo == nil {
|
||||
em := errors.New("Not found NE info in database")
|
||||
log.Error(em)
|
||||
taskInfo := new(dborm.MeasureTask)
|
||||
taskInfo.Status = dborm.MeasureTaskStatusInactive
|
||||
affected, err := dborm.XormUpdateTableById(id, dborm.TableNameMeasureTask, taskInfo)
|
||||
@@ -988,7 +1048,6 @@ func PatchMeasureTaskToNF(w http.ResponseWriter, r *http.Request) {
|
||||
}
|
||||
|
||||
services.ResponseWithJson(w, response.StatusCode(), respMsg)
|
||||
return
|
||||
}
|
||||
|
||||
type Measurement struct {
|
||||
|
||||
Reference in New Issue
Block a user