Merge remote-tracking branch 'origin/main' into multi-tenant

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

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"`

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