From 263f2a5fa7dc9239570be347fc162eb5d2b06ebf Mon Sep 17 00:00:00 2001
From: sunty <1172534965@qq.com>
Date: 星期四, 25 四月 2024 17:40:03 +0800
Subject: [PATCH] fix decodeActivityId isTimeInRange

---
 EsApi.go |   11 ++++++-----
 1 files changed, 6 insertions(+), 5 deletions(-)

diff --git a/EsApi.go b/EsApi.go
index e12d1d2..c293036 100644
--- a/EsApi.go
+++ b/EsApi.go
@@ -84,9 +84,11 @@
 
 	if startTime.After(endTime) {
 		// 璺ㄨ秺鏃ユ湡鐨勬儏鍐�
+		//fmt.Println("璺ㄦ棩鏈�",timeStamp, timeStamp.After(startTime), timeStamp.Before(endTime))
 		return timeStamp.After(startTime) || timeStamp.Before(endTime)
 	} else {
 		// 涓嶈法瓒婃棩鏈熺殑鎯呭喌
+		//fmt.Println("涓嶈法鏃ユ湡",timeStamp, timeStamp.After(startTime), timeStamp.Before(endTime))
 		return timeStamp.After(startTime) && timeStamp.Before(endTime)
 	}
 }
@@ -228,14 +230,13 @@
 			captureTime := source["picDate"].(string)
 			dDate := strings.Split(captureTime, " ")[0]
 			dTime := strings.Split(captureTime[:19], " ")[1]
-			//fmt.Println(captureTime, dDate, dTime)
 			id := source["id"].(string)
 			//fmt.Println("sindex: ", sIndex, "documentNumber", tmpInfo["documentNumber"], "id: ", id, "captureTime: ", captureTime)
 			if !isTimeInRange(dTime, aHFormat.startTime, aHFormat.endTime) {
-				if sDate != "" && len(dataId) >= frequency {
-					activeId = append(activeId, dataId...)
-					dataId = resetDataId(dataId, id, dDate, dTime, &sDate, &sTime)
-				}
+				//if sDate != "" && len(dataId) >= frequency {
+				//	activeId = append(activeId, dataId...)
+				//	dataId = resetDataId(dataId, id, dDate, dTime, &sDate, &sTime)
+				//}
 				continue
 			}
 			if sDate == "" {

--
Gitblit v1.8.0