github_mirrors/hotgo
1
0
Fork 0
mirror of https://github.com/bufanyun/hotgo.git synced 2025-08-26 16:46:14 +08:00
Code Issues Packages Projects Releases Wiki Activity

更新gf版本到v2.2.5

Browse Source
This commit is contained in:
孟帅
2022-12-11 20:48:18 +08:00
parent e990ce28a1
commit 6b3333340f
41 changed files with 470 additions and 613 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
server/internal/model/input/adminin/role.go
View File

@@ -14,8 +14,8 @@ import (
// RoleListInp 获取列表
type RoleListInp struct {
Page int
PerPage int
Page int64
PerPage int64
}
type RoleListModel struct {

22
server/internal/model/input/form/base.go
View File

@@ -12,17 +12,17 @@ import (
)
var (
page int
pageSize int
page int64
pageSize int64
)
// DefaultPageSize 列表分页默认加载页码
func DefaultPageSize(ctx context.Context) int {
func DefaultPageSize(ctx context.Context) int64 {
if pageSize > 0 {
return pageSize
}
defaultPageSize, _ := g.Cfg().Get(ctx, "hotgo.admin.defaultPageSize", 10)
pageSize = defaultPageSize.Int()
pageSize = defaultPageSize.Int64()
if pageSize <= 0 {
pageSize = 10
}
@@ -30,12 +30,12 @@ func DefaultPageSize(ctx context.Context) int {
}
// DefaultPage 列表分页默认加载数量
func DefaultPage(ctx context.Context) int {
func DefaultPage(ctx context.Context) int64 {
if page > 0 {
return page
}
defaultPage, _ := g.Cfg().Get(ctx, "hotgo.admin.defaultPage", 1)
page = defaultPage.Int()
page = defaultPage.Int64()
if page <= 0 {
page = 10
}
@@ -44,12 +44,12 @@ func DefaultPage(ctx context.Context) int {
// PageReq 分页
type PageReq struct {
Page int `json:"page" example:"10" d:"1" v:"min:1#页码最小值不能低于1" dc:"当前页码"`
PerPage int `json:"pageSize" example:"1" d:"10" v:"min:1|max:100#|每页数量最小值不能低于1|最大值不能大于100" dc:"每页数量"`
Page int64 `json:"page" example:"10" d:"1" v:"min:1#页码最小值不能低于1" dc:"当前页码"`
PerPage int64 `json:"pageSize" example:"1" d:"10" v:"min:1|max:100#|每页数量最小值不能低于1|最大值不能大于100" dc:"每页数量"`
}
type PageRes struct {
PageReq
PageCount int `json:"pageCount" example:"0" dc:"全部数据量"`
PageCount int64 `json:"pageCount" example:"0" dc:"全部数据量"`
}
// RangeDateReq 时间查询
@@ -64,7 +64,7 @@ type StatusReq struct {
}
// CalPage 解析分页
func CalPage(ctx context.Context, page, perPage int) (newPage, newPerPage int, offset int) {
func CalPage(ctx context.Context, page, perPage int64) (newPage, newPerPage int64, offset int64) {
if page <= 0 {
newPage = DefaultPage(ctx)
} else {
@@ -80,6 +80,6 @@ func CalPage(ctx context.Context, page, perPage int) (newPage, newPerPage int, o
return
}
func CalPageCount(totalCount, perPage int) int {
func CalPageCount(totalCount int64, perPage int64) int64 {
return (totalCount + perPage - 1) / perPage
}