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

src/modules/network_data/repository/cdr_event.go

@@ -1,27 +0,0 @@
-package repository
-
-import "be.ems/src/modules/network_data/model"
-
-// CDR会话事件 数据层接口
-type ICDREvent interface {
-	// SelectPage 根据条件分页查询
-	SelectPage(querys model.CDREventQuery) map[string]any
-
-	// SelectByIds 通过ID查询
-	SelectByIds(cdrIds []string) []model.CDREvent
-
-	// DeleteByIds 批量删除信息
-	DeleteByIds(cdrIds []string) int64
-}
-
-// SMF CDR Event
-type SMFCDREvent interface {
-	// SelectPage 根据条件分页查询
-	SelectPage(querys model.SMFCDREventQuery) map[string]any
-
-	// SelectByIds 通过ID查询
-	SelectByIds(cdrIds []string) []model.CDREventSMF
-
-	// DeleteByIds 批量删除信息
-	DeleteByIds(cdrIds []string) int64
-}

src/modules/network_data/repository/cdr_event.impl.go

@@ -1,344 +0,0 @@
-package repository
-
-import (
-	"fmt"
-	"strings"
-
-	"be.ems/src/framework/datasource"
-	"be.ems/src/framework/logger"
-	"be.ems/src/framework/utils/date"
-	"be.ems/src/framework/utils/parse"
-	"be.ems/src/framework/utils/repo"
-	"be.ems/src/modules/network_data/model"
-)
-
-// 实例化数据层 CDREventImpl 结构体
-var NewCDREventImpl = &CDREventImpl{
-	selectSql: `select id, ne_type, ne_name, rm_uid, timestamp, cdr_json, created_at from cdr_event_ims`,
-
-	resultMap: map[string]string{
-		"id":         "ID",
-		"ne_type":    "NeType",
-		"ne_name":    "NeName",
-		"rm_uid":     "RmUID",
-		"timestamp":  "Timestamp",
-		"cdr_json":   "CDRJSONStr",
-		"created_at": "CreatedAt",
-	},
-}
-
-// CDREventImpl CDR会话事件 数据层处理
-type CDREventImpl struct {
-	// 查询视图对象SQL
-	selectSql string
-	// 结果字段与实体映射
-	resultMap map[string]string
-}
-
-// Instance of SMF CDREventImpl
-var NewSMFCDREventImpl = &SMFCDREventImpl{
-	selectSql: `select id, ne_type, ne_name, rm_uid, timestamp, JSON_EXTRACT(cdr_json, '$.recordType') AS record_type, JSON_EXTRACT(cdr_json, '$.chargingID') AS charging_id, JSON_EXTRACT(cdr_json, '$.subscriberIdentifier.subscriptionIDData') AS subscriber_id, JSON_EXTRACT(cdr_json, '$.duration') AS duration, JSON_EXTRACT(cdr_json, '$.listOfMultipleUnitUsage[*].usedUnitContainer[*].dataVolumeUplink') AS data_volume_uplink, JSON_EXTRACT(cdr_json, '$.listOfMultipleUnitUsage[*].usedUnitContainer[*].dataVolumeDownlink') AS data_volume_downlink, JSON_EXTRACT(cdr_json, '$.listOfMultipleUnitUsage[*].usedUnitContainer[*].dataTotalVolume') AS data_total_volume, JSON_EXTRACT(cdr_json, '$.pDUSessionChargingInformation.pDUAddress') AS pdu_address, created_at from cdr_event_smf`,
-
-	resultMap: map[string]string{
-		"id":                   "ID",
-		"ne_type":              "NeType",
-		"ne_name":              "NeName",
-		"rm_uid":               "RmUID",
-		"timestamp":            "Timestamp",
-		"record_type":          "RecordType",
-		"charging_id":          "ChargingID",
-		"subscriber_id":        "SubscriberID",
-		"duration":             "Duration",
-		"data_volume_uplink":   "DataVolumeUplink",
-		"data_volume_downlink": "DataVolumeDownlink",
-		"data_total_volume":    "DataTotalVolume",
-		"pdu_address":          "PDUAddress",
-		"created_at":           "CreatedAt",
-	},
-}
-
-// CDREventImpl CDR会话事件 数据层处理
-type SMFCDREventImpl struct {
-	// 查询视图对象SQL
-	selectSql string
-	// 结果字段与实体映射
-	resultMap map[string]string
-}
-
-// convertResultRows 将结果记录转实体结果组
-func (r *CDREventImpl) convertResultRows(rows []map[string]any) []model.CDREvent {
-	arr := make([]model.CDREvent, 0)
-	for _, row := range rows {
-		item := model.CDREvent{}
-		for key, value := range row {
-			if keyMapper, ok := r.resultMap[key]; ok {
-				repo.SetFieldValue(&item, keyMapper, value)
-			}
-		}
-		arr = append(arr, item)
-	}
-	return arr
-}
-
-// SelectPage 根据条件分页查询
-func (r *CDREventImpl) SelectPage(querys model.CDREventQuery) map[string]any {
-	// 查询条件拼接
-	var conditions []string
-	var params []any
-	if querys.NeType != "" {
-		conditions = append(conditions, "ne_type = ?")
-		params = append(params, querys.NeType)
-	}
-	if querys.RmUID != "" {
-		conditions = append(conditions, "rm_uid = ?")
-		params = append(params, querys.RmUID)
-	}
-	if querys.StartTime != "" {
-		conditions = append(conditions, "timestamp >= ?")
-		beginDate := date.ParseStrToDate(querys.StartTime, date.YYYY_MM_DD_HH_MM_SS)
-		params = append(params, beginDate.Unix())
-	}
-	if querys.EndTime != "" {
-		conditions = append(conditions, "timestamp <= ?")
-		endDate := date.ParseStrToDate(querys.EndTime, date.YYYY_MM_DD_HH_MM_SS)
-		params = append(params, endDate.Unix())
-	}
-	if querys.CallerParty != "" {
-		conditions = append(conditions, "JSON_EXTRACT(cdr_json, '$.callerParty') = ?")
-		params = append(params, querys.CallerParty)
-	}
-	if querys.CalledParty != "" {
-		conditions = append(conditions, "JSON_EXTRACT(cdr_json, '$.calledParty') = ?")
-		params = append(params, querys.CalledParty)
-	}
-	if querys.RecordType != "" {
-		recordTypes := strings.Split(querys.RecordType, ",")
-		placeholder := repo.KeyPlaceholderByQuery(len(recordTypes))
-		conditions = append(conditions, fmt.Sprintf("JSON_EXTRACT(cdr_json, '$.recordType') in (%s)", placeholder))
-		for _, recordType := range recordTypes {
-			params = append(params, recordType)
-		}
-	}
-
-	// 构建查询条件语句
-	whereSql := ""
-	if len(conditions) > 0 {
-		whereSql += " where " + strings.Join(conditions, " and ")
-	}
-
-	result := map[string]any{
-		"total": 0,
-		"rows":  []model.CDREvent{},
-	}
-
-	// 查询数量 长度为0直接返回
-	totalSql := "select count(1) as 'total' from cdr_event_ims"
-	totalRows, err := datasource.RawDB("", totalSql+whereSql, params)
-	if err != nil {
-		logger.Errorf("total err => %v", err)
-		return result
-	}
-	total := parse.Number(totalRows[0]["total"])
-	if total == 0 {
-		return result
-	} else {
-		result["total"] = total
-	}
-
-	// 分页
-	pageNum, pageSize := repo.PageNumSize(querys.PageNum, querys.PageSize)
-	pageSql := " limit ?,? "
-	params = append(params, pageNum*pageSize)
-	params = append(params, pageSize)
-
-	// 排序
-	orderSql := ""
-	if querys.SortField != "" {
-		sortSql := querys.SortField
-		if querys.SortOrder != "" {
-			if querys.SortOrder == "desc" {
-				sortSql += " desc "
-			} else {
-				sortSql += " asc "
-			}
-		}
-		orderSql = fmt.Sprintf(" order by id desc, %s ", sortSql)
-	}
-
-	// 查询数据
-	querySql := r.selectSql + whereSql + orderSql + pageSql
-	results, err := datasource.RawDB("", querySql, params)
-	if err != nil {
-		logger.Errorf("query err => %v", err)
-	}
-
-	// 转换实体
-	result["rows"] = r.convertResultRows(results)
-	return result
-}
-
-// SelectByIds 通过ID查询
-func (r *CDREventImpl) SelectByIds(cdrIds []string) []model.CDREvent {
-	placeholder := repo.KeyPlaceholderByQuery(len(cdrIds))
-	querySql := r.selectSql + " where id in (" + placeholder + ")"
-	parameters := repo.ConvertIdsSlice(cdrIds)
-	results, err := datasource.RawDB("", querySql, parameters)
-	if err != nil {
-		logger.Errorf("query err => %v", err)
-		return []model.CDREvent{}
-	}
-	// 转换实体
-	return r.convertResultRows(results)
-}
-
-// DeleteByIds 批量删除信息
-func (r *CDREventImpl) DeleteByIds(cdrIds []string) int64 {
-	placeholder := repo.KeyPlaceholderByQuery(len(cdrIds))
-	sql := "delete from cdr_event_ims where id in (" + placeholder + ")"
-	parameters := repo.ConvertIdsSlice(cdrIds)
-	results, err := datasource.ExecDB("", sql, parameters)
-	if err != nil {
-		logger.Errorf("delete err => %v", err)
-		return 0
-	}
-	return results
-}
-
-// convertResultRows 将结果记录转实体结果组
-func (r *SMFCDREventImpl) convertResultRows(rows []map[string]any) []model.CDREventSMF {
-	arr := make([]model.CDREventSMF, 0)
-	for _, row := range rows {
-		item := model.CDREventSMF{}
-		for key, value := range row {
-			if keyMapper, ok := r.resultMap[key]; ok {
-				repo.SetFieldValue(&item, keyMapper, value)
-			}
-		}
-		arr = append(arr, item)
-	}
-	return arr
-}
-
-// SelectPage 根据条件分页查询
-func (r *SMFCDREventImpl) SelectPage(querys model.SMFCDREventQuery) map[string]any {
-	// 查询条件拼接
-	var conditions []string
-	var params []any
-	if querys.NeType != "" {
-		conditions = append(conditions, "ne_type = ?")
-		params = append(params, querys.NeType)
-	}
-	if querys.RmUID != "" {
-		conditions = append(conditions, "rm_uid = ?")
-		params = append(params, querys.RmUID)
-	}
-	if querys.StartTime != "" {
-		conditions = append(conditions, "timestamp >= ?")
-		beginDate := date.ParseStrToDate(querys.StartTime, date.YYYY_MM_DD_HH_MM_SS)
-		params = append(params, beginDate.Unix())
-	}
-	if querys.EndTime != "" {
-		conditions = append(conditions, "timestamp <= ?")
-		endDate := date.ParseStrToDate(querys.EndTime, date.YYYY_MM_DD_HH_MM_SS)
-		params = append(params, endDate.Unix())
-	}
-	if querys.RecordType != "" {
-		conditions = append(conditions, "JSON_EXTRACT(cdr_json, '$.recordType') = ?")
-		params = append(params, querys.RecordType)
-	}
-	if querys.SubscriberID != "" {
-		conditions = append(conditions, "JSON_EXTRACT(cdr_json, '$.subscriberIdentifier.subscriptionIDData') = ?")
-		params = append(params, querys.SubscriberID)
-	}
-	// if querys.RecordType != "" {
-	// 	recordTypes := strings.Split(querys.RecordType, ",")
-	// 	placeholder := repo.KeyPlaceholderByQuery(len(recordTypes))
-	// 	conditions = append(conditions, fmt.Sprintf("JSON_EXTRACT(cdr_json, '$.recordType') in (%s)", placeholder))
-	// 	for _, recordType := range recordTypes {
-	// 		params = append(params, recordType)
-	// 	}
-	// }
-
-	// 构建查询条件语句
-	whereSql := ""
-	if len(conditions) > 0 {
-		whereSql += " where " + strings.Join(conditions, " and ")
-	}
-
-	result := map[string]any{
-		"total": 0,
-		"rows":  []model.CDREventSMF{},
-	}
-
-	// 查询数量 长度为0直接返回
-	totalSql := "select count(1) as 'total' from cdr_event_smf"
-	totalRows, err := datasource.RawDB("", totalSql+whereSql, params)
-	if err != nil {
-		logger.Errorf("total err => %v", err)
-		return result
-	}
-	total := parse.Number(totalRows[0]["total"])
-	if total == 0 {
-		return result
-	} else {
-		result["total"] = total
-	}
-
-	// 分页
-	pageNum, pageSize := repo.PageNumSize(querys.PageNum, querys.PageSize)
-	pageSql := " limit ?,? "
-	params = append(params, pageNum*pageSize)
-	params = append(params, pageSize)
-
-	// 排序
-	orderSql := ""
-	if querys.SortField != "" {
-		sortSql := querys.SortField
-		if querys.SortOrder != "" {
-			if querys.SortOrder == "desc" {
-				sortSql += " desc "
-			} else {
-				sortSql += " asc "
-			}
-		}
-		orderSql = fmt.Sprintf(" order by id desc, %s ", sortSql)
-	}
-
-	// 查询数据
-	querySql := r.selectSql + whereSql + orderSql + pageSql
-	results, err := datasource.RawDB("", querySql, params)
-	if err != nil {
-		logger.Errorf("query err => %v", err)
-	}
-
-	// 转换实体
-	result["rows"] = r.convertResultRows(results)
-	return result
-}
-
-// SelectByIds 通过ID查询
-func (r *SMFCDREventImpl) SelectByIds(cdrIds []string) []model.CDREventSMF {
-	placeholder := repo.KeyPlaceholderByQuery(len(cdrIds))
-	querySql := r.selectSql + " where id in (" + placeholder + ")"
-	parameters := repo.ConvertIdsSlice(cdrIds)
-	results, err := datasource.RawDB("", querySql, parameters)
-	if err != nil {
-		logger.Errorf("query err => %v", err)
-		return []model.CDREventSMF{}
-	}
-	// 转换实体
-	return r.convertResultRows(results)
-}
-
-// DeleteByIds 批量删除信息
-func (r *SMFCDREventImpl) DeleteByIds(cdrIds []string) int64 {
-	placeholder := repo.KeyPlaceholderByQuery(len(cdrIds))
-	sql := "delete from cdr_event_smf where id in (" + placeholder + ")"
-	parameters := repo.ConvertIdsSlice(cdrIds)
-	results, err := datasource.ExecDB("", sql, parameters)
-	if err != nil {
-		logger.Errorf("delete err => %v", err)
-		return 0
-	}
-	return results
-}

