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

减少带宽统计显示的空档期

Browse Source
This commit is contained in:
GoEdgeLab
2022-09-05 16:04:34 +08:00
parent 088e414e7f
commit 746ac573ab
3 changed files with 18 additions and 19 deletions
Download Patch File Download Diff File Expand all files Collapse all files

21
internal/db/models/server_dao.go
View File

@@ -862,20 +862,21 @@ func (this *ServerDAO) ListEnabledServersMatch(tx *dbs.Tx, offset int64, size in
}
// 排序
var timestamp = time.Now().Unix() / 300 * 300
var currentTime = timeutil.FormatTime("YmdHi", timestamp)
var prevTime = timeutil.FormatTime("YmdHi", timestamp-300)
var timestamp = (time.Now().Unix()) / 300 * 300
var times = []string{
timeutil.FormatTime("YmdHi", timestamp),
timeutil.FormatTime("YmdHi", timestamp-300),
timeutil.FormatTime("YmdHi", timestamp-300*2),
}
switch order {
case "trafficOutAsc":
query.Asc("IF(IF(bandwidthTime=:currentTime, bandwidthBytes, 0) > 0, IF(bandwidthTime=:currentTime, bandwidthBytes, 0), IF(bandwidthTime=:prevTime, bandwidthBytes, 0))")
query.Param("currentTime", currentTime)
query.Param("prevTime", prevTime)
query.Asc("IF(FIND_IN_SET(bandwidthTime, :times), bandwidthBytes, 0)")
query.Param("times", strings.Join(times, ","))
query.DescPk()
case "trafficOutDesc":
query.Desc("IF(IF(bandwidthTime=:currentTime, bandwidthBytes, 0) > 0, IF(bandwidthTime=:currentTime, bandwidthBytes, 0), IF(bandwidthTime=:prevTime, bandwidthBytes, 0))")
query.Param("currentTime", currentTime)
query.Param("prevTime", prevTime)
query.Desc("IF(FIND_IN_SET(bandwidthTime, :times), bandwidthBytes, 0)")
query.Param("times", strings.Join(times, ","))
query.DescPk()
default:
query.DescPk()
@@ -885,7 +886,7 @@ func (this *ServerDAO) ListEnabledServersMatch(tx *dbs.Tx, offset int64, size in
// 修正带宽统计数据
for _, server := range result {
if len(server.BandwidthTime) > 0 && server.BandwidthBytes > 0 && server.BandwidthTime < prevTime {
if len(server.BandwidthTime) > 0 && !lists.ContainsString(times, server.BandwidthTime) {
server.BandwidthBytes = 0
}
}