From 76cdd34a7d483c41929aa71ba01654ec71081292 Mon Sep 17 00:00:00 2001
From: TsMask <340112800@qq.com>
Date: Fri, 17 May 2024 18:03:48 +0800
Subject: [PATCH] =?UTF-8?q?feat:=20IMS=E7=94=A8=E6=88=B7=E8=AF=9D=E5=8D=95?=
 =?UTF-8?q?=E6=94=AF=E6=8C=81=E5=8F=B7=E7=A0=81=E6=9F=A5=E8=AF=A2?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/modules/network_data/model/cdr_event.go   | 22 ++++++++++---------
 .../network_data/repository/cdr_event.impl.go | 12 ++++++----
 2 files changed, 20 insertions(+), 14 deletions(-)

diff --git a/src/modules/network_data/model/cdr_event.go b/src/modules/network_data/model/cdr_event.go
index a4721d34..f035ecff 100644
--- a/src/modules/network_data/model/cdr_event.go
+++ b/src/modules/network_data/model/cdr_event.go
@@ -15,14 +15,16 @@ type CDREvent struct {
 
 // CDREventQuery CDR会话对象查询参数结构体
 type CDREventQuery struct {
-	NeType     string `json:"neType" form:"neType" binding:"required"` // 网元类型, 暂时支持IMS
-	NeID       string `json:"neId" form:"neId" binding:"required"`
-	RmUID      string `json:"rmUID" form:"rmUID"`
-	RecordType string `json:"recordType" form:"recordType"` // 记录行为 MOC MTC MOSM MTSM
-	StartTime  string `json:"startTime" form:"startTime"`
-	EndTime    string `json:"endTime" form:"endTime"`
-	SortField  string `json:"sortField" form:"sortField" binding:"omitempty,oneof=timestamp"` // 排序字段，填写结果字段
-	SortOrder  string `json:"sortOrder" form:"sortOrder" binding:"omitempty,oneof=asc desc"`  // 排序升降序，asc desc
-	PageNum    int64  `json:"pageNum" form:"pageNum" binding:"required"`
-	PageSize   int64  `json:"pageSize" form:"pageSize" binding:"required"`
+	NeType      string `json:"neType" form:"neType" binding:"required"` // 网元类型, 暂时支持IMS
+	NeID        string `json:"neId" form:"neId" binding:"required"`
+	RmUID       string `json:"rmUID" form:"rmUID"`
+	RecordType  string `json:"recordType" form:"recordType"`   // 记录行为 MOC MTC MOSM MTSM
+	CallerParty string `json:"callerParty" form:"callerParty"` // 主叫号码
+	CalledParty string `json:"calledParty" form:"calledParty"` // 被叫号码
+	StartTime   string `json:"startTime" form:"startTime"`
+	EndTime     string `json:"endTime" form:"endTime"`
+	SortField   string `json:"sortField" form:"sortField" binding:"omitempty,oneof=timestamp"` // 排序字段，填写结果字段
+	SortOrder   string `json:"sortOrder" form:"sortOrder" binding:"omitempty,oneof=asc desc"`  // 排序升降序，asc desc
+	PageNum     int64  `json:"pageNum" form:"pageNum" binding:"required"`
+	PageSize    int64  `json:"pageSize" form:"pageSize" binding:"required"`
 }
diff --git a/src/modules/network_data/repository/cdr_event.impl.go b/src/modules/network_data/repository/cdr_event.impl.go
index ac75e43d..10e78400 100644
--- a/src/modules/network_data/repository/cdr_event.impl.go
+++ b/src/modules/network_data/repository/cdr_event.impl.go
@@ -63,10 +63,6 @@ func (r *CDREventImpl) SelectPage(querys model.CDREventQuery) map[string]any {
 		conditions = append(conditions, "rm_uid = ?")
 		params = append(params, querys.RmUID)
 	}
-	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)
@@ -77,6 +73,14 @@ func (r *CDREventImpl) SelectPage(querys model.CDREventQuery) map[string]any {
 		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))