From 40f178a1cdb6afb0766eda237e6f64b01d1b6fb0 Mon Sep 17 00:00:00 2001
From: TsMask <340112800@qq.com>
Date: Tue, 15 Jul 2025 15:04:41 +0800
Subject: [PATCH] =?UTF-8?q?fix:=20udm=E5=A4=84=E7=90=86=E5=87=BD=E6=95=B0?=
 =?UTF-8?q?=E8=BF=94=E5=9B=9E=E5=80=BC=E7=BB=9F=E4=B8=80?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/modules/network_data/controller/all_nb_state.go  | 4 ++--
 src/modules/network_data/controller/udm_auth.go      | 6 +++---
 src/modules/network_data/controller/udm_sub.go       | 6 +++---
 src/modules/network_data/controller/udm_voip.go      | 6 +++---
 src/modules/network_data/controller/udm_volte_ims.go | 6 +++---
 src/modules/network_data/repository/udm_auth.go      | 6 +++---
 src/modules/network_data/repository/udm_sub.go       | 6 +++---
 src/modules/network_data/repository/udm_voip.go      | 6 +++---
 src/modules/network_data/repository/udm_volte_ims.go | 6 +++---
 src/modules/network_data/service/udm_auth.go         | 2 +-
 src/modules/network_data/service/udm_sub.go          | 2 +-
 src/modules/network_data/service/udm_voip.go         | 2 +-
 src/modules/network_data/service/udm_volte_ims.go    | 2 +-
 13 files changed, 30 insertions(+), 30 deletions(-)

