From 20e6e855c3b9e425f015362142da287dfff071c2 Mon Sep 17 00:00:00 2001 From: TsMask <340112800@qq.com> Date: Wed, 19 Mar 2025 16:18:44 +0800 Subject: [PATCH] =?UTF-8?q?fix:=20UPF=E6=B5=81=E9=87=8F=E7=B4=AF=E8=AE=A1?= =?UTF-8?q?=E6=97=A0=E6=95=88=E9=97=AE=E9=A2=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- features/pm/performance.go | 6 ++++++ src/framework/redis/redis.go | 4 ++++ src/modules/network_data/service/all_perf_kpi.go | 1 + 3 files changed, 11 insertions(+) diff --git a/features/pm/performance.go b/features/pm/performance.go index b5efe1e2..1dde1d2b 100644 --- a/features/pm/performance.go +++ b/features/pm/performance.go @@ -19,6 +19,8 @@ import ( "be.ems/lib/log" "be.ems/lib/services" + "be.ems/src/framework/utils/parse" + neDataService "be.ems/src/modules/network_data/service" neService "be.ems/src/modules/network_element/service" wsService "be.ems/src/modules/ws/service" "github.com/go-resty/resty/v2" @@ -337,6 +339,10 @@ func PostKPIReportFromNF(w http.ResponseWriter, r *http.Request) { 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) + // 更新UPF总流量 + upValue := parse.Number(kpiEvent["UPF.03"]) + downValue := parse.Number(kpiEvent["UPF.06"]) + neDataService.NewPerfKPI.UPFTodayFlowUpdate(neInfo.RmUID, upValue, downValue, false) } } diff --git a/src/framework/redis/redis.go b/src/framework/redis/redis.go index 2a9e25b3..2438ec4d 100644 --- a/src/framework/redis/redis.go +++ b/src/framework/redis/redis.go @@ -71,6 +71,10 @@ func DefaultRDB() *redis.Client { // 获取实例 func RDB(source string) *redis.Client { + // 不指定时获取默认实例 + if source == "" { + source = config.Get("redis.defaultDataSourceName").(string) + } return rdbMap[source] } diff --git a/src/modules/network_data/service/all_perf_kpi.go b/src/modules/network_data/service/all_perf_kpi.go index 74b58b95..f03e4bdf 100644 --- a/src/modules/network_data/service/all_perf_kpi.go +++ b/src/modules/network_data/service/all_perf_kpi.go @@ -92,6 +92,7 @@ func (r PerfKPI) UPFTodayFlowUpdate(rmUID string, upValue, downValue int64, rest if err != nil { return err } + return nil } // 使用HIncrBy实时累加统计值