feat 导出查询去除最大记录数限制，查询分页检查

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 {
+	if pageNum == 0 || pageSize == 0 {
-		query["pageSize"] = "10000"
+		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 {
+	if pageNum == 0 || pageSize == 0 {
-		query["pageSize"] = "10000"
+		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"])

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 {
+	if pageNum == 0 || pageSize == 0 {
-		query["pageSize"] = "10000"
+		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 {
+	if pageNum == 0 || pageSize == 0 {
-		query["pageSize"] = "10000"
+		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"])

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 {
+	if pageNum == 0 || pageSize == 0 {
-		query["pageSize"] = "10000"
+		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 {
+	if pageNum == 0 || pageSize == 0 {
-		query["pageSize"] = "10000"
+		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"])

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 {
+	if pageNum == 0 || pageSize == 0 {
-		query["pageSize"] = "10000"
+		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 {
+	if pageNum == 0 || pageSize == 0 {
-		query["pageSize"] = "10000"
+		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"])

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 {
+	if pageNum == 0 || pageSize == 0 {
-		query["pageSize"] = "10000"
+		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 {
+	if pageNum == 0 || pageSize == 0 {
-		query["pageSize"] = "10000"
+		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"])

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 {
+	if pageNum == 0 || pageSize == 0 {
-		query["pageSize"] = "10000"
+		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 {
+	if pageNum == 0 || pageSize == 0 {
-		query["pageSize"] = "10000"
+		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"])

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 query["pageNum"] != "" && query["pageSize"] != "" {
-	if pageNum == 0 && pageSize > int(total) {
+		pageNum, pageSize := db.PageNumSize(query["pageNum"], query["pageSize"])
-		pageSize = int(total)
+		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 {

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"])
+	if query["pageNum"] != "" && query["pageSize"] != "" {
-	tx = tx.Offset(int(pageNum * pageSize)).Limit(int(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 {

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 {

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 {

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 {
+		tx = tx.Where("login_time >= ?", v)
-			v = fmt.Sprintf("%s000", v)
-			tx = tx.Where("login_time >= ?", v)
-		} else if len(v) == 13 {
-			tx = tx.Where("login_time >= ?", v)
-		}
 	}
 	if v, ok := query["endTime"]; ok && v != "" {
-		if len(v) == 10 {
+		tx = tx.Where("login_time <= ?", v)
-			v = fmt.Sprintf("%s999", v)
-			tx = tx.Where("login_time <= ?", v)
-		} else if len(v) == 13 {
-			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"])
+	if query["pageNum"] != "" && query["pageSize"] != "" {
-	tx = tx.Limit(pageSize).Offset(pageSize * pageNum)
+		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())

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 {
+		tx = tx.Where("opera_time <= ?", v)
-			v = fmt.Sprintf("%s000", v)
-			tx = tx.Where("opera_time >= ?", v)
-		} else if len(v) == 13 {
-			tx = tx.Where("opera_time >= ?", v)
-		}
 	}
 	if v, ok := query["endTime"]; ok && v != "" {
-		if len(v) == 10 {
+		tx = tx.Where("opera_time <= ?", v)
-			v = fmt.Sprintf("%s999", v)
-			tx = tx.Where("opera_time <= ?", v)
-		} else if len(v) == 13 {
-			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"])
+	if query["pageNum"] != "" && query["pageSize"] != "" {
-	tx = tx.Limit(pageSize).Offset(pageSize * pageNum)
+		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())