src/modules/network_data/repository/cdr_event_ims.go

@@ -0,0 +1,15 @@
+package repository
+
+import "be.ems/src/modules/network_data/model"
+
+// CDR会话事件IMS 数据层接口
+type ICDREventIMS interface {
+	// SelectPage 根据条件分页查询
+	SelectPage(querys model.CDREventIMSQuery) map[string]any
+
+	// SelectByIds 通过ID查询
+	SelectByIds(cdrIds []string) []model.CDREventIMS
+
+	// DeleteByIds 批量删除信息
+	DeleteByIds(cdrIds []string) int64
+}

src/modules/network_data/repository/cdr_event_ims.impl.go

@@ -0,0 +1,178 @@
+package repository
+
+import (
+	"fmt"
+	"strings"
+
+	"be.ems/src/framework/datasource"
+	"be.ems/src/framework/logger"
+	"be.ems/src/framework/utils/parse"
+	"be.ems/src/framework/utils/repo"
+	"be.ems/src/modules/network_data/model"
+)
+
+// 实例化数据层 CDREventImpl 结构体
+var NewCDREventIMSImpl = &CDREventIMSImpl{
+	selectSql: `select id, ne_type, ne_name, rm_uid, timestamp, cdr_json, created_at from cdr_event_ims`,
+
+	resultMap: map[string]string{
+		"id":         "ID",
+		"ne_type":    "NeType",
+		"ne_name":    "NeName",
+		"rm_uid":     "RmUID",
+		"timestamp":  "Timestamp",
+		"cdr_json":   "CDRJSONStr",
+		"created_at": "CreatedAt",
+	},
+}
+
+// CDREventIMSImpl CDR会话事件IMS 数据层处理
+type CDREventIMSImpl struct {
+	// 查询视图对象SQL
+	selectSql string
+	// 结果字段与实体映射
+	resultMap map[string]string
+}
+
+// convertResultRows 将结果记录转实体结果组
+func (r *CDREventIMSImpl) convertResultRows(rows []map[string]any) []model.CDREventIMS {
+	arr := make([]model.CDREventIMS, 0)
+	for _, row := range rows {
+		item := model.CDREventIMS{}
+		for key, value := range row {
+			if keyMapper, ok := r.resultMap[key]; ok {
+				repo.SetFieldValue(&item, keyMapper, value)
+			}
+		}
+		arr = append(arr, item)
+	}
+	return arr
+}
+
+// SelectPage 根据条件分页查询
+func (r *CDREventIMSImpl) SelectPage(querys model.CDREventIMSQuery) map[string]any {
+	// 查询条件拼接
+	var conditions []string
+	var params []any
+	if querys.NeType != "" {
+		conditions = append(conditions, "ne_type = ?")
+		params = append(params, querys.NeType)
+	}
+	if querys.RmUID != "" {
+		conditions = append(conditions, "rm_uid = ?")
+		params = append(params, querys.RmUID)
+	}
+	if querys.StartTime != "" {
+		conditions = append(conditions, "timestamp >= ?")
+		if len(querys.StartTime) == 13 {
+			querys.StartTime = querys.StartTime[:10]
+		}
+		params = append(params, querys.StartTime)
+	}
+	if querys.EndTime != "" {
+		conditions = append(conditions, "timestamp <= ?")
+		if len(querys.EndTime) == 13 {
+			querys.EndTime = querys.EndTime[:10]
+		}
+		params = append(params, querys.EndTime)
+	}
+	if querys.CallerParty != "" {
+		conditions = append(conditions, "JSON_EXTRACT(cdr_json, '$.callerParty') = ?")
+		params = append(params, querys.CallerParty)
+	}
+	if querys.CalledParty != "" {
+		conditions = append(conditions, "JSON_EXTRACT(cdr_json, '$.calledParty') = ?")
+		params = append(params, querys.CalledParty)
+	}
+	if querys.RecordType != "" {
+		recordTypes := strings.Split(querys.RecordType, ",")
+		placeholder := repo.KeyPlaceholderByQuery(len(recordTypes))
+		conditions = append(conditions, fmt.Sprintf("JSON_EXTRACT(cdr_json, '$.recordType') in (%s)", placeholder))
+		for _, recordType := range recordTypes {
+			params = append(params, recordType)
+		}
+	}
+
+	// 构建查询条件语句
+	whereSql := ""
+	if len(conditions) > 0 {
+		whereSql += " where " + strings.Join(conditions, " and ")
+	}
+
+	result := map[string]any{
+		"total": 0,
+		"rows":  []model.CDREventIMS{},
+	}
+
+	// 查询数量 长度为0直接返回
+	totalSql := "select count(1) as 'total' from cdr_event_ims"
+	totalRows, err := datasource.RawDB("", totalSql+whereSql, params)
+	if err != nil {
+		logger.Errorf("total err => %v", err)
+		return result
+	}
+	total := parse.Number(totalRows[0]["total"])
+	if total == 0 {
+		return result
+	} else {
+		result["total"] = total
+	}
+
+	// 分页
+	pageNum, pageSize := repo.PageNumSize(querys.PageNum, querys.PageSize)
+	pageSql := " limit ?,? "
+	params = append(params, pageNum*pageSize)
+	params = append(params, pageSize)
+
+	// 排序
+	orderSql := ""
+	if querys.SortField != "" {
+		sortSql := querys.SortField
+		if querys.SortOrder != "" {
+			if querys.SortOrder == "desc" {
+				sortSql += " desc "
+			} else {
+				sortSql += " asc "
+			}
+		}
+		orderSql = fmt.Sprintf(" order by id desc, %s ", sortSql)
+	}
+
+	// 查询数据
+	querySql := r.selectSql + whereSql + orderSql + pageSql
+	results, err := datasource.RawDB("", querySql, params)
+	if err != nil {
+		logger.Errorf("query err => %v", err)
+	}
+
+	// 转换实体
+	result["rows"] = r.convertResultRows(results)
+	return result
+}
+
+// SelectByIds 通过ID查询
+func (r *CDREventIMSImpl) SelectByIds(cdrIds []string) []model.CDREventIMS {
+	placeholder := repo.KeyPlaceholderByQuery(len(cdrIds))
+	querySql := r.selectSql + " where id in (" + placeholder + ")"
+	parameters := repo.ConvertIdsSlice(cdrIds)
+	results, err := datasource.RawDB("", querySql, parameters)
+	if err != nil {
+		logger.Errorf("query err => %v", err)
+		return []model.CDREventIMS{}
+	}
+	// 转换实体
+	return r.convertResultRows(results)
+}
+
+// DeleteByIds 批量删除信息
+func (r *CDREventIMSImpl) DeleteByIds(cdrIds []string) int64 {
+	placeholder := repo.KeyPlaceholderByQuery(len(cdrIds))
+	sql := "delete from cdr_event_ims where id in (" + placeholder + ")"
+	parameters := repo.ConvertIdsSlice(cdrIds)
+	results, err := datasource.ExecDB("", sql, parameters)
+	if err != nil {
+		logger.Errorf("delete err => %v", err)
+		return 0
+	}
+	return results
+}

