TRKJ/EdgeAPI
2
0
Fork 0
mirror of https://github.com/TeaOSLab/EdgeAPI.git synced 2025-12-19 01:46:35 +08:00
Code Issues Packages Projects Releases Wiki Activity

查询5分钟流量接口增加timeFrom和timeTo参数

Browse Source
This commit is contained in:
刘祥超
2022-09-24 18:55:33 +08:00
parent 08b1c038f1
commit 8f8b611ac1
2 changed files with 13 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

15
internal/db/models/server_daily_stat_dao.go
View File

@@ -439,15 +439,24 @@ func (this *ServerDailyStatDAO) FindDailyStats(tx *dbs.Tx, serverId int64, dayFr
// FindStatsWithDay 按天查找5分钟级统计 // FindStatsWithDay 按天查找5分钟级统计
// day YYYYMMDD // day YYYYMMDD
func (this *ServerDailyStatDAO) FindStatsWithDay(tx *dbs.Tx, serverId int64, day string) (result []*ServerDailyStat, err error) { func (this *ServerDailyStatDAO) FindStatsWithDay(tx *dbs.Tx, serverId int64, day string, timeFrom string, timeTo string) (result []*ServerDailyStat, err error) {
if !regexp.MustCompile(`^\d{8}$`).MatchString(day) { if !regexp.MustCompile(`^\d{8}$`).MatchString(day) {
return return
} }
_, err = this.Query(tx). var query = this.Query(tx).
Attr("serverId", serverId). Attr("serverId", serverId).
Attr("day", day). Attr("day", day).
AscPk(). DescPk()
if len(timeFrom) > 0 {
query.Gte("timeFrom", timeFrom)
}
if len(timeTo) > 0 {
query.Lte("timeTo", timeTo)
}
_, err = query.
Slice(&result). Slice(&result).
FindAll() FindAll()
return return

2
internal/rpc/services/service_server_daily_stat.go
View File

@@ -204,7 +204,7 @@ func (this *ServerDailyStatService) FindServer5MinutelyStatsWithDay(ctx context.
req.Day = timeutil.Format("Ymd") req.Day = timeutil.Format("Ymd")
} }
dailyStats, err := models.SharedServerDailyStatDAO.FindStatsWithDay(tx, req.ServerId, req.Day) dailyStats, err := models.SharedServerDailyStatDAO.FindStatsWithDay(tx, req.ServerId, req.Day, req.TimeFrom, req.TimeTo)
if err != nil { if err != nil {
return nil, err return nil, err
} }