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

src/modules/network_data/repository/alarm.go

@@ -1,194 +1,103 @@
 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"
 )
 
 // 实例化数据层 Alarm 结构体
-var NewAlarm = &Alarm{
-	selectSql: `select 
-	id, alarm_seq, alarm_id, alarm_title, ne_type, ne_id, alarm_code, event_time, 
-	alarm_type, orig_severity, perceived_severity, pv_flag, ne_name, object_uid, object_name,
-	object_type, location_info, province, alarm_status, specific_problem, specific_problem_id,
-	add_info, counter, latest_event_time, ack_state, ack_time, ack_user, clear_type,
-	clear_time, clear_user, timestamp
-	from alarm`,
-
-	resultMap: map[string]string{
-		"id":                  "ID",
-		"alarm_seq":           "AlarmSeq",
-		"alarm_id":            "AlarmId",
-		"alarm_title":         "AlarmTitle",
-		"ne_type":             "NeType",
-		"ne_id":               "NeId",
-		"alarm_code":          "AlarmCode",
-		"event_time":          "EventTime",
-		"alarm_type":          "AlarmType",
-		"orig_severity":       "OrigSeverity",
-		"perceived_severity":  "PerceivedSeverity",
-		"pv_flag":             "PvFlag",
-		"ne_name":             "NeName",
-		"object_uid":          "ObjectUid",
-		"object_name":         "ObjectName",
-		"object_type":         "ObjectType",
-		"location_info":       "LocationInfo",
-		"province":            "Province",
-		"alarm_status":        "AlarmStatus",
-		"specific_problem":    "SpecificProblem",
-		"specific_problem_id": "SpecificProblemId",
-		"add_info":            "AddInfo",
-		"counter":             "Counter",
-		"latest_event_time":   "LatestEventTime",
-		"ack_state":           "AckState",
-		"ack_time":            "AckTime",
-		"ack_user":            "AckUser",
-		"clear_type":          "ClearType",
-		"clear_time":          "ClearTime",
-		"clear_user":          "ClearUser",
-		"timestamp":           "Timestamp",
-	},
-}
+var NewAlarm = &Alarm{}
 
 // Alarm 告警 数据层处理
-type Alarm struct {
-	// 查询视图对象SQL
-	selectSql string
-	// 结果字段与实体映射
-	resultMap map[string]string
-}
+type Alarm struct{}
 
