From 1cc53a734ffc7f6d6e671cbaf74f6ce22b65e767 Mon Sep 17 00:00:00 2001
From: TsMask <340112800@qq.com>
Date: Fri, 17 Jan 2025 15:25:20 +0800
Subject: [PATCH 1/3] =?UTF-8?q?feat:=20SMF-CDR=E6=B7=BB=E5=8A=A0DNN?=
 =?UTF-8?q?=E6=90=9C=E7=B4=A2=E6=9D=A1=E4=BB=B6?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/modules/network_data/model/cdr_event_smf.go      | 1 +
 src/modules/network_data/repository/cdr_event_smf.go | 3 +++
 2 files changed, 4 insertions(+)

diff --git a/src/modules/network_data/model/cdr_event_smf.go b/src/modules/network_data/model/cdr_event_smf.go
index 69e6a067..3053d53b 100644
--- a/src/modules/network_data/model/cdr_event_smf.go
+++ b/src/modules/network_data/model/cdr_event_smf.go
@@ -27,6 +27,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"`
 	SortField    string `json:"sortField" form:"sortField" binding:"omitempty,oneof=timestamp"` // 排序字段，填写结果字段
diff --git a/src/modules/network_data/repository/cdr_event_smf.go b/src/modules/network_data/repository/cdr_event_smf.go
index 57341f43..5b46e5ff 100644
--- a/src/modules/network_data/repository/cdr_event_smf.go
+++ b/src/modules/network_data/repository/cdr_event_smf.go
@@ -42,6 +42,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

From 1e99bb4be83dbfeb35ba4839232e2761b0fe5f32 Mon Sep 17 00:00:00 2001
From: TsMask <340112800@qq.com>
Date: Fri, 17 Jan 2025 15:26:16 +0800
Subject: [PATCH 2/3] =?UTF-8?q?fix:=20=E8=87=AA=E5=AE=9A=E4=B9=89=E6=8C=87?=
 =?UTF-8?q?=E6=A0=87=E6=95=B0=E6=8D=AE=E6=9F=A5=E8=AF=A2=E5=80=BCfloat64?=
 =?UTF-8?q?=E4=BF=9D=E7=95=993=E4=B8=BA=E5=B0=8F=E6=95=B0?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 features/pm/kpi_c_report/controller.go | 8 +++++++-
 1 file changed, 7 insertions(+), 1 deletion(-)

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)
 	}

From cd88eaea61f1a7712fc03e86688e9af9273c5a45 Mon Sep 17 00:00:00 2001
From: TsMask <340112800@qq.com>
Date: Fri, 17 Jan 2025 15:50:36 +0800
Subject: [PATCH 3/3] =?UTF-8?q?fix:=20=E6=9A=B4=E9=9C=B2=E5=8F=82=E6=95=B0?=
 =?UTF-8?q?cryptoApi=E7=94=A8=E6=88=B7=E6=8E=A5=E5=8F=A3=E5=8A=A0=E5=AF=86?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/modules/common/service/commont.go | 2 ++
 1 file changed, 2 insertions(+)

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类型