diff --git a/consumers/consumerCDJYSN.go b/consumers/consumerCDJYSN.go index 224f238..5a2350a 100644 --- a/consumers/consumerCDJYSN.go +++ b/consumers/consumerCDJYSN.go @@ -242,7 +242,7 @@ func (the *consumerCDJYSN) saveConfig() { } func (the *consumerCDJYSN) getEsData() { structureId := the.getStructureId() - start, end := utils.GetTimeRangeByHour(-1) + start, end := utils.GetTimeRangeByHour2now(-1) log.Printf("查询数据时间范围 %s - %s", start, end) //start := "2024-02-05T00:00:00.000+0800" //end := "2024-02-05T23:59:59.999+0800" diff --git a/utils/timeRange.go b/utils/timeRange.go index ecbccd4..779fa57 100644 --- a/utils/timeRange.go +++ b/utils/timeRange.go @@ -17,6 +17,12 @@ func GetTimeRangeByHour(durationHour int) (start, stop string) { stop = time.Now().Truncate(time.Hour).Format("2006-01-02T15:00:00.000+08:00") return } +func GetTimeRangeByHour2now(durationHour int) (start, stop string) { + + start = time.Now().Add(time.Hour * time.Duration(durationHour)).Truncate(time.Hour).Format("2006-01-02T15:00:00.000+08:00") + stop = time.Now().Format("2006-01-02T15:00:00.000+08:00") + return +} func GetTimeRangeBy10min() (start, stop string) { now := time.Now()