diff --git a/src/modules/network_data/controller/all_nb_state.go b/src/modules/network_data/controller/all_nb_state.go
index 2813d405..5c00ec47 100644
--- a/src/modules/network_data/controller/all_nb_state.go
+++ b/src/modules/network_data/controller/all_nb_state.go
@@ -72,7 +72,7 @@ func (s NBStateController) List(c *gin.Context) {
 
 // 历史记录列表导出
 //
-// POST /export
+// GET /export
 //
 //	@Tags			network_data/amf,network_data/mme
 //	@Accept			json
@@ -82,7 +82,7 @@ func (s NBStateController) List(c *gin.Context) {
 //	@Security		TokenAuth
 //	@Summary		Base Station Status List Export
 //	@Description	Base Station Status List Export
-//	@Router			/nb-state/export [post]
+//	@Router			/nb-state/export [get]
 func (s NBStateController) Export(c *gin.Context) {
 	language := reqctx.AcceptLanguage(c)
 	// 查询结果，根据查询条件结果，单页最大值限制
diff --git a/src/modules/network_data/controller/udm_auth.go b/src/modules/network_data/controller/udm_auth.go
index f2e62e98..900245ef 100644
--- a/src/modules/network_data/controller/udm_auth.go
+++ b/src/modules/network_data/controller/udm_auth.go
@@ -77,8 +77,8 @@ func (s *UDMAuthController) ResetData(c *gin.Context) {
 //	@Router			/neData/udm/auth/list [get]
 func (s *UDMAuthController) List(c *gin.Context) {
 	query := reqctx.QueryMap(c)
-	total, rows := s.udmAuthService.FindByPage(query)
-	c.JSON(200, resp.OkData(map[string]any{"total": total, "rows": rows}))
+	rows, total := s.udmAuthService.FindByPage(query)
+	c.JSON(200, resp.OkData(map[string]any{"rows": rows, "total": total}))
 }
 
 // UDM鉴权用户信息
@@ -478,7 +478,7 @@ func (s *UDMAuthController) Export(c *gin.Context) {
 	}
 
 	query := reqctx.QueryMap(c)
-	total, rows := s.udmAuthService.FindByPage(query)
+	rows, total := s.udmAuthService.FindByPage(query)
 	if total == 0 {
 		// 导出数据记录为空
 		c.JSON(200, resp.ErrMsg(i18n.TKey(language, "app.common.exportEmpty")))
diff --git a/src/modules/network_data/controller/udm_sub.go b/src/modules/network_data/controller/udm_sub.go
index 6a1d40a1..1772ddae 100644
--- a/src/modules/network_data/controller/udm_sub.go
+++ b/src/modules/network_data/controller/udm_sub.go
@@ -77,8 +77,8 @@ func (s *UDMSubController) ResetData(c *gin.Context) {
 //	@Router			/neData/udm/sub/list [get]
 func (s *UDMSubController) List(c *gin.Context) {
 	query := reqctx.QueryMap(c)
-	total, rows := s.udmSubService.FindByPage(query)
-	c.JSON(200, resp.OkData(map[string]any{"total": total, "rows": rows}))
+	rows, total := s.udmSubService.FindByPage(query)
+	c.JSON(200, resp.OkData(map[string]any{"rows": rows, "total": total}))
 }
 
 // UDM签约用户信息
@@ -484,7 +484,7 @@ func (s *UDMSubController) Export(c *gin.Context) {
 	}
 
 	query := reqctx.QueryMap(c)
-	total, rows := s.udmSubService.FindByPage(query)
+	rows, total := s.udmSubService.FindByPage(query)
 	if total == 0 {
 		// 导出数据记录为空
 		c.JSON(200, resp.ErrMsg(i18n.TKey(language, "app.common.exportEmpty")))
diff --git a/src/modules/network_data/controller/udm_voip.go b/src/modules/network_data/controller/udm_voip.go
index 933092fb..40768d25 100644
--- a/src/modules/network_data/controller/udm_voip.go
+++ b/src/modules/network_data/controller/udm_voip.go
@@ -76,8 +76,8 @@ func (s *UDMVOIPController) ResetData(c *gin.Context) {
 //	@Router			/neData/udm/voip/list [get]
 func (s *UDMVOIPController) List(c *gin.Context) {
 	query := reqctx.QueryMap(c)
-	total, rows := s.udmVOIPService.FindByPage(query)
-	c.JSON(200, resp.OkData(map[string]any{"total": total, "rows": rows}))
+	rows, total := s.udmVOIPService.FindByPage(query)
+	c.JSON(200, resp.OkData(map[string]any{"rows": rows, "total": total}))
 }
 
 // UDMVOIP用户信息
@@ -416,7 +416,7 @@ func (s *UDMVOIPController) Export(c *gin.Context) {
 	}
 
 	query := reqctx.QueryMap(c)
-	total, rows := s.udmVOIPService.FindByPage(query)
+	rows, total := s.udmVOIPService.FindByPage(query)
 	if total == 0 {
 		// 导出数据记录为空
 		c.JSON(200, resp.ErrMsg(i18n.TKey(language, "app.common.exportEmpty")))
diff --git a/src/modules/network_data/controller/udm_volte_ims.go b/src/modules/network_data/controller/udm_volte_ims.go
index 1a034553..881c0593 100644
--- a/src/modules/network_data/controller/udm_volte_ims.go
+++ b/src/modules/network_data/controller/udm_volte_ims.go
@@ -76,8 +76,8 @@ func (s *UDMVolteIMSController) ResetData(c *gin.Context) {
 //	@Router			/neData/udm/volte-ims/list [get]
 func (s *UDMVolteIMSController) List(c *gin.Context) {
 	query := reqctx.QueryMap(c)
-	total, rows := s.udmVolteIMSService.FindByPage(query)
-	c.JSON(200, resp.OkData(map[string]any{"total": total, "rows": rows}))
+	rows, total := s.udmVolteIMSService.FindByPage(query)
+	c.JSON(200, resp.OkData(map[string]any{"rows": rows, "total": total}))
 }
 
 // UDMVolteIMS用户信息
@@ -462,7 +462,7 @@ func (s *UDMVolteIMSController) Export(c *gin.Context) {
 	}
 
 	query := reqctx.QueryMap(c)
-	total, rows := s.udmVolteIMSService.FindByPage(query)
+	rows, total := s.udmVolteIMSService.FindByPage(query)
 	if total == 0 {
 		// 导出数据记录为空
 		c.JSON(200, resp.ErrMsg(i18n.TKey(language, "app.common.exportEmpty")))
diff --git a/src/modules/network_data/repository/udm_auth.go b/src/modules/network_data/repository/udm_auth.go
index 4a9565a5..c665b9de 100644
--- a/src/modules/network_data/repository/udm_auth.go
+++ b/src/modules/network_data/repository/udm_auth.go
@@ -27,7 +27,7 @@ func (r *UDMAuthUser) ClearAndInsert(neId string, uArr []model.UDMAuthUser) int6
 }
 
 // SelectPage 根据条件分页查询
-func (r *UDMAuthUser) SelectPage(query map[string]string) (int64, []model.UDMAuthUser) {
+func (r *UDMAuthUser) SelectPage(query map[string]string) ([]model.UDMAuthUser, int64) {
 	tx := db.DB("").Model(&model.UDMAuthUser{})
 	// 查询条件拼接
 	if v, ok := query["imsi"]; ok && v != "" {
@@ -48,7 +48,7 @@ func (r *UDMAuthUser) SelectPage(query map[string]string) (int64, []model.UDMAut
 
 	// 查询数量 长度为0直接返回
 	if err := tx.Count(&total).Error; err != nil || total <= 0 {
-		return total, rows
+		return rows, total
 	}
 
 	// 分页
@@ -73,7 +73,7 @@ func (r *UDMAuthUser) SelectPage(query map[string]string) (int64, []model.UDMAut
 		logger.Errorf("query err => %v", err)
 	}
 
-	return total, rows
+	return rows, total
 }
 
 // SelectList 根据实体查询
diff --git a/src/modules/network_data/repository/udm_sub.go b/src/modules/network_data/repository/udm_sub.go
index 5e7d2a14..2a939045 100644
--- a/src/modules/network_data/repository/udm_sub.go
+++ b/src/modules/network_data/repository/udm_sub.go
@@ -27,7 +27,7 @@ func (r *UDMSubUser) ClearAndInsert(neId string, u []model.UDMSubUser) int64 {
 }
 
 // SelectPage 根据条件分页查询字典类型
-func (r *UDMSubUser) SelectPage(query map[string]string) (int64, []model.UDMSubUser) {
+func (r *UDMSubUser) SelectPage(query map[string]string) ([]model.UDMSubUser, int64) {
 	tx := db.DB("").Model(&model.UDMSubUser{})
 	// 查询条件拼接
 	if v, ok := query["imsi"]; ok && v != "" {
@@ -51,7 +51,7 @@ func (r *UDMSubUser) SelectPage(query map[string]string) (int64, []model.UDMSubU
 
 	// 查询数量 长度为0直接返回
 	if err := tx.Count(&total).Error; err != nil || total <= 0 {
-		return total, rows
+		return rows, total
 	}
 
 	// 分页
@@ -76,7 +76,7 @@ func (r *UDMSubUser) SelectPage(query map[string]string) (int64, []model.UDMSubU
 		logger.Errorf("query err => %v", err)
 	}
 
-	return total, rows
+	return rows, total
 }
 
 // SelectList 根据实体查询
diff --git a/src/modules/network_data/repository/udm_voip.go b/src/modules/network_data/repository/udm_voip.go
index e0fe4a93..ada692aa 100644
--- a/src/modules/network_data/repository/udm_voip.go
+++ b/src/modules/network_data/repository/udm_voip.go
@@ -27,7 +27,7 @@ func (r UDMVOIPUser) ClearAndInsert(neId string, uArr []model.UDMVOIPUser) int64
 }
 
 // SelectPage 根据条件分页查询
-func (r UDMVOIPUser) SelectPage(query map[string]string) (int64, []model.UDMVOIPUser) {
+func (r UDMVOIPUser) SelectPage(query map[string]string) ([]model.UDMVOIPUser, int64) {
 	tx := db.DB("").Model(&model.UDMVOIPUser{})
 	// 查询条件拼接
 	if v, ok := query["username"]; ok && v != "" {
@@ -48,7 +48,7 @@ func (r UDMVOIPUser) SelectPage(query map[string]string) (int64, []model.UDMVOIP
 
 	// 查询数量 长度为0直接返回
 	if err := tx.Count(&total).Error; err != nil || total <= 0 {
-		return total, rows
+		return rows, total
 	}
 
 	// 分页
@@ -75,7 +75,7 @@ func (r UDMVOIPUser) SelectPage(query map[string]string) (int64, []model.UDMVOIP
 		logger.Errorf("query err => %v", err)
 	}
 
-	return total, rows
+	return rows, total
 }
 
 // SelectList 根据实体查询
diff --git a/src/modules/network_data/repository/udm_volte_ims.go b/src/modules/network_data/repository/udm_volte_ims.go
index b4fc935d..984ccc4c 100644
--- a/src/modules/network_data/repository/udm_volte_ims.go
+++ b/src/modules/network_data/repository/udm_volte_ims.go
@@ -27,7 +27,7 @@ func (r UDMVolteIMSUser) ClearAndInsert(neId string, uArr []model.UDMVolteIMSUse
 }
 
 // SelectPage 根据条件分页查询
-func (r UDMVolteIMSUser) SelectPage(query map[string]string) (int64, []model.UDMVolteIMSUser) {
+func (r UDMVolteIMSUser) SelectPage(query map[string]string) ([]model.UDMVolteIMSUser, int64) {
 	tx := db.DB("").Model(&model.UDMVolteIMSUser{})
 	// 查询条件拼接
 	if v, ok := query["imsi"]; ok && v != "" {
@@ -57,7 +57,7 @@ func (r UDMVolteIMSUser) SelectPage(query map[string]string) (int64, []model.UDM
 
 	// 查询数量 长度为0直接返回
 	if err := tx.Count(&total).Error; err != nil || total <= 0 {
-		return total, rows
+		return rows, total
 	}
 
 	// 分页
@@ -84,7 +84,7 @@ func (r UDMVolteIMSUser) SelectPage(query map[string]string) (int64, []model.UDM
 		logger.Errorf("query err => %v", err)
 	}
 
-	return total, rows
+	return rows, total
 }
 
 // SelectList 根据实体查询
diff --git a/src/modules/network_data/service/udm_auth.go b/src/modules/network_data/service/udm_auth.go
index 73e94c7d..c8fcdc60 100644
--- a/src/modules/network_data/service/udm_auth.go
+++ b/src/modules/network_data/service/udm_auth.go
@@ -99,7 +99,7 @@ func (r *UDMAuthUser) ParseInfo(imsi, neId string, data map[string]string) model
 }
 
 // FindByPage 分页查询数据库
-func (r *UDMAuthUser) FindByPage(query map[string]string) (int64, []model.UDMAuthUser) {
+func (r *UDMAuthUser) FindByPage(query map[string]string) ([]model.UDMAuthUser, int64) {
 	return r.udmAuthRepository.SelectPage(query)
 }
 
diff --git a/src/modules/network_data/service/udm_sub.go b/src/modules/network_data/service/udm_sub.go
index 8da74756..76cc5c76 100644
--- a/src/modules/network_data/service/udm_sub.go
+++ b/src/modules/network_data/service/udm_sub.go
@@ -180,7 +180,7 @@ func (r *UDMSubUser) ParseInfo(imsi, neId string, data map[string]string) model.
 }
 
 // FindByPage 分页查询数据库
-func (r *UDMSubUser) FindByPage(query map[string]string) (int64, []model.UDMSubUser) {
+func (r *UDMSubUser) FindByPage(query map[string]string) ([]model.UDMSubUser, int64) {
 	return r.udmSubRepository.SelectPage(query)
 }
 
diff --git a/src/modules/network_data/service/udm_voip.go b/src/modules/network_data/service/udm_voip.go
index 10c95d92..e03eed9c 100644
--- a/src/modules/network_data/service/udm_voip.go
+++ b/src/modules/network_data/service/udm_voip.go
@@ -89,7 +89,7 @@ func (r UDMVOIPUser) ParseInfo(neId string, data map[string]string) model.UDMVOI
 }
 
 // FindByPage 分页查询数据库
-func (r UDMVOIPUser) FindByPage(query map[string]string) (int64, []model.UDMVOIPUser) {
+func (r UDMVOIPUser) FindByPage(query map[string]string) ([]model.UDMVOIPUser, int64) {
 	return r.udmVOIPRepository.SelectPage(query)
 }
 
diff --git a/src/modules/network_data/service/udm_volte_ims.go b/src/modules/network_data/service/udm_volte_ims.go
index a489933e..3d3032b9 100644
--- a/src/modules/network_data/service/udm_volte_ims.go
+++ b/src/modules/network_data/service/udm_volte_ims.go
@@ -110,7 +110,7 @@ func (r UDMVolteIMSUser) ParseInfo(neId string, data map[string]string) model.UD
 }
 
 // FindByPage 分页查询数据库
-func (r UDMVolteIMSUser) FindByPage(query map[string]string) (int64, []model.UDMVolteIMSUser) {
+func (r UDMVolteIMSUser) FindByPage(query map[string]string) ([]model.UDMVolteIMSUser, int64) {
 	return r.udmVolteIMSRepository.SelectPage(query)
 }