src/modules/network_data/repository/cdr_event_smf.go

@@ -0,0 +1,15 @@
+package repository
+
+import "be.ems/src/modules/network_data/model"
+
+// CDR会话事件SMF 数据层接口
+type ICDREventSMF interface {
+	// SelectPage 根据条件分页查询
+	SelectPage(querys model.CDREventSMFQuery) map[string]any
+
+	// SelectByIds 通过ID查询
+	SelectByIds(cdrIds []string) []model.CDREventSMF
+
+	// DeleteByIds 批量删除信息
+	DeleteByIds(cdrIds []string) int64
+}

src/modules/network_data/repository/cdr_event_smf.impl.go

@@ -0,0 +1,185 @@
+package repository
+
+import (
+	"fmt"
+	"strings"
+
+	"be.ems/src/framework/datasource"
+	"be.ems/src/framework/logger"
+	"be.ems/src/framework/utils/parse"
+	"be.ems/src/framework/utils/repo"
+	"be.ems/src/modules/network_data/model"
+)
+
+// 实例化数据层 CDREventSMFImpl 结构体
+var NewCDREventSMFImpl = &CDREventSMFImpl{
+	selectSql: `select id, ne_type, ne_name, rm_uid, timestamp, cdr_json, created_at from cdr_event_smf`,
+	// selectSql: `select id, ne_type, ne_name, rm_uid, timestamp, JSON_EXTRACT(cdr_json, '$.recordType') AS record_type, JSON_EXTRACT(cdr_json, '$.chargingID') AS charging_id, JSON_EXTRACT(cdr_json, '$.subscriberIdentifier.subscriptionIDData') AS subscriber_id, JSON_EXTRACT(cdr_json, '$.duration') AS duration, JSON_EXTRACT(cdr_json, '$.listOfMultipleUnitUsage[*].usedUnitContainer[*].dataVolumeUplink') AS data_volume_uplink, JSON_EXTRACT(cdr_json, '$.listOfMultipleUnitUsage[*].usedUnitContainer[*].dataVolumeDownlink') AS data_volume_downlink, JSON_EXTRACT(cdr_json, '$.listOfMultipleUnitUsage[*].usedUnitContainer[*].dataTotalVolume') AS data_total_volume, JSON_EXTRACT(cdr_json, '$.pDUSessionChargingInformation.pDUAddress') AS pdu_address, created_at from cdr_event_smf`,
+
+	resultMap: map[string]string{
+		"id":         "ID",
+		"ne_type":    "NeType",
+		"ne_name":    "NeName",
+		"rm_uid":     "RmUID",
+		"timestamp":  "Timestamp",
+		"cdr_json":   "CDRJSONStr",
+		"created_at": "CreatedAt",
+		// "id":                   "ID",
+		// "ne_type":              "NeType",
+		// "ne_name":              "NeName",
+		// "rm_uid":               "RmUID",
+		// "timestamp":            "Timestamp",
+		// "record_type":          "RecordType",
+		// "charging_id":          "ChargingID",
+		// "subscriber_id":        "SubscriberID",
+		// "duration":             "Duration",
+		// "data_volume_uplink":   "DataVolumeUplink",
+		// "data_volume_downlink": "DataVolumeDownlink",
+		// "data_total_volume":    "DataTotalVolume",
+		// "pdu_address":          "PDUAddress",
+		// "created_at":           "CreatedAt",
+	},
+}
+
+// CDREventSMFImpl CDR会话事件 数据层处理
+type CDREventSMFImpl struct {
+	// 查询视图对象SQL
+	selectSql string
+	// 结果字段与实体映射
+	resultMap map[string]string
+}
+
+// convertResultRows 将结果记录转实体结果组
+func (r *CDREventSMFImpl) convertResultRows(rows []map[string]any) []model.CDREventSMF {
+	arr := make([]model.CDREventSMF, 0)
+	for _, row := range rows {
+		item := model.CDREventSMF{}
+		for key, value := range row {
+			if keyMapper, ok := r.resultMap[key]; ok {
+				repo.SetFieldValue(&item, keyMapper, value)
+			}
+		}
+		arr = append(arr, item)
+	}
+	return arr
+}
+
+// SelectPage 根据条件分页查询
+func (r *CDREventSMFImpl) SelectPage(querys model.CDREventSMFQuery) map[string]any {
+	// 查询条件拼接
+	var conditions []string
+	var params []any
+	if querys.NeType != "" {
+		conditions = append(conditions, "ne_type = ?")
+		params = append(params, querys.NeType)
+	}
+	if querys.RmUID != "" {
+		conditions = append(conditions, "rm_uid = ?")
+		params = append(params, querys.RmUID)
+	}
+	if querys.StartTime != "" {
+		conditions = append(conditions, "timestamp >= ?")
+		if len(querys.StartTime) == 13 {
+			querys.StartTime = querys.StartTime[:10]
+		}
+		params = append(params, querys.StartTime)
+	}
+	if querys.EndTime != "" {
+		conditions = append(conditions, "timestamp <= ?")
+		if len(querys.EndTime) == 13 {
+			querys.EndTime = querys.EndTime[:10]
+		}
+		params = append(params, querys.EndTime)
+	}
+	if querys.RecordType != "" {
+		conditions = append(conditions, "JSON_EXTRACT(cdr_json, '$.recordType') = ?")
+		params = append(params, querys.RecordType)
+	}
+	if querys.SubscriberID != "" {
+		conditions = append(conditions, "JSON_EXTRACT(cdr_json, '$.subscriberIdentifier.subscriptionIDData') = ?")
+		params = append(params, querys.SubscriberID)
+	}
+
+	// 构建查询条件语句
+	whereSql := ""
+	if len(conditions) > 0 {
+		whereSql += " where " + strings.Join(conditions, " and ")
+	}
+
+	result := map[string]any{
+		"total": 0,
+		"rows":  []model.CDREventSMF{},
+	}
+
+	// 查询数量 长度为0直接返回
+	totalSql := "select count(1) as 'total' from cdr_event_smf"
+	totalRows, err := datasource.RawDB("", totalSql+whereSql, params)
+	if err != nil {
+		logger.Errorf("total err => %v", err)
+		return result
+	}
+	total := parse.Number(totalRows[0]["total"])
+	if total == 0 {
+		return result
+	} else {
+		result["total"] = total
+	}
+
+	// 分页
+	pageNum, pageSize := repo.PageNumSize(querys.PageNum, querys.PageSize)
+	pageSql := " limit ?,? "
+	params = append(params, pageNum*pageSize)
+	params = append(params, pageSize)
+
+	// 排序
+	orderSql := ""
+	if querys.SortField != "" {
+		sortSql := querys.SortField
+		if querys.SortOrder != "" {
+			if querys.SortOrder == "desc" {
+				sortSql += " desc "
+			} else {
+				sortSql += " asc "
+			}
+		}
+		orderSql = fmt.Sprintf(" order by id desc, %s ", sortSql)
+	}
+
+	// 查询数据
+	querySql := r.selectSql + whereSql + orderSql + pageSql
+	results, err := datasource.RawDB("", querySql, params)
+	if err != nil {
+		logger.Errorf("query err => %v", err)
+	}
+
+	// 转换实体
+	result["rows"] = r.convertResultRows(results)
+	return result
+}
+
+// SelectByIds 通过ID查询
+func (r *CDREventSMFImpl) SelectByIds(cdrIds []string) []model.CDREventSMF {
+	placeholder := repo.KeyPlaceholderByQuery(len(cdrIds))
+	querySql := r.selectSql + " where id in (" + placeholder + ")"
+	parameters := repo.ConvertIdsSlice(cdrIds)
+	results, err := datasource.RawDB("", querySql, parameters)
+	if err != nil {
+		logger.Errorf("query err => %v", err)
+		return []model.CDREventSMF{}
+	}
+	// 转换实体
+	return r.convertResultRows(results)
+}
+
+// DeleteByIds 批量删除信息
+func (r *CDREventSMFImpl) DeleteByIds(cdrIds []string) int64 {
+	placeholder := repo.KeyPlaceholderByQuery(len(cdrIds))
+	sql := "delete from cdr_event_smf where id in (" + placeholder + ")"
+	parameters := repo.ConvertIdsSlice(cdrIds)
+	results, err := datasource.ExecDB("", sql, parameters)
+	if err != nil {
+		logger.Errorf("delete err => %v", err)
+		return 0
+	}
+	return results
+}

