From 8595a1c0cb1d133b96303b5a3defef415e480b67 Mon Sep 17 00:00:00 2001
From: TsMask <340112800@qq.com>
Date: Tue, 4 Mar 2025 14:52:15 +0800
Subject: [PATCH] =?UTF-8?q?refactor:=20=E7=A7=BB=E9=99=A4=E5=86=97?=
 =?UTF-8?q?=E4=BD=99=E9=94=99=E8=AF=AF=E6=97=A5=E5=BF=97=EF=BC=8C=E4=BC=98?=
 =?UTF-8?q?=E5=8C=96=E6=9F=A5=E8=AF=A2=E9=80=BB=E8=BE=91?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/modules/network_data/repository/udm_auth.go |  1 -
 src/modules/network_data/repository/udm_sub.go  |  1 -
 src/modules/network_element/service/ne_info.go  | 15 ++++++++++-----
 3 files changed, 10 insertions(+), 7 deletions(-)

diff --git a/src/modules/network_data/repository/udm_auth.go b/src/modules/network_data/repository/udm_auth.go
index 980ef003..147efdc4 100644
--- a/src/modules/network_data/repository/udm_auth.go
+++ b/src/modules/network_data/repository/udm_auth.go
@@ -43,7 +43,6 @@ func (r *UDMAuthUser) SelectPage(query map[string]any) (int64, []model.UDMAuthUs
 
 	// 查询数量 长度为0直接返回
 	if err := tx.Count(&total).Error; err != nil || total <= 0 {
-		logger.Errorf("total err => %v", err)
 		return total, rows
 	}
 
diff --git a/src/modules/network_data/repository/udm_sub.go b/src/modules/network_data/repository/udm_sub.go
index 7f57dc50..e1457aa5 100644
--- a/src/modules/network_data/repository/udm_sub.go
+++ b/src/modules/network_data/repository/udm_sub.go
@@ -46,7 +46,6 @@ func (r *UDMSubUser) SelectPage(query map[string]any) (int64, []model.UDMSubUser
 
 	// 查询数量 长度为0直接返回
 	if err := tx.Count(&total).Error; err != nil || total <= 0 {
-		logger.Errorf("total err => %v", err)
 		return total, rows
 	}
 
diff --git a/src/modules/network_element/service/ne_info.go b/src/modules/network_element/service/ne_info.go
index e3626a0e..87bd1b6b 100644
--- a/src/modules/network_element/service/ne_info.go
+++ b/src/modules/network_element/service/ne_info.go
@@ -84,12 +84,17 @@ func (r *NeInfo) ClearNeCacheByNeType(neType string) bool {
 func (r *NeInfo) SelectNeInfoByNeType(neType string) []model.NeInfo {
 	neInfo := make([]model.NeInfo, 0)
 	key := fmt.Sprintf("%s%s:*", cachekey.NE_KEY, strings.ToUpper(neType))
-	jsonStr, _ := redis.Get("", key)
-	if len(jsonStr) > 7 {
-		err := json.Unmarshal([]byte(jsonStr), &neInfo)
-		if err != nil {
-			return neInfo
+	cacheKeys, _ := redis.GetKeys("", key)
+	if len(cacheKeys) > 0 {
+		for _, key := range cacheKeys {
+			var v model.NeInfo
+			jsonStr, _ := redis.Get("", key)
+			if len(jsonStr) > 7 {
+				json.Unmarshal([]byte(jsonStr), &v)
+			}
+			neInfo = append(neInfo, v)
 		}
+		return neInfo
 	} else {
 		neInfo = r.neInfoRepository.SelectList(model.NeInfo{NeType: neType})
 		for _, v := range neInfo {