lanhu/platform
2
0
Fork 0
Code Issues Actions Packages Releases 15 Activity

修复提取并发问题 & 修复接口时区问题

Browse Source
This commit is contained in:
luorijun
2026-05-18 13:54:01 +08:00
parent 8f89503c88
commit 71554da541
16 changed files with 386 additions and 239 deletions
Download Patch File Download Diff File Expand all files Collapse all files

40
web/handlers/resource.go
View File

@@ -44,16 +44,20 @@ func PageResourceShort(c *fiber.Ctx) error {
do.Where(q.ResourceShort.As(q.Resource.Short.Name()).Type.Eq(*req.Type))
}
if req.CreateAfter != nil {
do.Where(q.Resource.CreatedAt.Gte(*req.CreateAfter))
start := u.DateHead(*req.CreateAfter)
do = do.Where(q.Resource.CreatedAt.Gte(start))
}
if req.CreateBefore != nil {
do.Where(q.Resource.CreatedAt.Lte(*req.CreateBefore))
end := u.DateTail(*req.CreateBefore)
do = do.Where(q.Resource.CreatedAt.Lte(end))
}
if req.ExpireAfter != nil {
do.Where(q.ResourceShort.As(q.Resource.Short.Name()).ExpireAt.Gte(*req.ExpireAfter))
start := u.DateHead(*req.ExpireAfter)
do = do.Where(q.ResourceShort.As(q.Resource.Short.Name()).ExpireAt.Gte(start))
}
if req.ExpireBefore != nil {
do.Where(q.ResourceShort.As(q.Resource.Short.Name()).ExpireAt.Lte(*req.ExpireBefore))
end := u.DateTail(*req.ExpireBefore)
do = do.Where(q.ResourceShort.As(q.Resource.Short.Name()).ExpireAt.Lte(end))
}
if req.Status != nil {
var short = q.ResourceShort.As(q.Resource.Short.Name())
@@ -69,7 +73,7 @@ func PageResourceShort(c *fiber.Ctx) error {
}
}
resource, err := q.Resource.Where(do).
resource, err := q.Resource.Where(do).Debug().
Joins(q.Resource.Short).
Order(q.Resource.CreatedAt.Desc()).
Offset(req.GetOffset()).
@@ -141,16 +145,20 @@ func PageResourceLong(c *fiber.Ctx) error {
do.Where(q.ResourceLong.As(q.Resource.Long.Name()).Type.Eq(int(*req.Type)))
}
if req.CreateAfter != nil {
do.Where(q.Resource.CreatedAt.Gte(*req.CreateAfter))
start := u.DateHead(*req.CreateAfter)
do = do.Where(q.Resource.CreatedAt.Gte(start))
}
if req.CreateBefore != nil {
do.Where(q.Resource.CreatedAt.Lte(*req.CreateBefore))
end := u.DateTail(*req.CreateBefore)
do = do.Where(q.Resource.CreatedAt.Lte(end))
}
if req.ExpireAfter != nil {
do.Where(q.ResourceLong.As(q.Resource.Long.Name()).ExpireAt.Gte(*req.ExpireAfter))
start := u.DateHead(*req.ExpireAfter)
do = do.Where(q.ResourceLong.As(q.Resource.Long.Name()).ExpireAt.Gte(start))
}
if req.ExpireBefore != nil {
do.Where(q.ResourceLong.As(q.Resource.Long.Name()).ExpireAt.Lte(*req.ExpireBefore))
end := u.DateTail(*req.ExpireBefore)
do = do.Where(q.ResourceLong.As(q.Resource.Long.Name()).ExpireAt.Lte(end))
}
if req.Status != nil {
var long = q.ResourceLong.As(q.Resource.Long.Name())
@@ -166,7 +174,7 @@ func PageResourceLong(c *fiber.Ctx) error {
}
}
resource, err := q.Resource.Where(do).
resource, err := q.Resource.Where(do).Debug().
Joins(q.Resource.Long).
Order(q.Resource.CreatedAt.Desc()).
Offset(req.GetOffset()).
@@ -329,10 +337,12 @@ func PageResourceLongByAdmin(c *fiber.Ctx) error {
do = do.Where(q.ResourceLong.As("Long").Type.Eq(*req.Mode))
}
if req.CreatedAtStart != nil {
do = do.Where(q.Resource.CreatedAt.Gte(*req.CreatedAtStart))
start := u.DateHead(*req.CreatedAtStart)
do = do.Where(q.Resource.CreatedAt.Gte(start))
}
if req.CreatedAtEnd != nil {
do = do.Where(q.Resource.CreatedAt.Lte(*req.CreatedAtEnd))
end := u.DateTail(*req.CreatedAtEnd)
do = do.Where(q.Resource.CreatedAt.Lte(end))
}
if req.Expired != nil {
if *req.Expired {
@@ -755,10 +765,12 @@ func StatisticResourceUsage(c *fiber.Ctx) error {
)
if req.TimeAfter != nil {
do.Where(q.LogsUserUsage.Time.Gte(*req.TimeAfter))
start := u.DateHead(*req.TimeAfter)
do = do.Where(q.LogsUserUsage.Time.Gte(start))
}
if req.TimeBefore != nil {
do.Where(q.LogsUserUsage.Time.Lte(*req.TimeBefore))
end := u.DateTail(*req.TimeBefore)
do = do.Where(q.LogsUserUsage.Time.Lte(end))
}
var data = new(StatisticResourceUsageResp)