src/modules/network_data/repository/perf_kpi.impl.go

@@ -96,19 +96,47 @@ func (r *PerfKPIImpl) SelectKpiReport(query model.GoldKPIQuery, kpiIds []string)
 		params = append(params, query.RmUID)
 	}
 	if query.NeType != "" {
-		conditions = append(conditions, "gk.ne_type = ?")
-		params = append(params, query.NeType)
+		//conditions = append(conditions, "gk.ne_type = ?")
+		// params = append(params, query.NeType)
 		tableName += strings.ToLower(query.NeType)
 	}
-	var dateTimeStr string = "CONCAT(gk.`date`, \" \", gk.start_time)"
+
+	var dateStr1, dateStr2, timeStr1, timeStr2 string
 	if query.StartTime != "" {
-		conditions = append(conditions, dateTimeStr+" >= ?")
-		params = append(params, query.StartTime)
+		dateStr1 = query.StartTime[:10]
+		timeStr1 = query.StartTime[11:]
 	}
 	if query.EndTime != "" {
-		conditions = append(conditions, dateTimeStr+" <= ?")
-		params = append(params, query.EndTime)
+		dateStr2 = query.EndTime[:10]
+		timeStr2 = query.EndTime[11:]
 	}
+	if dateStr1 == dateStr2 && dateStr1 != "" {
+		conditions = append(conditions, "gk.`date` = ?")
+		params = append(params, dateStr1)
+		conditions = append(conditions, "gk.`start_time` >= ?")
+		params = append(params, timeStr1)
+		conditions = append(conditions, "gk.`start_time` <= ?")
+		params = append(params, timeStr2)
+	} else {
+		if dateStr1 != "" {
+			conditions = append(conditions, "(gk.`date` > ? OR (gk.`date` = ? AND gk.`start_time` >= ?))")
+			params = append(params, dateStr1, dateStr1, timeStr1)
+		}
+		if dateStr2 != "" {
+			conditions = append(conditions, "(gk.`date` < ? OR (gk.`date` = ? AND gk.`start_time` <= ?))")
+			params = append(params, dateStr2, dateStr2, timeStr2)
+		}
+	}
+
+	// var dateTimeStr string = "CONCAT(gk.`date`, \" \", gk.start_time)"
+	// if query.StartTime != "" {
+	// 	conditions = append(conditions, dateTimeStr+" >= ?")
+	// 	params = append(params, query.StartTime)
+	// }
+	// if query.EndTime != "" {
+	// 	conditions = append(conditions, dateTimeStr+" <= ?")
+	// 	params = append(params, query.EndTime)
+	// }
 	// 构建查询条件语句
 	whereSql := ""
 	if len(conditions) > 0 {
@@ -116,6 +144,7 @@ func (r *PerfKPIImpl) SelectKpiReport(query model.GoldKPIQuery, kpiIds []string)
 	}
 
 	// 查询字段列
