From 8f8b611ac1a6fd1e230dcf014b787e291d1feb28 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E5=88=98=E7=A5=A5=E8=B6=85?= Date: Sat, 24 Sep 2022 18:55:33 +0800 Subject: [PATCH] =?UTF-8?q?=E6=9F=A5=E8=AF=A25=E5=88=86=E9=92=9F=E6=B5=81?= =?UTF-8?q?=E9=87=8F=E6=8E=A5=E5=8F=A3=E5=A2=9E=E5=8A=A0timeFrom=E5=92=8Ct?= =?UTF-8?q?imeTo=E5=8F=82=E6=95=B0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- internal/db/models/server_daily_stat_dao.go | 15 ++++++++++++--- .../rpc/services/service_server_daily_stat.go | 2 +- 2 files changed, 13 insertions(+), 4 deletions(-) diff --git a/internal/db/models/server_daily_stat_dao.go b/internal/db/models/server_daily_stat_dao.go index 155b0825..02465772 100644 --- a/internal/db/models/server_daily_stat_dao.go +++ b/internal/db/models/server_daily_stat_dao.go @@ -439,15 +439,24 @@ func (this *ServerDailyStatDAO) FindDailyStats(tx *dbs.Tx, serverId int64, dayFr // FindStatsWithDay 按天查找5分钟级统计 // 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) { return } - _, err = this.Query(tx). + var query = this.Query(tx). Attr("serverId", serverId). 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). FindAll() return diff --git a/internal/rpc/services/service_server_daily_stat.go b/internal/rpc/services/service_server_daily_stat.go index 7cca3b06..cf8746e3 100644 --- a/internal/rpc/services/service_server_daily_stat.go +++ b/internal/rpc/services/service_server_daily_stat.go @@ -204,7 +204,7 @@ func (this *ServerDailyStatService) FindServer5MinutelyStatsWithDay(ctx context. 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 { return nil, err }