From 023dc114e0d96e8f6b162d8794adc449e5885b2f Mon Sep 17 00:00:00 2001 From: TsMask <340112800@qq.com> Date: Thu, 18 Sep 2025 11:08:09 +0800 Subject: [PATCH] =?UTF-8?q?feat=20=E5=AF=BC=E5=87=BA=E6=9F=A5=E8=AF=A2?= =?UTF-8?q?=E5=8E=BB=E9=99=A4=E6=9C=80=E5=A4=A7=E8=AE=B0=E5=BD=95=E6=95=B0?= =?UTF-8?q?=E9=99=90=E5=88=B6=EF=BC=8C=E6=9F=A5=E8=AF=A2=E5=88=86=E9=A1=B5?= =?UTF-8?q?=E6=A3=80=E6=9F=A5?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/modules/network_data/controller/amf.go | 16 ++++++++------ src/modules/network_data/controller/ims.go | 16 ++++++++------ src/modules/network_data/controller/mme.go | 16 ++++++++------ src/modules/network_data/controller/sgwc.go | 16 ++++++++------ src/modules/network_data/controller/smf.go | 16 ++++++++------ src/modules/network_data/controller/smsc.go | 16 ++++++++------ .../network_data/repository/cdr_event.go | 7 +++---- .../network_data/repository/ue_event.go | 6 ++++-- .../system/controller/sys_log_login.go | 15 +++++++++++++ .../system/controller/sys_log_operate.go | 15 +++++++++++++ .../system/repository/sys_log_login.go | 21 +++++++------------ .../system/repository/sys_log_operate.go | 21 +++++++------------ 12 files changed, 111 insertions(+), 70 deletions(-) diff --git a/src/modules/network_data/controller/amf.go b/src/modules/network_data/controller/amf.go index 02bbed35..39a51bf0 100644 --- a/src/modules/network_data/controller/amf.go +++ b/src/modules/network_data/controller/amf.go @@ -49,10 +49,12 @@ type AMFController struct { func (s *AMFController) UEList(c *gin.Context) { language := reqctx.AcceptLanguage(c) query := reqctx.QueryMap(c) - // 限制导出数据集 + // 分页检查 + pageNum := parse.Number(query["pageNum"]) pageSize := parse.Number(query["pageSize"]) - if pageSize > 10000 { - query["pageSize"] = "10000" + if pageNum == 0 || pageSize == 0 { + c.JSON(422, resp.CodeMsg(resp.CODE_PARAM_CHEACK, "bind err: pageNum or pageSize not is empty")) + return } // 查询网元信息 rmUID neInfo := s.neInfoService.FindByNeTypeAndNeID(query["neType"], query["neId"]) @@ -119,10 +121,12 @@ func (s *AMFController) UERemove(c *gin.Context) { func (s *AMFController) UEExport(c *gin.Context) { language := reqctx.AcceptLanguage(c) query := reqctx.QueryMap(c) - // 限制导出数据集 + // 分页检查 + pageNum := parse.Number(query["pageNum"]) pageSize := parse.Number(query["pageSize"]) - if pageSize > 10000 { - query["pageSize"] = "10000" + if pageNum == 0 || pageSize == 0 { + c.JSON(422, resp.CodeMsg(resp.CODE_PARAM_CHEACK, "bind err: pageNum or pageSize not is empty")) + return } // 查询网元信息 rmUID neInfo := s.neInfoService.FindByNeTypeAndNeID(query["neType"], query["neId"]) diff --git a/src/modules/network_data/controller/ims.go b/src/modules/network_data/controller/ims.go index d8824015..9a59c461 100644 --- a/src/modules/network_data/controller/ims.go +++ b/src/modules/network_data/controller/ims.go @@ -52,10 +52,12 @@ type IMSController struct { func (s *IMSController) CDRList(c *gin.Context) { language := reqctx.AcceptLanguage(c) query := reqctx.QueryMap(c) - // 限制导出数据集 + // 分页检查 + pageNum := parse.Number(query["pageNum"]) pageSize := parse.Number(query["pageSize"]) - if pageSize > 10000 { - query["pageSize"] = "10000" + if pageNum == 0 || pageSize == 0 { + c.JSON(422, resp.CodeMsg(resp.CODE_PARAM_CHEACK, "bind err: pageNum or pageSize not is empty")) + return } // 查询网元信息 rmUID neInfo := s.neInfoService.FindByNeTypeAndNeID(query["neType"], query["neId"]) @@ -122,10 +124,12 @@ func (s *IMSController) CDRRemove(c *gin.Context) { func (s *IMSController) CDRExport(c *gin.Context) { language := reqctx.AcceptLanguage(c) query := reqctx.QueryMap(c) - // 限制导出数据集 + // 分页检查 + pageNum := parse.Number(query["pageNum"]) pageSize := parse.Number(query["pageSize"]) - if pageSize > 10000 { - query["pageSize"] = "10000" + if pageNum == 0 || pageSize == 0 { + c.JSON(422, resp.CodeMsg(resp.CODE_PARAM_CHEACK, "bind err: pageNum or pageSize not is empty")) + return } // 查询网元信息 rmUID neInfo := s.neInfoService.FindByNeTypeAndNeID(query["neType"], query["neId"]) diff --git a/src/modules/network_data/controller/mme.go b/src/modules/network_data/controller/mme.go index 057689ab..a69188fc 100644 --- a/src/modules/network_data/controller/mme.go +++ b/src/modules/network_data/controller/mme.go @@ -49,10 +49,12 @@ type MMEController struct { func (s *MMEController) UEList(c *gin.Context) { language := reqctx.AcceptLanguage(c) query := reqctx.QueryMap(c) - // 限制导出数据集 + // 分页检查 + pageNum := parse.Number(query["pageNum"]) pageSize := parse.Number(query["pageSize"]) - if pageSize > 10000 { - query["pageSize"] = "10000" + if pageNum == 0 || pageSize == 0 { + c.JSON(422, resp.CodeMsg(resp.CODE_PARAM_CHEACK, "bind err: pageNum or pageSize not is empty")) + return } // 查询网元信息 rmUID neInfo := s.neInfoService.FindByNeTypeAndNeID(query["neType"], query["neId"]) @@ -119,10 +121,12 @@ func (s *MMEController) UERemove(c *gin.Context) { func (s *MMEController) UEExport(c *gin.Context) { language := reqctx.AcceptLanguage(c) query := reqctx.QueryMap(c) - // 限制导出数据集 + // 分页检查 + pageNum := parse.Number(query["pageNum"]) pageSize := parse.Number(query["pageSize"]) - if pageSize > 10000 { - query["pageSize"] = "10000" + if pageNum == 0 || pageSize == 0 { + c.JSON(422, resp.CodeMsg(resp.CODE_PARAM_CHEACK, "bind err: pageNum or pageSize not is empty")) + return } // 查询网元信息 rmUID neInfo := s.neInfoService.FindByNeTypeAndNeID(query["neType"], query["neId"]) diff --git a/src/modules/network_data/controller/sgwc.go b/src/modules/network_data/controller/sgwc.go index ea7589ec..b6590c89 100644 --- a/src/modules/network_data/controller/sgwc.go +++ b/src/modules/network_data/controller/sgwc.go @@ -50,10 +50,12 @@ type SGWCController struct { func (s *SGWCController) CDRList(c *gin.Context) { language := reqctx.AcceptLanguage(c) query := reqctx.QueryMap(c) - // 限制导出数据集 + // 分页检查 + pageNum := parse.Number(query["pageNum"]) pageSize := parse.Number(query["pageSize"]) - if pageSize > 10000 { - query["pageSize"] = "10000" + if pageNum == 0 || pageSize == 0 { + c.JSON(422, resp.CodeMsg(resp.CODE_PARAM_CHEACK, "bind err: pageNum or pageSize not is empty")) + return } // 查询网元信息 rmUID neInfo := s.neInfoService.FindByNeTypeAndNeID(query["neType"], query["neId"]) @@ -120,10 +122,12 @@ func (s *SGWCController) CDRRemove(c *gin.Context) { func (s *SGWCController) CDRExport(c *gin.Context) { language := reqctx.AcceptLanguage(c) query := reqctx.QueryMap(c) - // 限制导出数据集 + // 分页检查 + pageNum := parse.Number(query["pageNum"]) pageSize := parse.Number(query["pageSize"]) - if pageSize > 10000 { - query["pageSize"] = "10000" + if pageNum == 0 || pageSize == 0 { + c.JSON(422, resp.CodeMsg(resp.CODE_PARAM_CHEACK, "bind err: pageNum or pageSize not is empty")) + return } // 查询网元信息 rmUID neInfo := s.neInfoService.FindByNeTypeAndNeID(query["neType"], query["neId"]) diff --git a/src/modules/network_data/controller/smf.go b/src/modules/network_data/controller/smf.go index e1e77d9b..a70f33a3 100644 --- a/src/modules/network_data/controller/smf.go +++ b/src/modules/network_data/controller/smf.go @@ -52,10 +52,12 @@ type SMFController struct { func (s *SMFController) CDRList(c *gin.Context) { language := reqctx.AcceptLanguage(c) query := reqctx.QueryMap(c) - // 限制导出数据集 + // 分页检查 + pageNum := parse.Number(query["pageNum"]) pageSize := parse.Number(query["pageSize"]) - if pageSize > 10000 { - query["pageSize"] = "10000" + if pageNum == 0 || pageSize == 0 { + c.JSON(422, resp.CodeMsg(resp.CODE_PARAM_CHEACK, "bind err: pageNum or pageSize not is empty")) + return } // 查询网元信息 rmUID neInfo := s.neInfoService.FindByNeTypeAndNeID(query["neType"], query["neId"]) @@ -122,10 +124,12 @@ func (s *SMFController) CDRRemove(c *gin.Context) { func (s *SMFController) CDRExport(c *gin.Context) { language := reqctx.AcceptLanguage(c) query := reqctx.QueryMap(c) - // 限制导出数据集 + // 分页检查 + pageNum := parse.Number(query["pageNum"]) pageSize := parse.Number(query["pageSize"]) - if pageSize > 10000 { - query["pageSize"] = "10000" + if pageNum == 0 || pageSize == 0 { + c.JSON(422, resp.CodeMsg(resp.CODE_PARAM_CHEACK, "bind err: pageNum or pageSize not is empty")) + return } // 查询网元信息 rmUID neInfo := s.neInfoService.FindByNeTypeAndNeID(query["neType"], query["neId"]) diff --git a/src/modules/network_data/controller/smsc.go b/src/modules/network_data/controller/smsc.go index f3efc33e..6d3f6ac7 100644 --- a/src/modules/network_data/controller/smsc.go +++ b/src/modules/network_data/controller/smsc.go @@ -49,10 +49,12 @@ type SMSCController struct { func (s *SMSCController) CDRList(c *gin.Context) { language := reqctx.AcceptLanguage(c) query := reqctx.QueryMap(c) - // 限制导出数据集 + // 分页检查 + pageNum := parse.Number(query["pageNum"]) pageSize := parse.Number(query["pageSize"]) - if pageSize > 10000 { - query["pageSize"] = "10000" + if pageNum == 0 || pageSize == 0 { + c.JSON(422, resp.CodeMsg(resp.CODE_PARAM_CHEACK, "bind err: pageNum or pageSize not is empty")) + return } // 查询网元信息 rmUID neInfo := s.neInfoService.FindByNeTypeAndNeID(query["neType"], query["neId"]) @@ -119,10 +121,12 @@ func (s *SMSCController) CDRRemove(c *gin.Context) { func (s *SMSCController) CDRExport(c *gin.Context) { language := reqctx.AcceptLanguage(c) query := reqctx.QueryMap(c) - // 限制导出数据集 + // 分页检查 + pageNum := parse.Number(query["pageNum"]) pageSize := parse.Number(query["pageSize"]) - if pageSize > 10000 { - query["pageSize"] = "10000" + if pageNum == 0 || pageSize == 0 { + c.JSON(422, resp.CodeMsg(resp.CODE_PARAM_CHEACK, "bind err: pageNum or pageSize not is empty")) + return } // 查询网元信息 rmUID neInfo := s.neInfoService.FindByNeTypeAndNeID(query["neType"], query["neId"]) diff --git a/src/modules/network_data/repository/cdr_event.go b/src/modules/network_data/repository/cdr_event.go index ee7783dd..37ef1c33 100644 --- a/src/modules/network_data/repository/cdr_event.go +++ b/src/modules/network_data/repository/cdr_event.go @@ -91,11 +91,10 @@ func (r CDREvent) SelectByPage(neType string, query map[string]string) ([]model. } // 分页 - pageNum, pageSize := db.PageNumSize(query["pageNum"], query["pageSize"]) - if pageNum == 0 && pageSize > int(total) { - pageSize = int(total) + if query["pageNum"] != "" && query["pageSize"] != "" { + pageNum, pageSize := db.PageNumSize(query["pageNum"], query["pageSize"]) + tx = tx.Offset(int(pageNum * pageSize)).Limit(int(pageSize)) } - tx = tx.Offset(int(pageNum * pageSize)).Limit(int(pageSize)) // 查询数据 if err := tx.Find(&rows).Error; err != nil { diff --git a/src/modules/network_data/repository/ue_event.go b/src/modules/network_data/repository/ue_event.go index eee193e7..713532c3 100644 --- a/src/modules/network_data/repository/ue_event.go +++ b/src/modules/network_data/repository/ue_event.go @@ -56,8 +56,10 @@ func (r UEEvent) SelectByPage(neType string, query map[string]string) ([]model.U } // 分页 - pageNum, pageSize := db.PageNumSize(query["pageNum"], query["pageSize"]) - tx = tx.Offset(int(pageNum * pageSize)).Limit(int(pageSize)) + if query["pageNum"] != "" && query["pageSize"] != "" { + pageNum, pageSize := db.PageNumSize(query["pageNum"], query["pageSize"]) + tx = tx.Offset(int(pageNum * pageSize)).Limit(int(pageSize)) + } // 查询数据 if err := tx.Find(&rows).Error; err != nil { diff --git a/src/modules/system/controller/sys_log_login.go b/src/modules/system/controller/sys_log_login.go index 7f454fe6..35578a25 100644 --- a/src/modules/system/controller/sys_log_login.go +++ b/src/modules/system/controller/sys_log_login.go @@ -10,6 +10,7 @@ import ( "be.ems/src/framework/resp" "be.ems/src/framework/utils/date" "be.ems/src/framework/utils/file" + "be.ems/src/framework/utils/parse" authService "be.ems/src/modules/auth/service" "be.ems/src/modules/system/model" "be.ems/src/modules/system/service" @@ -48,6 +49,13 @@ type SysLogLoginController struct { // @Router /system/log/login/list [get] func (s *SysLogLoginController) List(c *gin.Context) { query := reqctx.QueryMap(c) + // 分页检查 + pageNum := parse.Number(query["pageNum"]) + pageSize := parse.Number(query["pageSize"]) + if pageNum == 0 || pageSize == 0 { + c.JSON(422, resp.CodeMsg(resp.CODE_PARAM_CHEACK, "bind err: pageNum or pageSize not is empty")) + return + } dataScopeSQL := reqctx.LoginUserToDataScopeSQL(c, "sys_user", "sys_user") rows, total := s.sysLogLoginService.FindByPage(query, dataScopeSQL) @@ -99,6 +107,13 @@ func (s SysLogLoginController) Export(c *gin.Context) { language := reqctx.AcceptLanguage(c) // 查询结果，根据查询条件结果，单页最大值限制 query := reqctx.QueryMap(c) + // 分页检查 + pageNum := parse.Number(query["pageNum"]) + pageSize := parse.Number(query["pageSize"]) + if pageNum == 0 || pageSize == 0 { + c.JSON(422, resp.CodeMsg(resp.CODE_PARAM_CHEACK, "bind err: pageNum or pageSize not is empty")) + return + } dataScopeSQL := reqctx.LoginUserToDataScopeSQL(c, "sys_user", "sys_user") rows, total := s.sysLogLoginService.FindByPage(query, dataScopeSQL) if total == 0 { diff --git a/src/modules/system/controller/sys_log_operate.go b/src/modules/system/controller/sys_log_operate.go index 4cc46e62..e0c1e3ea 100644 --- a/src/modules/system/controller/sys_log_operate.go +++ b/src/modules/system/controller/sys_log_operate.go @@ -10,6 +10,7 @@ import ( "be.ems/src/framework/resp" "be.ems/src/framework/utils/date" "be.ems/src/framework/utils/file" + "be.ems/src/framework/utils/parse" "be.ems/src/modules/system/model" "be.ems/src/modules/system/service" @@ -50,6 +51,13 @@ func (s *SysLogOperateController) List(c *gin.Context) { if v, ok := query["title"]; ok && v != "" { query["title"] = i18n.TFindKeyPrefix(language, "log.operate.title", v) } + // 分页检查 + pageNum := parse.Number(query["pageNum"]) + pageSize := parse.Number(query["pageSize"]) + if pageNum == 0 || pageSize == 0 { + c.JSON(422, resp.CodeMsg(resp.CODE_PARAM_CHEACK, "bind err: pageNum or pageSize not is empty")) + return + } dataScopeSQL := reqctx.LoginUserToDataScopeSQL(c, "sys_user", "sys_user") rows, total := s.sysLogOperateService.FindByPage(query, dataScopeSQL) @@ -81,6 +89,13 @@ func (s SysLogOperateController) Export(c *gin.Context) { language := reqctx.AcceptLanguage(c) // 查询结果，根据查询条件结果，单页最大值限制 query := reqctx.QueryMap(c) + // 分页检查 + pageNum := parse.Number(query["pageNum"]) + pageSize := parse.Number(query["pageSize"]) + if pageNum == 0 || pageSize == 0 { + c.JSON(422, resp.CodeMsg(resp.CODE_PARAM_CHEACK, "bind err: pageNum or pageSize not is empty")) + return + } dataScopeSQL := reqctx.LoginUserToDataScopeSQL(c, "sys_user", "sys_user") rows, total := s.sysLogOperateService.FindByPage(query, dataScopeSQL) if total == 0 { diff --git a/src/modules/system/repository/sys_log_login.go b/src/modules/system/repository/sys_log_login.go index 3f412e5b..39a1a4f6 100644 --- a/src/modules/system/repository/sys_log_login.go +++ b/src/modules/system/repository/sys_log_login.go @@ -29,20 +29,10 @@ func (r SysLogLogin) SelectByPage(query map[string]string, dataScopeSQL string) tx = tx.Where("status_flag = ?", v) } if v, ok := query["beginTime"]; ok && v != "" { - if len(v) == 10 { - v = fmt.Sprintf("%s000", v) - tx = tx.Where("login_time >= ?", v) - } else if len(v) == 13 { - tx = tx.Where("login_time >= ?", v) - } + tx = tx.Where("login_time >= ?", v) } if v, ok := query["endTime"]; ok && v != "" { - if len(v) == 10 { - v = fmt.Sprintf("%s999", v) - tx = tx.Where("login_time <= ?", v) - } else if len(v) == 13 { - tx = tx.Where("login_time <= ?", v) - } + tx = tx.Where("login_time <= ?", v) } if dataScopeSQL != "" { dataScopeSQL = fmt.Sprintf("select distinct user_name from sys_user where %s", dataScopeSQL) @@ -59,8 +49,11 @@ func (r SysLogLogin) SelectByPage(query map[string]string, dataScopeSQL string) } // 查询数据分页 - pageNum, pageSize := db.PageNumSize(query["pageNum"], query["pageSize"]) - tx = tx.Limit(pageSize).Offset(pageSize * pageNum) + if query["pageNum"] != "" && query["pageSize"] != "" { + pageNum, pageSize := db.PageNumSize(query["pageNum"], query["pageSize"]) + tx = tx.Limit(pageSize).Offset(pageSize * pageNum) + } + err := tx.Order("id desc").Find(&rows).Error if err != nil { logger.Errorf("query find err => %v", err.Error()) diff --git a/src/modules/system/repository/sys_log_operate.go b/src/modules/system/repository/sys_log_operate.go index 0c8cccb7..10f8ba87 100644 --- a/src/modules/system/repository/sys_log_operate.go +++ b/src/modules/system/repository/sys_log_operate.go @@ -35,20 +35,10 @@ func (r SysLogOperate) SelectByPage(query map[string]string, dataScopeSQL string tx = tx.Where("status_flag = ?", v) } if v, ok := query["beginTime"]; ok && v != "" { - if len(v) == 10 { - v = fmt.Sprintf("%s000", v) - tx = tx.Where("opera_time >= ?", v) - } else if len(v) == 13 { - tx = tx.Where("opera_time >= ?", v) - } + tx = tx.Where("opera_time <= ?", v) } if v, ok := query["endTime"]; ok && v != "" { - if len(v) == 10 { - v = fmt.Sprintf("%s999", v) - tx = tx.Where("opera_time <= ?", v) - } else if len(v) == 13 { - tx = tx.Where("opera_time <= ?", v) - } + tx = tx.Where("opera_time <= ?", v) } if dataScopeSQL != "" { dataScopeSQL = fmt.Sprintf("select distinct user_name from sys_user where %s", dataScopeSQL) @@ -65,8 +55,11 @@ func (r SysLogOperate) SelectByPage(query map[string]string, dataScopeSQL string } // 查询数据分页 - pageNum, pageSize := db.PageNumSize(query["pageNum"], query["pageSize"]) - tx = tx.Limit(pageSize).Offset(pageSize * pageNum) + if query["pageNum"] != "" && query["pageSize"] != "" { + pageNum, pageSize := db.PageNumSize(query["pageNum"], query["pageSize"]) + tx = tx.Limit(pageSize).Offset(pageSize * pageNum) + } + err := tx.Order("id desc").Find(&rows).Error if err != nil { logger.Errorf("query find err => %v", err.Error())