TRKJ/EdgeAPI
2
0
Fork 0
mirror of https://github.com/TeaOSLab/EdgeAPI.git synced 2025-11-04 16:00:24 +08:00
Code Issues Packages Projects Releases Wiki Activity

修复按日带宽峰值查询错误的Bug

Browse Source
This commit is contained in:
刘祥超
2022-09-20 13:57:45 +08:00
parent afb35953e7
commit 6f8c5a8e99
2 changed files with 7 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
internal/db/models/server_bandwidth_stat_dao.go
View File

@@ -85,8 +85,8 @@ func (this *ServerBandwidthStatDAO) UpdateServerBandwidth(tx *dbs.Tx, userId int
func (this *ServerBandwidthStatDAO) FindMinutelyPeekBandwidthBytes(tx *dbs.Tx, serverId int64, day string, minute string) (int64, error) { func (this *ServerBandwidthStatDAO) FindMinutelyPeekBandwidthBytes(tx *dbs.Tx, serverId int64, day string, minute string) (int64, error) {
return this.Query(tx). return this.Query(tx).
Table(this.partialTable(serverId)). Table(this.partialTable(serverId)).
Result("bytes").
Attr("serverId", serverId). Attr("serverId", serverId).
Result("bytes").
Attr("day", day). Attr("day", day).
Attr("timeAt", minute). Attr("timeAt", minute).
FindInt64Col(0) FindInt64Col(0)
@@ -102,8 +102,8 @@ func (this *ServerBandwidthStatDAO) FindHourlyBandwidthStats(tx *dbs.Tx, serverI
ones, _, err := this.Query(tx). ones, _, err := this.Query(tx).
Table(this.partialTable(serverId)). Table(this.partialTable(serverId)).
Result("MAX(bytes) AS bytes", "CONCAT(day, '.', SUBSTRING(timeAt, 1, 2)) AS fullTime").
Attr("serverId", serverId). Attr("serverId", serverId).
Result("MAX(bytes) AS bytes", "CONCAT(day, '.', SUBSTRING(timeAt, 1, 2)) AS fullTime").
Gte("CONCAT(day, '.', SUBSTRING(timeAt, 1, 2))", timeutil.FormatTime("Ymd.H", timestamp)). Gte("CONCAT(day, '.', SUBSTRING(timeAt, 1, 2))", timeutil.FormatTime("Ymd.H", timestamp)).
Group("fullTime"). Group("fullTime").
FindOnes() FindOnes()
@@ -150,6 +150,7 @@ func (this *ServerBandwidthStatDAO) FindHourlyBandwidthStats(tx *dbs.Tx, serverI
func (this *ServerBandwidthStatDAO) FindDailyPeekBandwidthBytes(tx *dbs.Tx, serverId int64, day string) (int64, error) { func (this *ServerBandwidthStatDAO) FindDailyPeekBandwidthBytes(tx *dbs.Tx, serverId int64, day string) (int64, error) {
return this.Query(tx). return this.Query(tx).
Table(this.partialTable(serverId)). Table(this.partialTable(serverId)).
Attr("serverId", serverId).
Attr("day", day). Attr("day", day).
Result("MAX(bytes)"). Result("MAX(bytes)").
FindInt64Col(0) FindInt64Col(0)
@@ -265,8 +266,8 @@ func (this *ServerBandwidthStatDAO) FindMonthlyPercentile(tx *dbs.Tx, serverId i
if percentile >= 100 { if percentile >= 100 {
result, err = this.Query(tx). result, err = this.Query(tx).
Table(this.partialTable(serverId)). Table(this.partialTable(serverId)).
Result("bytes").
Attr("serverId", serverId). Attr("serverId", serverId).
Result("bytes").
Between("day", month+"01", month+"31"). Between("day", month+"01", month+"31").
Desc("bytes"). Desc("bytes").
Limit(1). Limit(1).
@@ -296,8 +297,8 @@ func (this *ServerBandwidthStatDAO) FindMonthlyPercentile(tx *dbs.Tx, serverId i
// 查询 nth 位置 // 查询 nth 位置
result, err = this.Query(tx). result, err = this.Query(tx).
Table(this.partialTable(serverId)). Table(this.partialTable(serverId)).
Result("bytes").
Attr("serverId", serverId). Attr("serverId", serverId).
Result("bytes").
Between("day", month+"01", month+"31"). Between("day", month+"01", month+"31").
Desc("bytes"). Desc("bytes").
Offset(offset). Offset(offset).
@@ -309,7 +310,7 @@ func (this *ServerBandwidthStatDAO) FindMonthlyPercentile(tx *dbs.Tx, serverId i
// Clean 清理过期数据 // Clean 清理过期数据
func (this *ServerBandwidthStatDAO) Clean(tx *dbs.Tx) error { func (this *ServerBandwidthStatDAO) Clean(tx *dbs.Tx) error {
var day = timeutil.Format("Ymd", time.Now().AddDate(0, 0, -62)) // 保留大约2个月的数据 var day = timeutil.Format("Ymd", time.Now().AddDate(0, 0, -100)) // 保留大约3个月的数据
return this.runBatch(func(table string, locker *sync.Mutex) error { return this.runBatch(func(table string, locker *sync.Mutex) error {
_, err := this.Query(tx). _, err := this.Query(tx).
Table(table). Table(table).

2
internal/db/models/user_bandwidth_stat_dao.go
View File

@@ -106,7 +106,7 @@ func (this *UserBandwidthStatDAO) FindUserPeekBandwidthInDay(tx *dbs.Tx, userId
// Clean 清理过期数据 // Clean 清理过期数据
func (this *UserBandwidthStatDAO) Clean(tx *dbs.Tx) error { func (this *UserBandwidthStatDAO) Clean(tx *dbs.Tx) error {
var day = timeutil.Format("Ymd", time.Now().AddDate(0, 0, -62)) // 保留大约2个月的数据 var day = timeutil.Format("Ymd", time.Now().AddDate(0, 0, -100)) // 保留大约3个月的数据
return this.runBatch(func(table string, locker *sync.Mutex) error { return this.runBatch(func(table string, locker *sync.Mutex) error {
_, err := this.Query(tx). _, err := this.Query(tx).
Table(table). Table(table).