+	var dateTimeStr string = "CONCAT(gk.`date`, \" \", gk.start_time)"
 	timeFormat := "DATE_FORMAT(" + dateTimeStr + ", '%Y-%m-%d %H:%i:')"
 	secondGroup := fmt.Sprintf("LPAD(FLOOR(SECOND(gk.start_time) / %d) * %d, 2, '0')", query.Interval, query.Interval)
 	groupByField := fmt.Sprintf("CONCAT( %s, %s ) AS timeGroup", timeFormat, secondGroup)

src/modules/network_data/repository/udm_auth.go

@@ -0,0 +1,26 @@
+package repository
+
+import (
+	"be.ems/src/modules/network_data/model"
+)
+
+// UDM鉴权信息 数据层接口
+type IUDMAuth interface {
+	// ClearAndInsert 清空ne_id后新增实体
+	ClearAndInsert(neId string, uArr []model.UDMAuth) int64
+
+	// SelectPage 根据条件分页查询
+	SelectPage(query map[string]any) map[string]any
+
+	// SelectList 根据实体查询
+	SelectList(u model.UDMAuth) []model.UDMAuth
+
+	// Insert 批量添加
+	Inserts(uArr []model.UDMAuth) int64
+
+	// Delete 删除实体
+	Delete(neId, imsi string) int64
+
+	// DeletePrefixByIMSI 删除前缀匹配的实体
+	DeletePrefixByIMSI(neId, imsi string) int64
+}

src/modules/network_data/repository/udm_auth.impl.go

@@ -0,0 +1,190 @@
+package repository
+
+import (
+	"fmt"
+	"strings"
+
+	"be.ems/src/framework/datasource"
+	"be.ems/src/framework/logger"
+	"be.ems/src/framework/utils/parse"
+	"be.ems/src/framework/utils/repo"
+	"be.ems/src/modules/network_data/model"
+)
+
+// 实例化数据层 UDMAuthImpl 结构体
+var NewUDMAuthImpl = &UDMAuthImpl{
+	selectSql: `select id, imsi, amf, status, ki, algo_index, opc, ne_id from u_auth_user`,
+
+	resultMap: map[string]string{
+		"id":         "ID",
+		"imsi":       "IMSI",
+		"amf":        "Amf",
+		"status":     "Status",
+		"ki":         "Ki",
+		"algo_index": "AlgoIndex",
+		"opc":        "Opc",
+		"ne_id":      "NeId",
+	},
+}
+
+// UDMAuthImpl UDM鉴权信息表 数据层处理
+type UDMAuthImpl struct {
+	// 查询视图对象SQL
+	selectSql string
+	// 结果字段与实体映射
+	resultMap map[string]string
+}
+
+// convertResultRows 将结果记录转实体结果组
+func (r *UDMAuthImpl) convertResultRows(rows []map[string]any) []model.UDMAuth {
+	arr := make([]model.UDMAuth, 0)
+	for _, row := range rows {
+		item := model.UDMAuth{}
+		for key, value := range row {
+			if keyMapper, ok := r.resultMap[key]; ok {
+				repo.SetFieldValue(&item, keyMapper, value)
+			}
+		}
+		arr = append(arr, item)
+	}
+	return arr
+}
+
+// ClearAndInsert 清空ne_id后新增实体
+func (r *UDMAuthImpl) ClearAndInsert(neId string, uArr []model.UDMAuth) int64 {
+	// 不指定neID时，用 TRUNCATE 清空表快
+	_, err := datasource.ExecDB("", "TRUNCATE TABLE u_auth_user", nil)
+	if err != nil {
+		logger.Errorf("TRUNCATE err => %v", err)
+	}
+	return r.Inserts(uArr)
+}
+
+// SelectPage 根据条件分页查询
+func (r *UDMAuthImpl) SelectPage(query map[string]any) map[string]any {
+	// 查询条件拼接
+	var conditions []string
+	var params []any
+	if v, ok := query["imsi"]; ok && v != "" {
+		conditions = append(conditions, "imsi like concat(concat('%', ?), '%')")
+		params = append(params, strings.Trim(v.(string), " "))
+	}
+	if v, ok := query["neId"]; ok && v != "" {
+		conditions = append(conditions, "ne_id = ?")
+		params = append(params, v)
+	}
+
+	// 构建查询条件语句
+	whereSql := ""
+	if len(conditions) > 0 {
+		whereSql += " where " + strings.Join(conditions, " and ")
+	}
+
+	result := map[string]any{
+		"total": 0,
+		"rows":  []model.UDMAuth{},
+	}
+
+	// 查询数量 长度为0直接返回
+	totalSql := "select count(1) as 'total' from u_auth_user"
+	totalRows, err := datasource.RawDB("", totalSql+whereSql, params)
+	if err != nil {
+		logger.Errorf("total err => %v", err)
+		return result
+	}
+	total := parse.Number(totalRows[0]["total"])
+	if total == 0 {
+		return result
+	} else {
+		result["total"] = total
+	}
+
+	// 分页
+	pageNum, pageSize := repo.PageNumSize(query["pageNum"], query["pageSize"])
+	pageSql := " limit ?,? "
+	params = append(params, pageNum*pageSize)
+	params = append(params, pageSize)
+
+	// 排序
+	orderSql := ""
+	if v, ok := query["sortField"]; ok && v != "" {
+		sortSql := v.(string)
+		if o, ok := query["sortOrder"]; ok && o != nil && v != "" {
+			if o == "desc" {
+				sortSql += " desc "
+			} else {
+				sortSql += " asc "
+			}
+		}
+		orderSql = fmt.Sprintf(" order by %s ", sortSql)
+	}
+
+	// 查询数据
+	querySql := r.selectSql + whereSql + orderSql + pageSql
+	results, err := datasource.RawDB("", querySql, params)
+	if err != nil {
+		logger.Errorf("query err => %v", err)
+	}
+
+	// 转换实体
+	result["rows"] = r.convertResultRows(results)
+	return result
+}
+
+// SelectList 根据实体查询
+func (r *UDMAuthImpl) SelectList(u model.UDMAuth) []model.UDMAuth {
+	// 查询条件拼接
+	var conditions []string
+	var params []any
+	if u.IMSI != "" {
+		conditions = append(conditions, "imsi = ?")
+		params = append(params, u.IMSI)
+	}
+	if u.NeId != "" {
+		conditions = append(conditions, "ne_id = ?")
+		params = append(params, u.NeId)
+	}
+
+	// 构建查询条件语句
+	whereSql := ""
+	if len(conditions) > 0 {
+		whereSql += " where " + strings.Join(conditions, " and ")
+	}
+
+	// 查询数据
+	querySql := r.selectSql + whereSql + " order by imsi asc "
+	results, err := datasource.RawDB("", querySql, params)
+	if err != nil {
+		logger.Errorf("query err => %v", err)
+	}
+
+	// 转换实体
+	return r.convertResultRows(results)
+}
+
+// Insert 批量添加
+func (r *UDMAuthImpl) Inserts(uArr []model.UDMAuth) int64 {
+	tx := datasource.DefaultDB().CreateInBatches(uArr, 3000)
+	if err := tx.Error; err != nil {
+		logger.Errorf("CreateInBatches err => %v", err)
+	}
+	return tx.RowsAffected
+}
+
+// Delete 删除实体
+func (r *UDMAuthImpl) Delete(neId, imsi string) int64 {
+	tx := datasource.DefaultDB().Where("imsi = ? and ne_id = ?", imsi, neId).Delete(&model.UDMAuth{})
+	if err := tx.Error; err != nil {
+		logger.Errorf("Delete err => %v", err)
+	}
+	return tx.RowsAffected
+}
+
+// DeletePrefixByIMSI 删除前缀匹配的实体
+func (r *UDMAuthImpl) DeletePrefixByIMSI(neId, imsi string) int64 {
+	tx := datasource.DefaultDB().Where("imsi like concat(?, '%') and ne_id = ?", imsi, neId).Delete(&model.UDMAuth{})
+	if err := tx.Error; err != nil {
+		logger.Errorf("DeletePrefixByIMSI err => %v", err)
+	}
+	return tx.RowsAffected
+}

src/modules/network_data/repository/udm_sub.go

