From 15c8bdcfbf297fb218120dade2a1061208d8eb58 Mon Sep 17 00:00:00 2001
From: TsMask <340112800@qq.com>
Date: Wed, 19 Jun 2024 17:07:05 +0800
Subject: [PATCH] =?UTF-8?q?fix:=20UE=E4=BA=8B=E4=BB=B6MME=E7=B1=BB?=
 =?UTF-8?q?=E5=9E=8B=E7=BB=93=E6=9E=9C=E4=BF=9D=E6=8C=81=E5=92=8CAMF?=
 =?UTF-8?q?=E4=B8=80=E8=87=B4?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/modules/network_data/controller/mme.go    | 30 +++++++++++++------
 .../network_data/model/ue_event_mme.go        |  4 +--
 2 files changed, 23 insertions(+), 11 deletions(-)

diff --git a/src/modules/network_data/controller/mme.go b/src/modules/network_data/controller/mme.go
index 52a7f18c..a7707a18 100644
--- a/src/modules/network_data/controller/mme.go
+++ b/src/modules/network_data/controller/mme.go
@@ -121,10 +121,12 @@ func (s *MMEController) UEExport(c *gin.Context) {
 		"D1": "Result",
 		"E1": "Time",
 	}
-	// 读取字典数据 UE 事件类型MME
-	dictUEEventMMEType := sysService.NewSysDictDataImpl.SelectDictDataByType("ue_event_mme_type")
-	// 读取字典数据 UE 事件结果MME
-	dictUEEventMMEResult := sysService.NewSysDictDataImpl.SelectDictDataByType("ue_event_mme_result")
+	// 读取字典数据 UE 事件类型
+	dictUEEventType := sysService.NewSysDictDataImpl.SelectDictDataByType("ue_event_type")
+	// 读取字典数据 UE 事件认证代码类型
+	dictUEAauthCode := sysService.NewSysDictDataImpl.SelectDictDataByType("ue_auth_code")
+	// 读取字典数据 UE 事件CM状态
+	dictUEEventCmState := sysService.NewSysDictDataImpl.SelectDictDataByType("ue_event_cm_state")
 	// 从第二行开始的数据
 	dataCells := make([]map[string]any, 0)
 	for i, row := range rows {
@@ -144,7 +146,7 @@ func (s *MMEController) UEExport(c *gin.Context) {
 		}
 		// 取类型
 		eventType := row.EventType
-		for _, v := range dictUEEventMMEType {
+		for _, v := range dictUEEventType {
 			if row.EventType == v.DictValue {
 				eventType = i18n.TKey(language, v.DictLabel)
 				break
@@ -154,10 +156,20 @@ func (s *MMEController) UEExport(c *gin.Context) {
 		eventResult := ""
 		if v, ok := eventJSON["result"]; ok && v != nil {
 			eventResult = v.(string)
-			for _, v := range dictUEEventMMEResult {
-				if eventResult == v.DictValue {
-					eventResult = i18n.TKey(language, v.DictLabel)
-					break
+			if row.EventType == "auth-result" {
+				for _, v := range dictUEAauthCode {
+					if eventResult == v.DictValue {
+						eventResult = i18n.TKey(language, v.DictLabel)
+						break
+					}
+				}
+			}
+			if row.EventType == "cm-state" {
+				for _, v := range dictUEEventCmState {
+					if eventResult == v.DictValue {
+						eventResult = i18n.TKey(language, v.DictLabel)
+						break
+					}
 				}
 			}
 		}
diff --git a/src/modules/network_data/model/ue_event_mme.go b/src/modules/network_data/model/ue_event_mme.go
index 65d21375..8ceab120 100644
--- a/src/modules/network_data/model/ue_event_mme.go
+++ b/src/modules/network_data/model/ue_event_mme.go
@@ -9,7 +9,7 @@ type UEEventMME struct {
 	NeName       string    `json:"neName" gorm:"column:ne_name"`
 	RmUID        string    `json:"rmUID" gorm:"column:rm_uid"` // 可能没有
 	Timestamp    int64     `json:"timestamp" gorm:"column:timestamp"`
-	EventType    string    `json:"eventType" gorm:"column:event_type"` // 事件类型 ECM STATUS, EMM STATUS
+	EventType    string    `json:"eventType" gorm:"column:event_type"` // 事件类型 auth-result detach cm-state
 	EventJSONStr string    `json:"eventJSON" gorm:"column:event_json"`
 	CreatedAt    time.Time `json:"createdAt" gorm:"column:created_at;default:CURRENT_TIMESTAMP"`
 }
@@ -19,7 +19,7 @@ type UEEventMMEQuery struct {
 	NeType    string `json:"neType" form:"neType" binding:"required"` // 网元类型, 暂时支持MME
 	NeID      string `json:"neId" form:"neId" binding:"required"`
 	RmUID     string `json:"rmUID" form:"rmUID"`
-	EventType string `json:"eventType" form:"eventType"` // 事件类型 ECM STATUS, EMM STATUS
+	EventType string `json:"eventType" form:"eventType"` // 事件类型 auth-result detach cm-state
 	IMSI      string `json:"imsi" form:"imsi"`           // imsi
 	StartTime string `json:"startTime" form:"startTime"`
 	EndTime   string `json:"endTime" form:"endTime"`