From adbcd8f2d5407cc5351a9fee39f13596f5b6c2c0 Mon Sep 17 00:00:00 2001
From: sunty <1172534965@qq.com>
Date: 星期二, 01 九月 2020 14:09:41 +0800
Subject: [PATCH] add endTime GetFaceDataByTimeAndTotal
---
EsApi.go | 21 +++++++++++----------
1 files changed, 11 insertions(+), 10 deletions(-)
diff --git a/EsApi.go b/EsApi.go
index 8137bc9..73ee338 100644
--- a/EsApi.go
+++ b/EsApi.go
@@ -180,7 +180,7 @@
/*******************sort []map util*******************/
//鏍规嵁鏃堕棿鑼冨洿鑱氬悎鎵�鏈夊尯鍩熶汉淇℃伅锛岃繑鍥炲浐瀹氭潯鏁�
-func GetFaceDataByTimeAndTotal(startTime string, total int, thresholdTime int, thresholdStayTime int, serverIp string, serverPort string, indexName string) (resData []map[string]interface{}, err error) {
+func GetFaceDataByTimeAndTotal(startTime string, endTime string, total int, thresholdTime int, thresholdStayTime int, serverIp string, serverPort string, indexName string) (resData []map[string]interface{}, err error) {
var requestUrl = "http://" + serverIp + ":" + serverPort + "/" + indexName + "/_search"
var requestBody = `{
"query": {
@@ -189,7 +189,8 @@
{
"range": {
"picDate": {
- "gte": "` + startTime + `"
+ "gte": "` + startTime + `",
+ "lte": "` + endTime + `"
}
}
},
@@ -417,7 +418,7 @@
}
//缁熻鍚勪釜鍖哄煙浜烘暟
-func StatisticsEveryAreaPersonsNumber(startTime string, endTime string, serverIp string, serverPort string, indexName string) ([]map[string]interface{},error){
+func StatisticsEveryAreaPersonsNumber(startTime string, endTime string, serverIp string, serverPort string, indexName string) ([]map[string]interface{}, error) {
var requestUrl = "http://" + serverIp + ":" + serverPort + "/" + indexName + "/_search"
var requestBody = `{
"query": {
@@ -457,15 +458,15 @@
}
}
}`
- buf,err := EsReq("POST",requestUrl,[]byte(requestBody))
- if err != nil{
- return nil,err
+ buf, err := EsReq("POST", requestUrl, []byte(requestBody))
+ if err != nil {
+ return nil, err
}
- result,err := SourceStatistics(buf)
- if err != nil{
- return nil,err
+ result, err := SourceStatistics(buf)
+ if err != nil {
+ return nil, err
}
- return result,nil
+ return result, nil
}
/**************************************customer analysis util end**************************************/
--
Gitblit v1.8.0