@@ -0,0 +1,26 @@
+package repository
+
+import (
+	"be.ems/src/modules/network_data/model"
+)
+
+// UDM签约信息 数据层接口
+type IUDMSub interface {
+	// ClearAndInsert 清空ne_id后新增实体
+	ClearAndInsert(neId string, uArr []model.UDMSub) int64
+
+	// SelectPage 根据条件分页查询
+	SelectPage(query map[string]any) map[string]any
+
+	// SelectList 根据实体查询
+	SelectList(u model.UDMSub) []model.UDMSub
+
+	// Insert 批量添加
+	Inserts(uArr []model.UDMSub) int64
+
+	// Delete 删除实体
+	Delete(neId, imsi string) int64
+
+	// DeletePrefixByIMSI 删除前缀匹配的实体
+	DeletePrefixByIMSI(neId, imsi string) int64
+}

src/modules/network_data/repository/udm_sub.impl.go

@@ -0,0 +1,263 @@
+package repository
+
+import (
+	"fmt"
+	"strings"
+
+	dborm "be.ems/lib/core/datasource"
+	"be.ems/lib/log"
+	"be.ems/src/framework/datasource"
+	"be.ems/src/framework/logger"
+	"be.ems/src/framework/utils/parse"
+	"be.ems/src/framework/utils/repo"
+	"be.ems/src/modules/network_data/model"
+)
+
+// 实例化数据层 UDMSubImpl 结构体
+var NewUDMSubImpl = &UDMSubImpl{
+	selectSql: `select 
+	s.id, s.msisdn, s.imsi, s.ambr, s.nssai, s.rat, s.arfb, s.sar, s.cn, s.sm_data, s.smf_sel, s.eps_dat, 
+	s.ne_id, s.eps_flag, s.eps_odb, s.hplmn_odb, s.ard, s.epstpl, s.context_id, s.apn_context, s.static_ip,
+	t.tenant_id, t.tenant_name
+	from u_sub_user s 
+	left join sys_tenant t on t.tenant_id = s.tenant_id`,
+
+	resultMap: map[string]string{
+		"id":          "ID",
+		"msisdn":      "Msisdn",
+		"imsi":        "IMSI",
+		"ambr":        "Ambr",
+		"nssai":       "Nssai",
+		"rat":         "Rat",
+		"arfb":        "Arfb",
+		"sar":         "Sar",
+		"cn":          "Cn",
+		"sm_data":     "SmData",
+		"smf_sel":     "SmfSel",
+		"eps_dat":     "EpsDat",
+		"ne_id":       "NeId",
+		"eps_flag":    "EpsFlag",
+		"eps_odb":     "EpsOdb",
+		"hplmn_odb":   "HplmnOdb",
+		"ard":         "Ard",
+		"epstpl":      "Epstpl",
+		"context_id":  "ContextId",
+		"apn_context": "ApnContext",
+		"static_ip":   "StaticIp",
+		"tenant_id":   "TenantID",
+		"tenant_name": "TenantName", // Tenant name for multi-tenancy
+	},
+}
+
+// UDMSubImpl UDM签约信息表 数据层处理
+type UDMSubImpl struct {
+	// 查询视图对象SQL
+	selectSql string
+	// 结果字段与实体映射
+	resultMap map[string]string
+}
+
+// convertResultRows 将结果记录转实体结果组
+func (r *UDMSubImpl) convertResultRows(rows []map[string]any) []model.UDMSub {
+	arr := make([]model.UDMSub, 0)
+	for _, row := range rows {
+		item := model.UDMSub{}
+		for key, value := range row {
+			if keyMapper, ok := r.resultMap[key]; ok {
+				repo.SetFieldValue(&item, keyMapper, value)
+			}
+		}
+		arr = append(arr, item)
+	}
+	return arr
+}
+
+// ClearAndInsert 清空ne_id后新增实体
+func (r *UDMSubImpl) ClearAndInsert(neID string, u []model.UDMSub) int64 {
+	// 不指定neID时，用 TRUNCATE 清空表快
+	_, err := datasource.ExecDB("", "TRUNCATE TABLE u_sub_user", nil)
+	if err != nil {
+		logger.Errorf("TRUNCATE err => %v", err)
+	}
+
+	return r.Inserts(u)
+}
+
+// SelectPage 根据条件分页查询字典类型
+func (r *UDMSubImpl) SelectPage(query map[string]any) map[string]any {
+	// 查询条件拼接
+	var conditions []string
+	var params []any
+	if v, ok := query["msisdn"]; ok && v != "" {
+		conditions = append(conditions, "msisdn like concat(concat('%', ?), '%')")
+		params = append(params, strings.Trim(v.(string), " "))
+	}
+	if v, ok := query["imsi"]; ok && v != "" {
+		conditions = append(conditions, "imsi like concat(concat('%', ?), '%')")
+		params = append(params, strings.Trim(v.(string), " "))
+	}
+	if v, ok := query["neId"]; ok && v != "" {
+		conditions = append(conditions, "ne_id = ?")
+		params = append(params, v)
+	}
+	// for multi-tenancy solution
+	if v, ok := query["tenantName"]; ok && v != "" {
+		var tenantID []string
+		err := dborm.DefaultDB().Table("sys_tenant").
+			Where("tenant_name=?", v).Cols("tenant_id").Distinct().Find(&tenantID)
+		if err != nil {
+			log.Errorf("Find tenant_id from sys_user err => %v", err)
+		}
+		log.Tracef("userName=%v, tenantID=%v", v, tenantID)
+		if len(tenantID) > 0 {
+			conditions = append(conditions, "s.tenant_id = ?")
+			params = append(params, tenantID[0])
+		}
+	} else if v, ok := query["userName"]; ok && v != "" {
+		var tenantID string
+		_, err := dborm.DefaultDB().Table("sys_user").
+			Where("user_name=?", v).Cols("tenant_id").Distinct().Get(&tenantID)
+		if err != nil {
+			log.Errorf("Find tenant_id from sys_user err => %v", err)
+		}
+		log.Tracef("userName=%v, tenantID=%v", v, tenantID)
+		if tenantID != "" {
+			conditions = append(conditions, "s.tenant_id = ?")
+			params = append(params, tenantID)
+		}
+		// if len(tenantID) > 0 {
+		// 	conditions = append(conditions, "s.tenant_id = ?")
+		// 	params = append(params, tenantID[0])
+		// }
+	}
+
+	// 构建查询条件语句
+	whereSql := ""
+	if len(conditions) > 0 {
+		whereSql += " where " + strings.Join(conditions, " and ")
+	}
+
+	result := map[string]any{
+		"total": 0,
+		"rows":  []model.UDMSub{},
+	}
+
+	// 查询数量 长度为0直接返回
+	totalSql := "select count(1) as 'total' from u_sub_user s"
+	totalRows, err := datasource.RawDB("", totalSql+whereSql, params)
+	if err != nil {
+		logger.Errorf("total err => %v", err)
+		return result
+	}
+	total := parse.Number(totalRows[0]["total"])
+	if total == 0 {
+		return result
+	} else {
+		result["total"] = total
+	}
+
+	// 分页
+	pageNum, pageSize := repo.PageNumSize(query["pageNum"], query["pageSize"])
+	pageSql := " limit ?,? "
+	params = append(params, pageNum*pageSize)
+	params = append(params, pageSize)
+
+	// 排序
+	orderSql := ""
+	if v, ok := query["sortField"]; ok && v != "" {
+		sortSql := v.(string)
+		if o, ok := query["sortOrder"]; ok && o != nil && v != "" {
+			if o == "desc" {
+				sortSql += " desc "
+			} else {
+				sortSql += " asc "
+			}
+		}
+		orderSql = fmt.Sprintf(" order by %s ", sortSql)
+	}
+
+	// 查询数据
+	querySql := r.selectSql + whereSql + orderSql + pageSql
+	results, err := datasource.RawDB("", querySql, params)
+	if err != nil {
+		logger.Errorf("query err => %v", err)
+		return result
+	}
+
+	// 转换实体
+	result["rows"] = r.convertResultRows(results)
+	return result
+}
+
+// SelectList 根据实体查询
+func (r *UDMSubImpl) SelectList(u model.UDMSub) []model.UDMSub {
+	// 查询条件拼接
+	var conditions []string
+	var params []any
+	if u.IMSI != "" {
+		conditions = append(conditions, "imsi = ?")
+		params = append(params, u.IMSI)
+	}
+	if u.NeId != "" {
+		conditions = append(conditions, "ne_id = ?")
+		params = append(params, u.NeId)
+	}
+
+	// 构建查询条件语句
+	whereSql := ""
+	if len(conditions) > 0 {
+		whereSql += " where " + strings.Join(conditions, " and ")
+	}
+
+	// 查询数据
+	querySql := r.selectSql + whereSql + " order by imsi asc "
+	results, err := datasource.RawDB("", querySql, params)
+	if err != nil {
+		logger.Errorf("query err => %v", err)
+	}
+
+	// 转换实体
+	return r.convertResultRows(results)
+}
+
+// Insert 批量添加
+func (r *UDMSubImpl) Inserts(uArr []model.UDMSub) int64 {
+	tx := datasource.DefaultDB().CreateInBatches(uArr, 2000)
+	if err := tx.Error; err != nil {
+		logger.Errorf("CreateInBatches err => %v", err)
+	}
+	return tx.RowsAffected
+}
+
+// Delete 删除实体
+func (r *UDMSubImpl) Delete(neId, imsi string) int64 {
+	tx := datasource.DefaultDB().Where("imsi = ? and ne_id = ?", imsi, neId).Delete(&model.UDMSub{})
+	if err := tx.Error; err != nil {
+		logger.Errorf("Delete err => %v", err)
+	}
+	return tx.RowsAffected
+}
+
+// DeletePrefixByIMSI 删除前缀匹配的实体
+func (r *UDMSubImpl) DeletePrefixByIMSI(neId, imsi string) int64 {
+	tx := datasource.DefaultDB().Where("imsi like concat(?, '%') and ne_id = ?", imsi, neId).Delete(&model.UDMSub{})
+	if err := tx.Error; err != nil {
+		logger.Errorf("DeletePrefixByIMSI err => %v", err)
+	}
+	return tx.RowsAffected
+}
+
+func (r *UDMSubImpl) SetTenantID(subArr *[]model.UDMSub) {
+	for s := 0; s < len(*subArr); s++ {
+		var tenantID []string
+		err := dborm.DefaultDB().Table("sys_tenant").
+			Where("status='1' and tenancy_type='IMSI' and ? like tenancy_key", (*subArr)[s].Imsi).Cols("parent_id").Distinct().Find(&tenantID)
+		if err != nil {
+			log.Errorf("Find tenant_id err => %v", err)
+			continue
+		}
+		if len(tenantID) > 0 {
+			(*subArr)[s].TenantID = tenantID[0]
+		}
+	}
+}