-// convertResultRows 将结果记录转实体结果组
-func (r *Alarm) convertResultRows(rows []map[string]any) []model.Alarm {
-	arr := make([]model.Alarm, 0)
-	for _, row := range rows {
-		item := model.Alarm{}
-		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 *Alarm) SelectPage(querys model.AlarmQuery) map[string]any {
+// SelectByPage 分页查询集合
+func (r Alarm) SelectByPage(querys model.AlarmQuery) ([]model.Alarm, int64) {
+	tx := datasource.DB("").Model(&model.Alarm{})
 	// 查询条件拼接
-	var conditions []string
-	var params []any
 	if querys.NeType != "" {
-		conditions = append(conditions, "ne_type = ?")
-		params = append(params, querys.NeType)
+		tx = tx.Where("ne_type = ?", querys.NeType)
 	}
 	if querys.RmUID != "" {
-		conditions = append(conditions, "object_uid = ?")
-		params = append(params, querys.RmUID)
+		tx = tx.Where("rm_uid = ?", querys.RmUID)
 	}
 	if querys.StartTime != "" {
-		conditions = append(conditions, "timestamp >= ?")
-		params = append(params, querys.StartTime)
+		startTime := querys.StartTime
+		if len(startTime) == 13 {
+			startTime = startTime[:10]
+		}
+		tx = tx.Where("timestamp >= ?", startTime)
 	}
 	if querys.EndTime != "" {
-		conditions = append(conditions, "timestamp <= ?")
-		params = append(params, querys.EndTime)
+		endTime := querys.EndTime
+		if len(endTime) == 13 {
+			endTime = endTime[:10]
+		}
+		tx = tx.Where("timestamp <= ?", endTime)
 	}
 	if querys.OrigSeverity != "" {
 		eventTypes := strings.Split(querys.OrigSeverity, ",")
-		placeholder := repo.KeyPlaceholderByQuery(len(eventTypes))
-		conditions = append(conditions, fmt.Sprintf("orig_severity in (%s)", placeholder))
-		for _, eventType := range eventTypes {
-			params = append(params, eventType)
-		}
+		tx = tx.Where("orig_severity in (%s)", eventTypes)
 	}
 
-	// 构建查询条件语句
-	whereSql := ""
-	if len(conditions) > 0 {
-		whereSql += " where " + strings.Join(conditions, " and ")
-	}
+	// 查询结果
+	var total int64 = 0
+	rows := []model.Alarm{}
 
-	result := map[string]any{
-		"total": 0,
-		"rows":  []model.Alarm{},
+	// 查询数量为0直接返回
+	if err := tx.Count(&total).Error; err != nil || total <= 0 {
+		return rows, total
 	}
 
-	// 查询数量 长度为0直接返回
-	totalSql := "select count(1) as 'total' from alarm"
-	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 "
-			}
+		sortField := querys.SortField
+		if querys.SortOrder == "desc" {
+			sortField = sortField + " desc"
 		}
-		orderSql = fmt.Sprintf(" order by %s ", sortSql)
+		tx = tx.Order(sortField)
 	}
 
-	// 查询数据
-	querySql := r.selectSql + whereSql + orderSql + pageSql
-	results, err := datasource.RawDB("", querySql, params)
+	// 查询数据分页
+	pageNum, pageSize := datasource.PageNumSize(querys.PageNum, querys.PageSize)
+	tx = tx.Limit(pageSize).Offset(pageSize * pageNum)
+	err := tx.Find(&rows).Error
 	if err != nil {
-		logger.Errorf("query err => %v", err)
+		logger.Errorf("query find err => %v", err.Error())
+		return rows, total
 	}
-
-	// 转换实体
-	result["rows"] = r.convertResultRows(results)
-	return result
+	return rows, total
 }
 
 // SelectByIds 通过ID查询
 func (r *Alarm) SelectByIds(ids []string) []model.Alarm {
-	placeholder := repo.KeyPlaceholderByQuery(len(ids))
-	querySql := r.selectSql + " where id in (" + placeholder + ")"
-	parameters := repo.ConvertIdsSlice(ids)
-	results, err := datasource.RawDB("", querySql, parameters)
-	if err != nil {
-		logger.Errorf("query err => %v", err)
-		return []model.Alarm{}
+	rows := []model.Alarm{}
+	if len(ids) <= 0 {
+		return rows
 	}
-	// 转换实体
-	return r.convertResultRows(results)
+	tx := datasource.DB("").Model(&model.Alarm{})
+	// 构建查询条件
+	tx = tx.Where("id in ?", ids)
+	// 查询数据
+	if err := tx.Find(&rows).Error; err != nil {
+		logger.Errorf("query find err => %v", err.Error())
+		return rows
+	}
+	return rows
 }
 
 // DeleteByIds 批量删除信息
 func (r *Alarm) DeleteByIds(ids []string) int64 {
-	placeholder := repo.KeyPlaceholderByQuery(len(ids))
-	sql := "delete from alarm where id in (" + placeholder + ")"
-	parameters := repo.ConvertIdsSlice(ids)
-	results, err := datasource.ExecDB("", sql, parameters)
-	if err != nil {
-		logger.Errorf("delete err => %v", err)
+	if len(ids) <= 0 {
 		return 0
 	}
-	return results
+	tx := datasource.DB("").Where("id in ?", ids)
+	if err := tx.Delete(&model.Alarm{}).Error; err != nil {
+		logger.Errorf("delete err => %v", err.Error())
+		return 0
+	}
+	return tx.RowsAffected
 }

src/modules/network_data/repository/cdr_event_ims.go

@@ -194,29 +194,101 @@ func (r *CDREventIMS) SelectPage(querys model.CDREventIMSQuery) map[string]any {
 	return result
 }
 
-// SelectByIds 通过ID查询
-func (r *CDREventIMS) 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{}
+// SelectByPage 分页查询集合
+func (r CDREventIMS) SelectByPage(querys model.CDREventIMSQuery) ([]model.CDREventIMS, int64) {
+	tx := datasource.DB("").Model(&model.CDREventIMS{})
+	// 查询条件拼接
+	if querys.NeType != "" {
+		tx = tx.Where("ne_type = ?", querys.NeType)
 	}
-	// 转换实体
-	return r.convertResultRows(results)
+	if querys.RmUID != "" {
+		tx = tx.Where("rm_uid = ?", querys.RmUID)
+	}
+	if querys.StartTime != "" {
+		startTime := querys.StartTime
+		if len(startTime) == 13 {
+			startTime = startTime[:10]
+		}
+		tx = tx.Where("timestamp >= ?", startTime)
+	}
+	if querys.EndTime != "" {
+		endTime := querys.EndTime
+		if len(endTime) == 13 {
+			endTime = endTime[:10]
+		}
+		tx = tx.Where("timestamp <= ?", endTime)
+	}
+	if querys.CallerParty != "" {
+		tx = tx.Where("JSON_EXTRACT(cdr_json, '$.callerParty') = ?", querys.CallerParty)
+	}
+	if querys.CalledParty != "" {
+		tx = tx.Where("JSON_EXTRACT(cdr_json, '$.calledParty') = ?", querys.CalledParty)
+	}
+
+	if querys.RecordType != "" {
+		recordTypes := strings.Split(querys.RecordType, ",")
+		var queryStrArr []string
+		for _, recordType := range recordTypes {
+			queryStrArr = append(queryStrArr, fmt.Sprintf("JSON_EXTRACT(cdr_json, '$.recordType') = '%s'", recordType))
+		}
+		tx = tx.Where(fmt.Sprintf("( %s )", strings.Join(queryStrArr, " OR ")))
+	}
+
+	// 查询结果
+	var total int64 = 0
+	rows := []model.CDREventIMS{}
+
+	// 查询数量为0直接返回
+	if err := tx.Count(&total).Error; err != nil || total <= 0 {
+		return rows, total
+	}
+
+	// 排序
+	if querys.SortField != "" {
+		sortField := querys.SortField
+		if querys.SortOrder == "desc" {
+			sortField = sortField + " desc"
+		}
+		tx = tx.Order(sortField)
+	}
+
+	// 查询数据分页
+	pageNum, pageSize := datasource.PageNumSize(querys.PageNum, querys.PageSize)
+	tx = tx.Limit(pageSize).Offset(pageSize * pageNum)
+	err := tx.Find(&rows).Error
+	if err != nil {
+		logger.Errorf("query find err => %v", err.Error())
+		return rows, total
+	}
+	return rows, total
+}
+
+// SelectByIds 通过ID查询
+func (r *CDREventIMS) SelectByIds(ids []string) []model.CDREventIMS {
+	rows := []model.CDREventIMS{}
+	if len(ids) <= 0 {
+		return rows
+	}
+	tx := datasource.DB("").Model(&model.CDREventIMS{})
+	// 构建查询条件
+	tx = tx.Where("id in ?", ids)
+	// 查询数据
+	if err := tx.Find(&rows).Error; err != nil {
+		logger.Errorf("query find err => %v", err.Error())
+		return rows
+	}
+	return rows
 }
 
 // DeleteByIds 批量删除信息
-func (r *CDREventIMS) 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)
+func (r *CDREventIMS) DeleteByIds(ids []string) int64 {
+	if len(ids) <= 0 {
 		return 0
 	}
-	return results
+	tx := datasource.DB("").Where("id in ?", ids)
+	if err := tx.Delete(&model.CDREventIMS{}).Error; err != nil {
+		logger.Errorf("delete err => %v", err.Error())
+		return 0
+	}
+	return tx.RowsAffected
 }

src/modules/network_data/repository/cdr_event_sgwc.go

@@ -0,0 +1,103 @@
+package repository
+
+import (
+	"be.ems/src/framework/datasource"
+	"be.ems/src/framework/logger"
+	"be.ems/src/modules/network_data/model"
+)
+
+// 实例化数据层 CDREventSGWC 结构体
+var NewCDREventSGWC = &CDREventSGWC{}
+
+// CDREventSGWC CDR会话事件 数据层处理
+type CDREventSGWC struct{}
+
+// SelectByPage 分页查询集合
+func (r CDREventSGWC) SelectByPage(querys model.CDREventSGWCQuery) ([]model.CDREventSGWC, int64) {
+	tx := datasource.DB("").Model(&model.CDREventSGWC{})
+	// 查询条件拼接
+	if querys.NeType != "" {
+		tx = tx.Where("ne_type = ?", querys.NeType)
+	}
+	if querys.RmUID != "" {
+		tx = tx.Where("rm_uid = ?", querys.RmUID)
+	}
+	if querys.StartTime != "" {
+		startTime := querys.StartTime
+		if len(startTime) == 13 {
+			startTime = startTime[:10]
+		}
+		tx = tx.Where("timestamp >= ?", startTime)
+	}
+	if querys.EndTime != "" {
+		endTime := querys.EndTime
+		if len(endTime) == 13 {
+			endTime = endTime[:10]
+		}
+		tx = tx.Where("timestamp <= ?", endTime)
+	}
+	if querys.IMSI != "" {
+		tx = tx.Where("JSON_EXTRACT(cdr_json, '$.servedIMSI') = ?", querys.IMSI)
+	}
+	if querys.MSISDN != "" {
+		tx = tx.Where("JSON_EXTRACT(cdr_json, '$.servedMSISDN') = ?", querys.MSISDN)
+	}
+
+	// 查询结果
+	var total int64 = 0
+	rows := []model.CDREventSGWC{}
+
+	// 查询数量为0直接返回
+	if err := tx.Count(&total).Error; err != nil || total <= 0 {
+		return rows, total
+	}
+
+	// 排序
+	if querys.SortField != "" {
+		sortField := querys.SortField
+		if querys.SortOrder == "desc" {
+			sortField = sortField + " desc"
+		}
+		tx = tx.Order(sortField)
+	}
+
+	// 查询数据分页
+	pageNum, pageSize := datasource.PageNumSize(querys.PageNum, querys.PageSize)
+	tx = tx.Limit(pageSize).Offset(pageSize * pageNum)
+	err := tx.Find(&rows).Error
+	if err != nil {
+		logger.Errorf("query find err => %v", err.Error())
+		return rows, total
+	}
+	return rows, total
+}
+
+// SelectByIds 通过ID查询
+func (r *CDREventSGWC) SelectByIds(ids []string) []model.CDREventSGWC {
+	rows := []model.CDREventSGWC{}
+	if len(ids) <= 0 {
+		return rows
+	}
+	tx := datasource.DB("").Model(&model.CDREventSGWC{})
+	// 构建查询条件
+	tx = tx.Where("id in ?", ids)
+	// 查询数据
+	if err := tx.Find(&rows).Error; err != nil {
+		logger.Errorf("query find err => %v", err.Error())
+		return rows
+	}
+	return rows
+}
+
+// DeleteByIds 批量删除信息
+func (r *CDREventSGWC) DeleteByIds(ids []string) int64 {
+	if len(ids) <= 0 {
+		return 0
+	}
+	tx := datasource.DB("").Where("id in ?", ids)
+	if err := tx.Delete(&model.CDREventSGWC{}).Error; err != nil {
+		logger.Errorf("delete err => %v", err.Error())
+		return 0
+	}
+	return tx.RowsAffected
+}

src/modules/network_data/repository/cdr_event_smf.go

@@ -176,29 +176,92 @@ func (r *CDREventSMF) SelectPage(querys model.CDREventSMFQuery) map[string]any {
 	return result
 }
 
-// SelectByIds 通过ID查询
-func (r *CDREventSMF) 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{}
+// SelectByPage 分页查询集合
+func (r CDREventSMF) SelectByPage(querys model.CDREventSMFQuery) ([]model.CDREventSMF, int64) {
+	tx := datasource.DB("").Model(&model.CDREventSMF{})
+	// 查询条件拼接
+	if querys.NeType != "" {
+		tx = tx.Where("ne_type = ?", querys.NeType)
 	}
-	// 转换实体
-	return r.convertResultRows(results)
+	if querys.RmUID != "" {
+		tx = tx.Where("rm_uid = ?", querys.RmUID)
+	}
+	if querys.StartTime != "" {
+		startTime := querys.StartTime
+		if len(startTime) == 13 {
+			startTime = startTime[:10]
+		}
+		tx = tx.Where("timestamp >= ?", startTime)
+	}
+	if querys.EndTime != "" {
+		endTime := querys.EndTime
+		if len(endTime) == 13 {
+			endTime = endTime[:10]
+		}
+		tx = tx.Where("timestamp <= ?", endTime)
+	}
+	if querys.RecordType != "" {
+		tx = tx.Where("JSON_EXTRACT(cdr_json, '$.recordType') = ?", querys.RecordType)
+	}
+	if querys.SubscriberID != "" {
+		tx = tx.Where("JSON_EXTRACT(cdr_json, '$.subscriberIdentifier.subscriptionIDData') = ?", querys.SubscriberID)
+	}
+
+	// 查询结果
+	var total int64 = 0
+	rows := []model.CDREventSMF{}
+
+	// 查询数量为0直接返回
+	if err := tx.Count(&total).Error; err != nil || total <= 0 {
+		return rows, total
+	}
+
+	// 排序
+	if querys.SortField != "" {
+		sortField := querys.SortField
+		if querys.SortOrder == "desc" {
+			sortField = sortField + " desc"
+		}
+		tx = tx.Order(sortField)
+	}
+
+	// 查询数据分页
+	pageNum, pageSize := datasource.PageNumSize(querys.PageNum, querys.PageSize)
+	tx = tx.Limit(pageSize).Offset(pageSize * pageNum)
+	err := tx.Find(&rows).Error
+	if err != nil {
+		logger.Errorf("query find err => %v", err.Error())
+		return rows, total
+	}
+	return rows, total
+}
+
+// SelectByIds 通过ID查询
+func (r *CDREventSMF) SelectByIds(ids []string) []model.CDREventSMF {
+	rows := []model.CDREventSMF{}
+	if len(ids) <= 0 {
+		return rows
+	}
+	tx := datasource.DB("").Model(&model.CDREventSMF{})
+	// 构建查询条件
+	tx = tx.Where("id in ?", ids)
+	// 查询数据
+	if err := tx.Find(&rows).Error; err != nil {
+		logger.Errorf("query find err => %v", err.Error())
+		return rows
+	}
+	return rows
 }
 
 // DeleteByIds 批量删除信息
-func (r *CDREventSMF) 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)
+func (r *CDREventSMF) DeleteByIds(ids []string) int64 {
+	if len(ids) <= 0 {
 		return 0
 	}
-	return results
+	tx := datasource.DB("").Where("id in ?", ids)
+	if err := tx.Delete(&model.CDREventSMF{}).Error; err != nil {
+		logger.Errorf("delete err => %v", err.Error())
+		return 0
+	}
+	return tx.RowsAffected
 }

src/modules/network_data/repository/cdr_event_smsc.go

@@ -195,29 +195,101 @@ func (r *CDREventSMSC) SelectPage(querys model.CDREventSMSCQuery) map[string]any
 	return result
 }
 
