From 7b6d324ced5d7fb96d693bf1af9c538cc9397da1 Mon Sep 17 00:00:00 2001
From: sunty <1172534965@qq.com>
Date: 星期四, 20 八月 2020 19:56:48 +0800
Subject: [PATCH] add thresholdTime
---
EsClient.go | 4 ++--
EsApi.go | 6 +++---
2 files changed, 5 insertions(+), 5 deletions(-)
diff --git a/EsApi.go b/EsApi.go
index 5b68d94..748d4f4 100644
--- a/EsApi.go
+++ b/EsApi.go
@@ -160,7 +160,7 @@
}
//鏍规嵁鏃堕棿鑼冨洿锛屾憚鍍忔満鍒楄〃锛屽垎缁勮仛鍚堜汉鑴稿垪琛�
-func GetfaceDataBucketsBycameraIdAndTime(cameraId []string, startTime string, endTime string, serverIp string, ServerPort string, indexName string) (buckersDate map[string]interface{},err error){
+func GetfaceDataBucketsBycameraIdAndTime(cameraId []string, startTime string, endTime string, thresholdTime float64, serverIp string, ServerPort string, indexName string) (buckersDate map[string]interface{}, err error) {
esCameraId := strings.Replace(strings.Trim(fmt.Sprint(cameraId), "[]"), " ", "\",\"", -1)
var buckersUrl = "http://" + serverIp + ":" + ServerPort + "/" + indexName + "/_search"
var buckersBody = `{
@@ -234,12 +234,12 @@
return nil, err
}
- sources, err := SourceAggregations(buf)
+ sources, err := SourceAggregations(buf,thresholdTime)
if err != nil {
return nil, err
}
//println(sources)
- return sources,nil
+ return sources, nil
}
//鏍规嵁鎶撴媿浜哄憳id鏇存柊锛坧icurl锛夊浘鐗囧湴鍧�---棰勫紑鍙�
diff --git a/EsClient.go b/EsClient.go
index 4b58c98..96be3c7 100644
--- a/EsClient.go
+++ b/EsClient.go
@@ -476,7 +476,7 @@
return tmpinfos
}
-func SourceAggregations(buf [] byte) (sources map[string]interface{}, err error) {
+func SourceAggregations(buf [] byte, thresholdTime float64) (sources map[string]interface{}, err error) {
s := make(map[string]interface{})
loc, err := time.LoadLocation("Asia/Shanghai")
if err != nil {
@@ -531,7 +531,7 @@
eTime := tmpTime
if startTime != "" {
sinTime, _ := time.ParseInLocation("2006-01-02 15:04:05", startTime, loc)
- if math.Abs(sinTime.Sub(mTime).Seconds()) <= 20 {
+ if math.Abs(sinTime.Sub(mTime).Seconds()) <= thresholdTime {
startTime = tmpTime
hitsSources[len(hitsSources)-1]["endTime"] = tmpTime
continue
--
Gitblit v1.8.0