diff --git a/consumers/consumerHBJCAS.go b/consumers/consumerHBJCAS.go index aac26fa..ea11137 100644 --- a/consumers/consumerHBJCAS.go +++ b/consumers/consumerHBJCAS.go @@ -227,7 +227,7 @@ func (the *consumerHBJCAS) getESQueryStrByHour(structureId int64, factorId int, "range": { "collect_time": { "gte": "%s", - "lte": "%s" + "lt": "%s" } } } diff --git a/utils/timeRange.go b/utils/timeRange.go index f6eaf55..a9b4b40 100644 --- a/utils/timeRange.go +++ b/utils/timeRange.go @@ -14,8 +14,8 @@ func GetTimeRangeByMinute(durationMinute int) (start, stop string) { func GetTimeRangeByHour(durationHour int) (start, stop string) { - start = time.Now().Add(time.Hour * time.Duration(durationHour)).Format("2006-01-02T15:00:00.000+08:00") - stop = time.Now().Format("2006-01-02T15:00:00.000+08:00") + start = time.Now().Add(time.Hour * time.Duration(durationHour)).Truncate(time.Hour).Format("2006-01-02T15:00:00.000+08:00") + stop = time.Now().Truncate(time.Hour).Format("2006-01-02T15:00:00.000+08:00") return }