-// SelectByIds 通过ID查询
-func (r *CDREventSMSC) SelectByIds(cdrIds []string) []model.CDREventSMSC {
-	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.CDREventSMSC{}
+// SelectByPage 分页查询集合
+func (r CDREventSMSC) SelectByPage(querys model.CDREventSMSCQuery) ([]model.CDREventSMSC, int64) {
+	tx := datasource.DB("").Model(&model.CDREventSMSC{})
+	// 查询条件拼接
+	if querys.NeType != "" {
+		tx = tx.Where("ne_type = ?", querys.NeType)
 	}
-	// 转换实体
-	return r.convertResultRows(results)
+	if querys.RmUID != "" {
+		tx = tx.Where("rm_uid = ?", querys.RmUID)
+	}
+	if querys.StartTime != "" {
+		startTime := querys.StartTime
+		if len(startTime) == 13 {
+			startTime = startTime[:10]
+		}
+		tx = tx.Where("timestamp >= ?", startTime)
+	}
+	if querys.EndTime != "" {
+		endTime := querys.EndTime
+		if len(endTime) == 13 {
+			endTime = endTime[:10]
+		}
+		tx = tx.Where("timestamp <= ?", endTime)
+	}
+	if querys.CallerParty != "" {
+		tx = tx.Where("JSON_EXTRACT(cdr_json, '$.callerParty') = ?", querys.CallerParty)
+	}
+	if querys.CalledParty != "" {
+		tx = tx.Where("JSON_EXTRACT(cdr_json, '$.calledParty') = ?", querys.CalledParty)
+	}
+
+	if querys.RecordType != "" {
+		recordTypes := strings.Split(querys.RecordType, ",")
+		var queryStrArr []string
+		for _, recordType := range recordTypes {
+			queryStrArr = append(queryStrArr, fmt.Sprintf("JSON_EXTRACT(cdr_json, '$.recordType') = '%s'", recordType))
+		}
+		tx = tx.Where(fmt.Sprintf("( %s )", strings.Join(queryStrArr, " OR ")))
+	}
+
+	// 查询结果
+	var total int64 = 0
+	rows := []model.CDREventSMSC{}
+
+	// 查询数量为0直接返回
+	if err := tx.Count(&total).Error; err != nil || total <= 0 {
+		return rows, total
+	}
+
+	// 排序
+	if querys.SortField != "" {
+		sortField := querys.SortField
+		if querys.SortOrder == "desc" {
+			sortField = sortField + " desc"
+		}
+		tx = tx.Order(sortField)
+	}
+
+	// 查询数据分页
+	pageNum, pageSize := datasource.PageNumSize(querys.PageNum, querys.PageSize)
+	tx = tx.Limit(pageSize).Offset(pageSize * pageNum)
+	err := tx.Find(&rows).Error
+	if err != nil {
+		logger.Errorf("query find err => %v", err.Error())
+		return rows, total
+	}
+	return rows, total
+}
+
+// SelectByIds 通过ID查询
+func (r *CDREventSMSC) SelectByIds(ids []string) []model.CDREventSMSC {
+	rows := []model.CDREventSMSC{}
+	if len(ids) <= 0 {
+		return rows
+	}
+	tx := datasource.DB("").Model(&model.CDREventSMSC{})
+	// 构建查询条件
+	tx = tx.Where("id in ?", ids)
+	// 查询数据
+	if err := tx.Find(&rows).Error; err != nil {
+		logger.Errorf("query find err => %v", err.Error())
+		return rows
+	}
+	return rows
 }
 
 // DeleteByIds 批量删除信息
-func (r *CDREventSMSC) DeleteByIds(cdrIds []string) int64 {
-	placeholder := repo.KeyPlaceholderByQuery(len(cdrIds))
-	sql := "delete from cdr_event_smsc where id in (" + placeholder + ")"
-	parameters := repo.ConvertIdsSlice(cdrIds)
-	results, err := datasource.ExecDB("", sql, parameters)
-	if err != nil {
-		logger.Errorf("delete err => %v", err)
+func (r *CDREventSMSC) DeleteByIds(ids []string) int64 {
+	if len(ids) <= 0 {
 		return 0
 	}
-	return results
+	tx := datasource.DB("").Where("id in ?", ids)
+	if err := tx.Delete(&model.CDREventSMSC{}).Error; err != nil {
+		logger.Errorf("delete err => %v", err.Error())
+		return 0
+	}
+	return tx.RowsAffected
 }

src/modules/network_data/repository/udm_user_info.go

@@ -1,164 +1,87 @@
 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"
 )
 
 // 实例化数据层 UDMUserInfo 结构体
-var NewUDMUserInfo = &UDMUserInfo{
-	selectSql: `select id, imsi, msisdn, ne_id, remark  from u_user_info`,
-
-	resultMap: map[string]string{
-		"id":     "ID",
-		"imsi":   "IMSI",
-		"msisdn": "MSISDN",
-		"ne_id":  "NeId",
-		"remark": "Remark",
-	},
-}
+var NewUDMUserInfo = &UDMUserInfo{}
 
 // UDMUserInfo UDM鉴权信息表 数据层处理
-type UDMUserInfo struct {
-	// 查询视图对象SQL
-	selectSql string
-	// 结果字段与实体映射
-	resultMap map[string]string
-}
+type UDMUserInfo struct{}
 
-// convertResultRows 将结果记录转实体结果组
-func (r *UDMUserInfo) convertResultRows(rows []map[string]any) []model.UDMUserInfo {
-	arr := make([]model.UDMUserInfo, 0)
-	for _, row := range rows {
-		item := model.UDMUserInfo{}
-		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 *UDMUserInfo) SelectPage(query map[string]any) map[string]any {
+// SelectByPage 分页查询集合
+func (r UDMUserInfo) SelectByPage(query map[string]string) ([]model.UDMUserInfo, int64) {
+	tx := datasource.DB("").Model(&model.UDMUserInfo{})
 	// 查询条件拼接
-	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), " "))
+		tx = tx.Where("imsi like concat(concat('%', ?), '%')", v)
 	}
 	if v, ok := query["neId"]; ok && v != "" {
-		conditions = append(conditions, "ne_id = ?")
-		params = append(params, v)
+		tx = tx.Where("ne_id = ?", v)
 	}
 
-	// 构建查询条件语句
-	whereSql := ""
-	if len(conditions) > 0 {
-		whereSql += " where " + strings.Join(conditions, " and ")
-	}
+	// 查询结果
+	var total int64 = 0
+	rows := []model.UDMUserInfo{}
 
-	result := map[string]any{
-		"total": 0,
-		"rows":  []model.UDMUserInfo{},
+	// 查询数量为0直接返回
+	if err := tx.Count(&total).Error; err != nil || total <= 0 {
+		return rows, total
 	}
 
-	// 查询数量 长度为0直接返回
-	totalSql := "select count(1) as 'total' from u_user_info"
-	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 "
-			}
+		sortField := v
+		if o, ok := query["sortOrder"]; ok && o != "" {
+			sortField = sortField + " desc"
 		}
-		orderSql = fmt.Sprintf(" order by %s ", sortSql)
+		tx = tx.Order(sortField)
 	}
 
