mirror of
https://github.com/skyle1995/NetworkAuth.git
synced 2026-05-25 02:24:05 +08:00
Optimize the pagination code to reduce code redundancy
This commit is contained in:
@@ -38,18 +38,7 @@ func VariableFragmentHandler(c *gin.Context) {
|
||||
// VariableListHandler 变量列表API处理器
|
||||
func VariableListHandler(c *gin.Context) {
|
||||
// 获取分页参数
|
||||
page, _ := strconv.Atoi(c.Query("page"))
|
||||
if page <= 0 {
|
||||
page = 1
|
||||
}
|
||||
limit, _ := strconv.Atoi(c.Query("limit"))
|
||||
// 兼容前端使用的page_size参数
|
||||
if limit <= 0 {
|
||||
limit, _ = strconv.Atoi(c.Query("page_size"))
|
||||
}
|
||||
if limit <= 0 {
|
||||
limit = 10
|
||||
}
|
||||
page, limit := variableBaseController.GetPaginationParams(c)
|
||||
|
||||
// 获取搜索关键词参数(支持编号、别名、数据的综合搜索)
|
||||
search := strings.TrimSpace(c.Query("search"))
|
||||
@@ -83,18 +72,9 @@ func VariableListHandler(c *gin.Context) {
|
||||
query = query.Where("app_uuid = ?", appUUID)
|
||||
}
|
||||
|
||||
// 获取总数
|
||||
var total int64
|
||||
if err := query.Count(&total).Error; err != nil {
|
||||
logrus.WithError(err).Error("Failed to count variables")
|
||||
variableBaseController.HandleInternalError(c, "查询变量总数失败", err)
|
||||
return
|
||||
}
|
||||
|
||||
// 获取分页数据
|
||||
var variables []models.Variable
|
||||
offset := (page - 1) * limit
|
||||
if err := query.Offset(offset).Limit(limit).Order("created_at DESC").Find(&variables).Error; err != nil {
|
||||
// 泛型分页查询
|
||||
variables, total, err := services.Paginate[models.Variable](query, page, limit, "created_at DESC")
|
||||
if err != nil {
|
||||
logrus.WithError(err).Error("Failed to fetch variables")
|
||||
variableBaseController.HandleInternalError(c, "查询变量列表失败", err)
|
||||
return
|
||||
|
||||
Reference in New Issue
Block a user