ref: 多core表结构和代码调整修改
This commit is contained in:
@@ -168,8 +168,7 @@ func saveKPIData(kpiReport KpiReport, index int64) int64 {
|
||||
KpiValuesByte, _ := json.Marshal(KpiValues)
|
||||
kpiData := neDataModel.KpiReport{
|
||||
NeType: taskNe.NeType,
|
||||
NeName: taskNe.NEName,
|
||||
RmUid: taskNe.RmUID,
|
||||
NeUID: taskNe.RmUID,
|
||||
Date: date.ParseDateToStr(receiverTime, "2006-01-02"),
|
||||
StartTime: date.ParseDateToStr(startTime, "15:04:05"),
|
||||
EndTime: date.ParseDateToStr(endTime, "15:04:05"),
|
||||
@@ -183,8 +182,8 @@ func saveKPIData(kpiReport KpiReport, index int64) int64 {
|
||||
// 指标事件对象
|
||||
kpiEvent := map[string]any{
|
||||
"neType": kpiData.NeType,
|
||||
"neName": kpiData.NeName,
|
||||
"rmUID": kpiData.RmUid,
|
||||
"coreUid": kpiData.CoreUID,
|
||||
"neUid": kpiData.NeUID,
|
||||
"startIndex": kpiData.Index,
|
||||
"timeGroup": kpiData.CreatedAt,
|
||||
// kip_id ...
|
||||
@@ -194,15 +193,15 @@ func saveKPIData(kpiReport KpiReport, index int64) int64 {
|
||||
}
|
||||
|
||||
// 发送到匹配的网元
|
||||
neInfo := neService.NewNeInfo.FindByRmuid(kpiData.RmUid)
|
||||
if neInfo.RmUID == kpiData.RmUid {
|
||||
neInfo := neService.NewNeInfo.FindByCoreUidAndNeUid("*", kpiData.NeUID)
|
||||
if neInfo.NeUID == kpiData.NeUID {
|
||||
// 推送到ws订阅组
|
||||
wsService.NewWSSend.ByGroupID(fmt.Sprintf("%s_%s_%s", wsService.GROUP_KPI, neInfo.NeType, neInfo.NeId), kpiEvent)
|
||||
wsService.NewWSSend.ByGroupID(fmt.Sprintf("%s_%s_%s", wsService.GROUP_KPI, neInfo.CoreUID, neInfo.NeUID), kpiEvent)
|
||||
if neInfo.NeType == "UPF" {
|
||||
// 更新UPF总流量
|
||||
upValue := parse.Number(kpiEvent["UPF.03"])
|
||||
downValue := parse.Number(kpiEvent["UPF.06"])
|
||||
neDataService.NewKpiReport.UPFTodayFlowUpdate(neInfo.RmUID, upValue, downValue)
|
||||
neDataService.NewKpiReport.UPFTodayFlowUpdate(neInfo.NeUID, upValue, downValue)
|
||||
}
|
||||
}
|
||||
}
|
||||
@@ -248,8 +247,8 @@ func saveKPIDataC(kpiReport KpiReport, index int64) int64 {
|
||||
KpiValuesByte, _ := json.Marshal(KpiValues)
|
||||
kpiData := neDataModel.KpiCReport{
|
||||
NeType: taskNe.NeType,
|
||||
NeName: taskNe.NEName,
|
||||
RmUid: taskNe.RmUID,
|
||||
CoreUID: taskNe.NEName,
|
||||
NeUID: taskNe.RmUID,
|
||||
Date: date.ParseDateToStr(receiverTime, "2006-01-02"),
|
||||
StartTime: date.ParseDateToStr(startTime, "15:04:05"),
|
||||
EndTime: date.ParseDateToStr(endTime, "15:04:05"),
|
||||
@@ -263,8 +262,8 @@ func saveKPIDataC(kpiReport KpiReport, index int64) int64 {
|
||||
// 指标事件对象
|
||||
kpiEvent := map[string]any{
|
||||
"neType": kpiData.NeType,
|
||||
"neName": kpiData.NeName,
|
||||
"rmUID": kpiData.RmUid,
|
||||
"neName": kpiData.NeUID,
|
||||
"rmUID": kpiData.NeUID,
|
||||
"startIndex": kpiData.Index,
|
||||
"timeGroup": kpiData.CreatedAt,
|
||||
// kip_id ...
|
||||
@@ -274,10 +273,10 @@ func saveKPIDataC(kpiReport KpiReport, index int64) int64 {
|
||||
}
|
||||
|
||||
// 发送到匹配的网元
|
||||
neInfo := neService.NewNeInfo.FindByRmuid(kpiData.RmUid)
|
||||
if neInfo.RmUID == kpiData.RmUid {
|
||||
neInfo := neService.NewNeInfo.FindByCoreUidAndNeUid("*", kpiData.NeUID)
|
||||
if neInfo.NeUID == kpiData.NeUID {
|
||||
// 推送自定义KPI到ws订阅组
|
||||
wsService.NewWSSend.ByGroupID(fmt.Sprintf("%s_%s_%s", wsService.GROUP_KPI_C, neInfo.NeType, neInfo.NeId), kpiEvent)
|
||||
wsService.NewWSSend.ByGroupID(fmt.Sprintf("%s_%s_%s", wsService.GROUP_KPI_C, neInfo.CoreUID, neInfo.NeUID), kpiEvent)
|
||||
}
|
||||
}
|
||||
return insertId
|
||||
@@ -379,12 +378,12 @@ func PostKPIReportFromNFOld(w http.ResponseWriter, r *http.Request) {
|
||||
}
|
||||
|
||||
// 发送到匹配的网元
|
||||
neInfo := neService.NewNeInfo.FindByRmuid(kpiData.RmUid)
|
||||
neInfo := neService.NewNeInfo.FindByCoreUidAndNeUid("*", kpiData.RmUid)
|
||||
// custom kpi report to FE
|
||||
kpiCEvent := map[string]any{
|
||||
// kip_id ...
|
||||
"neType": kpiData.NEType,
|
||||
"neId": neInfo.NeId,
|
||||
"neId": neInfo.NeUID,
|
||||
"neName": kpiData.NEName,
|
||||
"rmUID": kpiData.RmUid,
|
||||
"startIndex": kpiData.Index,
|
||||
@@ -413,11 +412,11 @@ func PostKPIReportFromNFOld(w http.ResponseWriter, r *http.Request) {
|
||||
// KPI自定义指标入库
|
||||
kpi_c_report.InsertKpiCReport(kpiData.NEType, report)
|
||||
|
||||
if neInfo.RmUID == kpiData.RmUid {
|
||||
if neInfo.NeUID == kpiData.RmUid {
|
||||
// 推送到ws订阅组
|
||||
wsService.NewWSSend.ByGroupID(fmt.Sprintf("%s_%s_%s", wsService.GROUP_KPI, neInfo.NeType, neInfo.NeId), kpiEvent)
|
||||
wsService.NewWSSend.ByGroupID(fmt.Sprintf("%s_%s_%s", wsService.GROUP_KPI, neInfo.CoreUID, neInfo.NeUID), kpiEvent)
|
||||
// 推送自定义KPI到ws订阅组
|
||||
wsService.NewWSSend.ByGroupID(fmt.Sprintf("%s_%s_%s", wsService.GROUP_KPI_C, neInfo.NeType, neInfo.NeId), kpiCEvent)
|
||||
wsService.NewWSSend.ByGroupID(fmt.Sprintf("%s_%s_%s", wsService.GROUP_KPI_C, neInfo.CoreUID, neInfo.NeUID), kpiCEvent)
|
||||
}
|
||||
|
||||
services.ResponseStatusOK204NoContent(w)
|
||||
|
||||
Reference in New Issue
Block a user