-	// 查询数据
-	querySql := r.selectSql + whereSql + orderSql + pageSql
-	results, err := datasource.RawDB("", querySql, params)
+	// 查询数据分页
+	pageNum, pageSize := datasource.PageNumSize(query["pageNum"], query["pageSize"])
+	tx = tx.Limit(pageSize).Offset(pageSize * pageNum)
+	err := tx.Find(&rows).Error
 	if err != nil {
-		logger.Errorf("query err => %v", err)
+		logger.Errorf("query find err => %v", err.Error())
+		return rows, total
 	}
-
-	// 转换实体
-	result["rows"] = r.convertResultRows(results)
-	return result
+	return rows, total
 }
 
 // SelectList 根据实体查询
 func (r *UDMUserInfo) SelectList(u model.UDMUserInfo) []model.UDMUserInfo {
-	// 查询条件拼接
-	var conditions []string
-	var params []any
+	tx := datasource.DB("").Model(&model.UDMUserInfo{})
+	// 构建查询条件
 	if u.IMSI != "" {
-		conditions = append(conditions, "imsi = ?")
-		params = append(params, u.IMSI)
+		tx = tx.Where("imsi = ?", u.IMSI)
 	}
 	if u.NeId != "" {
-		conditions = append(conditions, "ne_id = ?")
-		params = append(params, u.NeId)
+		tx = tx.Where("ne_id = ?", u.NeId)
 	}
-
-	// 构建查询条件语句
-	whereSql := ""
-	if len(conditions) > 0 {
-		whereSql += " where " + strings.Join(conditions, " and ")
-	}
-
+	tx = tx.Order("imsi asc")
 	// 查询数据
-	querySql := r.selectSql + whereSql + " order by imsi asc "
-	results, err := datasource.RawDB("", querySql, params)
-	if err != nil {
-		logger.Errorf("query err => %v", err)
+	rows := []model.UDMUserInfo{}
+	if err := tx.Find(&rows).Error; err != nil {
+		logger.Errorf("query find err => %v", err.Error())
+		return rows
 	}
-
-	// 转换实体
-	return r.convertResultRows(results)
+	return rows
 }
 
 // SelectByIMSIAndNeID 通过imsi和ne_id查询
 func (r *UDMUserInfo) SelectByIMSIAndNeID(imsi, neId string) model.UDMUserInfo {
-	querySql := r.selectSql + " where imsi = ? and ne_id = ?"
-	results, err := datasource.RawDB("", querySql, []any{imsi, neId})
-	if err != nil {
-		logger.Errorf("query err => %v", err)
-		return model.UDMUserInfo{}
+	tx := datasource.DB("").Model(&model.UDMUserInfo{})
+	// 构建查询条件
+	tx = tx.Where(" imsi = ? and ne_id = ?", imsi, neId)
+	// 查询数据
+	rows := []model.UDMUserInfo{}
+	if err := tx.Limit(1).Find(&rows).Error; err != nil {
+		logger.Errorf("query find err => %v", err.Error())
 	}
-	// 转换实体
-	rows := r.convertResultRows(results)
 	if len(rows) > 0 {
 		return rows[0]
 	}

src/modules/network_data/repository/ue_event_amf.go

@@ -181,29 +181,93 @@ func (r *UEEventAMF) SelectPage(querys model.UEEventAMFQuery) map[string]any {
 	return result
 }
 
-// SelectByIds 通过ID查询
-func (r *UEEventAMF) 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.UEEventAMF{}
+// SelectByPage 分页查询集合
+func (r UEEventAMF) SelectByPage(querys model.UEEventAMFQuery) ([]model.UEEventAMF, int64) {
+	tx := datasource.DB("").Model(&model.UEEventAMF{})
+	// 查询条件拼接
+	if querys.NeType != "" {
+		tx = tx.Where("ne_type = ?", querys.NeType)
 	}
-	// 转换实体
-	return r.convertResultRows(results)
+	if querys.RmUID != "" {
+		tx = tx.Where("rm_uid = ?", querys.RmUID)
+	}
+	if querys.StartTime != "" {
+		startTime := querys.StartTime
+		if len(startTime) == 13 {
+			startTime = startTime[:10]
+		}
+		tx = tx.Where("timestamp >= ?", startTime)
+	}
+	if querys.EndTime != "" {
+		endTime := querys.EndTime
+		if len(endTime) == 13 {
+			endTime = endTime[:10]
+		}
+		tx = tx.Where("timestamp <= ?", endTime)
+	}
+	if querys.EventType != "" {
+		eventTypes := strings.Split(querys.EventType, ",")
+		tx = tx.Where("event_type in ?", eventTypes)
+	}
+	if querys.IMSI != "" {
+		tx = tx.Where("JSON_EXTRACT(event_json, '$.imsi') = ?", querys.IMSI)
+	}
+
+	// 查询结果
+	var total int64 = 0
+	rows := []model.UEEventAMF{}
+
+	// 查询数量为0直接返回
+	if err := tx.Count(&total).Error; err != nil || total <= 0 {
+		return rows, total
+	}
+
+	// 排序
+	if querys.SortField != "" {
+		sortField := querys.SortField
+		if querys.SortOrder == "desc" {
+			sortField = sortField + " desc"
+		}
+		tx = tx.Order(sortField)
+	}
+
+	// 查询数据分页
+	pageNum, pageSize := datasource.PageNumSize(querys.PageNum, querys.PageSize)
+	tx = tx.Limit(pageSize).Offset(pageSize * pageNum)
+	err := tx.Find(&rows).Error
+	if err != nil {
+		logger.Errorf("query find err => %v", err.Error())
+		return rows, total
+	}
+	return rows, total
+}
+
+// SelectByIds 通过ID查询
+func (r UEEventAMF) SelectByIds(ids []string) []model.UEEventAMF {
+	rows := []model.UEEventAMF{}
+	if len(ids) <= 0 {
+		return rows
+	}
+	tx := datasource.DB("").Model(&model.UEEventAMF{})
+	// 构建查询条件
+	tx = tx.Where("id in ?", ids)
+	// 查询数据
+	if err := tx.Find(&rows).Error; err != nil {
+		logger.Errorf("query find err => %v", err.Error())
+		return rows
+	}
+	return rows
 }
 
 // DeleteByIds 批量删除信息
-func (r *UEEventAMF) DeleteByIds(ueIds []string) int64 {
-	placeholder := repo.KeyPlaceholderByQuery(len(ueIds))
-	sql := "delete from ue_event_amf where id in (" + placeholder + ")"
-	parameters := repo.ConvertIdsSlice(ueIds)
-	results, err := datasource.ExecDB("", sql, parameters)
-	if err != nil {
-		logger.Errorf("delete err => %v", err)
+func (r UEEventAMF) DeleteByIds(ids []string) int64 {
+	if len(ids) <= 0 {
 		return 0
 	}
-	return results
+	tx := datasource.DB("").Where("id in ?", ids)
+	if err := tx.Delete(&model.UEEventAMF{}).Error; err != nil {
+		logger.Errorf("delete err => %v", err.Error())
+		return 0
+	}
+	return tx.RowsAffected
 }

src/modules/network_data/repository/ue_event_mme.go

@@ -181,29 +181,93 @@ func (r *UEEventMME) SelectPage(querys model.UEEventMMEQuery) map[string]any {
 	return result
 }
 
-// SelectByIds 通过ID查询
-func (r *UEEventMME) 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{}
+// SelectByPage 分页查询集合
+func (r UEEventMME) SelectByPage(querys model.UEEventMMEQuery) ([]model.UEEventMME, int64) {
+	tx := datasource.DB("").Model(&model.UEEventMME{})
+	// 查询条件拼接
+	if querys.NeType != "" {
+		tx = tx.Where("ne_type = ?", querys.NeType)
 	}
-	// 转换实体
-	return r.convertResultRows(results)
+	if querys.RmUID != "" {
+		tx = tx.Where("rm_uid = ?", querys.RmUID)
+	}
+	if querys.StartTime != "" {
+		startTime := querys.StartTime
+		if len(startTime) == 13 {
+			startTime = startTime[:10]
+		}
+		tx = tx.Where("timestamp >= ?", startTime)
+	}
+	if querys.EndTime != "" {
+		endTime := querys.EndTime
+		if len(endTime) == 13 {
+			endTime = endTime[:10]
+		}
+		tx = tx.Where("timestamp <= ?", endTime)
+	}
+	if querys.EventType != "" {
+		eventTypes := strings.Split(querys.EventType, ",")
+		tx = tx.Where("event_type in ?", eventTypes)
+	}
+	if querys.IMSI != "" {
+		tx = tx.Where("JSON_EXTRACT(event_json, '$.imsi') = ?", querys.IMSI)
+	}
+
+	// 查询结果
+	var total int64 = 0
+	rows := []model.UEEventMME{}
+
+	// 查询数量为0直接返回
+	if err := tx.Count(&total).Error; err != nil || total <= 0 {
+		return rows, total
+	}
+
+	// 排序
+	if querys.SortField != "" {
+		sortField := querys.SortField
+		if querys.SortOrder == "desc" {
+			sortField = sortField + " desc"
+		}
+		tx = tx.Order(sortField)
+	}
+
+	// 查询数据分页
+	pageNum, pageSize := datasource.PageNumSize(querys.PageNum, querys.PageSize)
+	tx = tx.Limit(pageSize).Offset(pageSize * pageNum)
+	err := tx.Find(&rows).Error
+	if err != nil {
+		logger.Errorf("query find err => %v", err.Error())
+		return rows, total
+	}
+	return rows, total
+}
+
+// SelectByIds 通过ID查询
+func (r UEEventMME) SelectByIds(ids []string) []model.UEEventMME {
+	rows := []model.UEEventMME{}
+	if len(ids) <= 0 {
+		return rows
+	}
+	tx := datasource.DB("").Model(&model.UEEventMME{})
+	// 构建查询条件
+	tx = tx.Where("id in ?", ids)
+	// 查询数据
+	if err := tx.Find(&rows).Error; err != nil {
+		logger.Errorf("query find err => %v", err.Error())
+		return rows
+	}
+	return rows
 }
 
 // DeleteByIds 批量删除信息
-func (r *UEEventMME) 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)
+func (r UEEventMME) DeleteByIds(ids []string) int64 {
+	if len(ids) <= 0 {
 		return 0
 	}
-	return results
+	tx := datasource.DB("").Where("id in ?", ids)
+	if err := tx.Delete(&model.UEEventMME{}).Error; err != nil {
+		logger.Errorf("delete err => %v", err.Error())
+		return 0
+	}
+	return tx.RowsAffected
 }