From b6c437e84785f57e5522d0b0db172ef775dea988 Mon Sep 17 00:00:00 2001
From: lucas <lu.kai@free-sun.com.cn>
Date: Wed, 22 Jan 2025 09:23:35 +0800
Subject: [PATCH] =?UTF-8?q?update=20=E8=B0=83=E6=95=B4=E6=97=B6=E9=97=B4?=
 =?UTF-8?q?=E5=8C=BA=E9=97=B4=E8=8C=83=E5=9B=B4=20=E9=81=BF=E5=85=8D?=
 =?UTF-8?q?=E6=95=B4=E7=82=B9=E6=95=B0=E6=8D=AE=E9=87=8D=E5=A4=8D=E4=BC=A0?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 consumers/consumerHBJCAS.go | 2 +-
 utils/timeRange.go          | 4 ++--
 2 files changed, 3 insertions(+), 3 deletions(-)

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
 }