src/modules/network_data/repository/ue_event_amf.go

@@ -2,13 +2,13 @@ package repository
 
 import "be.ems/src/modules/network_data/model"
 
-// UE会话事件 数据层接口
-type IUEEvent interface {
+// UE会话事件AMF 数据层接口
+type IUEEventAMF interface {
 	// SelectPage 根据条件分页查询
-	SelectPage(querys model.UEEventQuery) map[string]any
+	SelectPage(querys model.UEEventAMFQuery) map[string]any
 
 	// SelectByIds 通过ID查询
-	SelectByIds(ueIds []string) []model.UEEvent
+	SelectByIds(ueIds []string) []model.UEEventAMF
 
 	// DeleteByIds 批量删除信息
 	DeleteByIds(ueIds []string) int64

src/modules/network_data/repository/ue_event_amf.impl.go

@@ -6,15 +6,14 @@ import (
 
 	"be.ems/src/framework/datasource"
 	"be.ems/src/framework/logger"
-	"be.ems/src/framework/utils/date"
 	"be.ems/src/framework/utils/parse"
 	"be.ems/src/framework/utils/repo"
 	"be.ems/src/modules/network_data/model"
 )
 
-// 实例化数据层 UEEventImpl 结构体
-var NewUEEventImpl = &UEEventImpl{
-	selectSql: `select id, ne_type, ne_name, rm_uid, timestamp, event_type, event_json, created_at from ue_event`,
+// 实例化数据层 UEEventAMFImpl 结构体
+var NewUEEventAMFImpl = &UEEventAMFImpl{
+	selectSql: `select id, ne_type, ne_name, rm_uid, timestamp, event_type, event_json, created_at from ue_event_amf`,
 
 	resultMap: map[string]string{
 		"id":         "ID",
@@ -28,8 +27,8 @@ var NewUEEventImpl = &UEEventImpl{
 	},
 }
 
-// UEEventImpl UE会话事件 数据层处理
-type UEEventImpl struct {
+// UEEventAMFImpl UE会话事件 数据层处理
+type UEEventAMFImpl struct {
 	// 查询视图对象SQL
 	selectSql string
 	// 结果字段与实体映射
@@ -37,10 +36,10 @@ type UEEventImpl struct {
 }
 
 // convertResultRows 将结果记录转实体结果组
-func (r *UEEventImpl) convertResultRows(rows []map[string]any) []model.UEEvent {
-	arr := make([]model.UEEvent, 0)
+func (r *UEEventAMFImpl) convertResultRows(rows []map[string]any) []model.UEEventAMF {
+	arr := make([]model.UEEventAMF, 0)
 	for _, row := range rows {
-		item := model.UEEvent{}
+		item := model.UEEventAMF{}
 		for key, value := range row {
 			if keyMapper, ok := r.resultMap[key]; ok {
 				repo.SetFieldValue(&item, keyMapper, value)
@@ -52,7 +51,7 @@ func (r *UEEventImpl) convertResultRows(rows []map[string]any) []model.UEEvent {
 }
 
 // SelectPage 根据条件分页查询
-func (r *UEEventImpl) SelectPage(querys model.UEEventQuery) map[string]any {
+func (r *UEEventAMFImpl) SelectPage(querys model.UEEventAMFQuery) map[string]any {
 	// 查询条件拼接
 	var conditions []string
 	var params []any
@@ -66,17 +65,17 @@ func (r *UEEventImpl) SelectPage(querys model.UEEventQuery) map[string]any {
 	}
 	if querys.StartTime != "" {
 		conditions = append(conditions, "timestamp >= ?")
-		beginDate := date.ParseStrToDate(querys.StartTime, date.YYYY_MM_DD_HH_MM_SS)
-		params = append(params, beginDate.Unix())
+		if len(querys.StartTime) == 13 {
+			querys.StartTime = querys.StartTime[:10]
+		}
+		params = append(params, querys.StartTime)
 	}
 	if querys.EndTime != "" {
 		conditions = append(conditions, "timestamp <= ?")
-		endDate := date.ParseStrToDate(querys.EndTime, date.YYYY_MM_DD_HH_MM_SS)
-		params = append(params, endDate.Unix())
-	}
-	if querys.IMSI != "" {
-		conditions = append(conditions, "JSON_EXTRACT(event_json, '$.imsi') = ?")
-		params = append(params, querys.IMSI)
+		if len(querys.EndTime) == 13 {
+			querys.EndTime = querys.EndTime[:10]
+		}
+		params = append(params, querys.EndTime)
 	}
 	if querys.EventType != "" {
 		eventTypes := strings.Split(querys.EventType, ",")
@@ -86,6 +85,10 @@ func (r *UEEventImpl) SelectPage(querys model.UEEventQuery) map[string]any {
 			params = append(params, eventType)
 		}
 	}
+	if querys.IMSI != "" {
+		conditions = append(conditions, "JSON_EXTRACT(event_json, '$.imsi') = ?")
+		params = append(params, querys.IMSI)
+	}
 
 	// 构建查询条件语句
 	whereSql := ""
@@ -95,11 +98,11 @@ func (r *UEEventImpl) SelectPage(querys model.UEEventQuery) map[string]any {
 
 	result := map[string]any{
 		"total": 0,
-		"rows":  []model.CDREvent{},
+		"rows":  []model.UEEventAMF{},
 	}
 
 	// 查询数量 长度为0直接返回
-	totalSql := "select count(1) as 'total' from ue_event"
+	totalSql := "select count(1) as 'total' from ue_event_amf"
 	totalRows, err := datasource.RawDB("", totalSql+whereSql, params)
 	if err != nil {
 		logger.Errorf("total err => %v", err)
@@ -145,23 +148,23 @@ func (r *UEEventImpl) SelectPage(querys model.UEEventQuery) map[string]any {
 }
 
 // SelectByIds 通过ID查询
-func (r *UEEventImpl) SelectByIds(ueIds []string) []model.UEEvent {
+func (r *UEEventAMFImpl) SelectByIds(ueIds []string) []model.UEEventAMF {
 	placeholder := repo.KeyPlaceholderByQuery(len(ueIds))
 	querySql := r.selectSql + " where id in (" + placeholder + ")"
 	parameters := repo.ConvertIdsSlice(ueIds)
 	results, err := datasource.RawDB("", querySql, parameters)
 	if err != nil {
 		logger.Errorf("query err => %v", err)
-		return []model.UEEvent{}
+		return []model.UEEventAMF{}
 	}
 	// 转换实体
 	return r.convertResultRows(results)
 }
 
 // DeleteByIds 批量删除信息
-func (r *UEEventImpl) DeleteByIds(ueIds []string) int64 {
+func (r *UEEventAMFImpl) DeleteByIds(ueIds []string) int64 {
 	placeholder := repo.KeyPlaceholderByQuery(len(ueIds))
-	sql := "delete from ue_event where id in (" + placeholder + ")"
+	sql := "delete from ue_event_amf where id in (" + placeholder + ")"
 	parameters := repo.ConvertIdsSlice(ueIds)
 	results, err := datasource.ExecDB("", sql, parameters)
 	if err != nil {

src/modules/network_data/repository/ue_event_mme.go

@@ -0,0 +1,15 @@
+package repository
+
+import "be.ems/src/modules/network_data/model"
+
+// UE会话事件MME 数据层接口
+type IUEEventMME interface {
+	// SelectPage 根据条件分页查询
+	SelectPage(querys model.UEEventMMEQuery) map[string]any
+
+	// SelectByIds 通过ID查询
+	SelectByIds(ueIds []string) []model.UEEventMME
+
+	// DeleteByIds 批量删除信息
+	DeleteByIds(ueIds []string) int64
+}

src/modules/network_data/repository/ue_event_mme.impl.go

@@ -0,0 +1,175 @@
+package repository
+
+import (
+	"fmt"
+	"strings"
+
+	"be.ems/src/framework/datasource"
+	"be.ems/src/framework/logger"
+	"be.ems/src/framework/utils/parse"
+	"be.ems/src/framework/utils/repo"
+	"be.ems/src/modules/network_data/model"
+)
+
+// 实例化数据层 UEEventMMEImpl 结构体
+var NewUEEventMMEImpl = &UEEventMMEImpl{
+	selectSql: `select id, ne_type, ne_name, rm_uid, timestamp, event_type, event_json, created_at from ue_event_mme`,
+
+	resultMap: map[string]string{
+		"id":         "ID",
+		"ne_type":    "NeType",
+		"ne_name":    "NeName",
+		"rm_uid":     "RmUID",
+		"timestamp":  "Timestamp",
+		"event_type": "EventType",
+		"event_json": "EventJSONStr",
+		"created_at": "CreatedAt",
+	},
+}
+
+// UEEventMMEImpl UE会话事件 数据层处理
+type UEEventMMEImpl struct {
+	// 查询视图对象SQL
+	selectSql string
+	// 结果字段与实体映射
+	resultMap map[string]string
+}
+
+// convertResultRows 将结果记录转实体结果组
+func (r *UEEventMMEImpl) convertResultRows(rows []map[string]any) []model.UEEventMME {
+	arr := make([]model.UEEventMME, 0)
+	for _, row := range rows {
+		item := model.UEEventMME{}
+		for key, value := range row {
+			if keyMapper, ok := r.resultMap[key]; ok {
+				repo.SetFieldValue(&item, keyMapper, value)
+			}
+		}
+		arr = append(arr, item)
+	}
+	return arr
+}
+
+// SelectPage 根据条件分页查询
+func (r *UEEventMMEImpl) SelectPage(querys model.UEEventMMEQuery) map[string]any {
+	// 查询条件拼接
+	var conditions []string
+	var params []any
+	if querys.NeType != "" {
+		conditions = append(conditions, "ne_type = ?")
+		params = append(params, querys.NeType)
+	}
+	if querys.RmUID != "" {
+		conditions = append(conditions, "rm_uid = ?")
+		params = append(params, querys.RmUID)
+	}
+	if querys.StartTime != "" {
+		conditions = append(conditions, "timestamp >= ?")
+		if len(querys.StartTime) == 13 {
+			querys.StartTime = querys.StartTime[:10]
+		}
+		params = append(params, querys.StartTime)
+	}
+	if querys.EndTime != "" {
+		conditions = append(conditions, "timestamp <= ?")
+		if len(querys.EndTime) == 13 {
+			querys.EndTime = querys.EndTime[:10]
+		}
+		params = append(params, querys.EndTime)
+	}
+	if querys.EventType != "" {
+		eventTypes := strings.Split(querys.EventType, ",")
+		placeholder := repo.KeyPlaceholderByQuery(len(eventTypes))
+		conditions = append(conditions, fmt.Sprintf("event_type in (%s)", placeholder))
+		for _, eventType := range eventTypes {
+			params = append(params, eventType)
+		}
+	}
+	if querys.IMSI != "" {
+		conditions = append(conditions, "JSON_EXTRACT(event_json, '$.imsi') = ?")
+		params = append(params, querys.IMSI)
+	}
+
+	// 构建查询条件语句
+	whereSql := ""
+	if len(conditions) > 0 {
+		whereSql += " where " + strings.Join(conditions, " and ")
+	}
+
+	result := map[string]any{
+		"total": 0,
+		"rows":  []model.UEEventMME{},
+	}
+
+	// 查询数量 长度为0直接返回
+	totalSql := "select count(1) as 'total' from ue_event_mme"
+	totalRows, err := datasource.RawDB("", totalSql+whereSql, params)
+	if err != nil {
+		logger.Errorf("total err => %v", err)
+		return result
+	}
+	total := parse.Number(totalRows[0]["total"])
+	if total == 0 {
+		return result
+	} else {
+		result["total"] = total
+	}
+
+	// 分页
+	pageNum, pageSize := repo.PageNumSize(querys.PageNum, querys.PageSize)
+	pageSql := " limit ?,? "
+	params = append(params, pageNum*pageSize)
+	params = append(params, pageSize)
+
+	// 排序
+	orderSql := ""
+	if querys.SortField != "" {
+		sortSql := querys.SortField
+		if querys.SortOrder != "" {
+			if querys.SortOrder == "desc" {
+				sortSql += " desc "
+			} else {
+				sortSql += " asc "
+			}
+		}
+		orderSql = fmt.Sprintf(" order by id desc, %s ", sortSql)
+	}
+
+	// 查询数据
+	querySql := r.selectSql + whereSql + orderSql + pageSql
+	results, err := datasource.RawDB("", querySql, params)
+	if err != nil {
+		logger.Errorf("query err => %v", err)
+	}
+
+	// 转换实体
+	result["rows"] = r.convertResultRows(results)
+	return result
+}
+
+// SelectByIds 通过ID查询
+func (r *UEEventMMEImpl) SelectByIds(ueIds []string) []model.UEEventMME {
+	placeholder := repo.KeyPlaceholderByQuery(len(ueIds))
+	querySql := r.selectSql + " where id in (" + placeholder + ")"
+	parameters := repo.ConvertIdsSlice(ueIds)
+	results, err := datasource.RawDB("", querySql, parameters)
+	if err != nil {
+		logger.Errorf("query err => %v", err)
+		return []model.UEEventMME{}
+	}
+	// 转换实体
+	return r.convertResultRows(results)
+}
+
+// DeleteByIds 批量删除信息
+func (r *UEEventMMEImpl) DeleteByIds(ueIds []string) int64 {
+	placeholder := repo.KeyPlaceholderByQuery(len(ueIds))
+	sql := "delete from ue_event_mme where id in (" + placeholder + ")"
+	parameters := repo.ConvertIdsSlice(ueIds)
+	results, err := datasource.ExecDB("", sql, parameters)
+	if err != nil {
+		logger.Errorf("delete err => %v", err)
+		return 0
+	}
+	return results
+}