diff --git a/features/pm/kpi_c_report/controller.go b/features/pm/kpi_c_report/controller.go index 03f6ae22..e1772f0e 100644 --- a/features/pm/kpi_c_report/controller.go +++ b/features/pm/kpi_c_report/controller.go @@ -3,6 +3,7 @@ package kpi_c_report import ( "fmt" "net/http" + "strconv" "strings" "be.ems/lib/dborm" @@ -157,7 +158,12 @@ func (k *KpiCReport) GetReport2FE(c *gin.Context) { } for _, k := range r.KpiValues { - report[k.KPIID] = k.Value + formatted := fmt.Sprintf("%.3f", k.Value) + formattedFloat, err := strconv.ParseFloat(formatted, 64) + if err != nil { + formattedFloat = 0 + } + report[k.KPIID] = formattedFloat } reports = append(reports, report) } diff --git a/src/modules/common/service/commont.go b/src/modules/common/service/commont.go index 23789077..c38ec17f 100644 --- a/src/modules/common/service/commont.go +++ b/src/modules/common/service/commont.go @@ -43,6 +43,8 @@ func (s *Commont) SystemConfigInfo() map[string]string { } // 用户登录认证 infoMap["loginAuth"] = fmt.Sprint(config.Get("user.loginAuth")) + // 用户接口加密 + infoMap["cryptoApi"] = fmt.Sprint(config.Get("user.cryptoApi")) // 序列号 infoMap["serialNum"] = fmt.Sprint(config.Get("omc.sn")) // 获取LOGO类型 diff --git a/src/modules/network_data/model/cdr_event_smf.go b/src/modules/network_data/model/cdr_event_smf.go index b972f949..2fe8e76c 100644 --- a/src/modules/network_data/model/cdr_event_smf.go +++ b/src/modules/network_data/model/cdr_event_smf.go @@ -26,6 +26,7 @@ type CDREventSMFQuery struct { RmUID string `json:"rmUID" form:"rmUID"` RecordType string `json:"recordType" form:"recordType"` // 暂时没用到 SubscriberID string `json:"subscriberID" form:"subscriberID"` + DNN string `json:"dnn" form:"dnn"` StartTime string `json:"startTime" form:"startTime"` EndTime string `json:"endTime" form:"endTime"` TenantName string `json:"tenantName" form:"tenantName"` diff --git a/src/modules/network_data/repository/cdr_event_smf.go b/src/modules/network_data/repository/cdr_event_smf.go index 56cc52e0..a4b04ed0 100644 --- a/src/modules/network_data/repository/cdr_event_smf.go +++ b/src/modules/network_data/repository/cdr_event_smf.go @@ -206,6 +206,9 @@ func (r CDREventSMF) SelectByPage(querys model.CDREventSMFQuery) ([]model.CDREve if querys.SubscriberID != "" { tx = tx.Where("JSON_EXTRACT(cdr_json, '$.subscriberIdentifier.subscriptionIDData') = ?", querys.SubscriberID) } + if querys.DNN != "" { + tx = tx.Where("JSON_EXTRACT(cdr_json, '$.pDUSessionChargingInformation.dNNID') = ?", querys.DNN) + } // 查询结果 var total int64 = 0