From 3b2d91bee9c7385927110b0c3de988ffe78931d8 Mon Sep 17 00:00:00 2001
From: sunty <1172534965@qq.com>
Date: 星期一, 24 八月 2020 13:50:54 +0800
Subject: [PATCH] add grouped
---
EsApi.go | 108 +++++++++++++++++++++++++++++++++++++++++++++++++++---
1 files changed, 102 insertions(+), 6 deletions(-)
diff --git a/EsApi.go b/EsApi.go
index b812bf5..875ba9a 100644
--- a/EsApi.go
+++ b/EsApi.go
@@ -160,7 +160,7 @@
}
//鏍规嵁鎽勫儚鏈哄垪琛ㄥ拰鏃堕棿鏌ヨ浜哄憳娴忚杞ㄨ抗
-func GetPersonDataByCameraIdAndTime(cameraId []string, startTime string, endTime string, serverIp string, ServerPort string, indexName string) ([]map[string]interface{}, error) {
+func GetPersonDataByCameraIdAndTime(cameraId []string, startTime string, endTime string, serverIp string, ServerPort string, indexName string) (map[string]interface{}, error) {
esCameraId := strings.Replace(strings.Trim(fmt.Sprint(cameraId), "[]"), " ", "\",\"", -1)
personUrl := "http://" + serverIp + ":" + ServerPort + "/" + indexName + "/_search"
personBody := `{
@@ -202,25 +202,120 @@
"picMaxUrl",
"targetInfo.belongsTargetId",
"targetInfo.targetLocation",
- "picWH"
+ "picWH.picW"
]
}
}`
//fmt.Println(personUrl)
//fmt.Println(personBody)
+ source := make(map[string]interface{})
+ queryStartTime := time.Now()
buf, err := EsReq("POST", personUrl, []byte(personBody))
if err != nil {
return nil, err
}
-
+ queryUseTime := time.Now().Sub(queryStartTime).Seconds()*1000
sources, err := Sourcelist(buf)
if err != nil {
return nil, err
}
resData,err := PerSonAnalysis(sources)
+ source["result"] = resData
+ source["total"] = len(resData)
+ source["queryUseTime"] = queryUseTime
//println(sources)
- return resData, nil
+ return source, nil
+}
+
+//鏍规嵁鏃堕棿鑼冨洿锛屾憚鍍忔満鍒楄〃锛屽垎缁勮仛鍚堜汉鑴稿垪琛�,杩斿洖鍒嗙粍鏁版嵁
+func GetFaceDataBucketsByCameraIdAndTimeReturnByGrouped(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 = `{
+ "query": {
+ "bool": {
+ "filter": [
+ {
+ "range": {
+ "picDate": {
+ "gte": "` + startTime + `",
+ "lte": "` + endTime + `"
+ }
+ }
+ },
+ {
+ "term": {
+ "targetInfo.targetType.raw": "FaceDetect"
+ }
+ },
+ {
+ "terms": {
+ "cameraId": ["` + esCameraId + `"]
+ }
+ }
+ ]
+ }
+ },
+ "size": 0,
+ "aggs": {
+ "buckets_aggs": {
+ "composite": {
+ "sources": [
+ {
+ "baseInfo.targetId": {
+ "terms": {
+ "field": "baseInfo.targetId"
+ }
+ }
+ },
+ {
+ "cameraId": {
+ "terms": {
+ "field": "cameraId"
+ }
+ }
+ }
+ ],
+ "size": 100000000
+ },
+ "aggs":{
+ "top_attention_hits":{
+ "top_hits":{
+ "size": 1000000,
+ "sort": [
+ {
+ "picDate": {
+ "order": "asc"
+ }
+ }
+ ],
+ "_source":{
+ "includes":["baseInfo.targetId","cameraId","cameraName","cameraAddr","targetInfo.targetScore","targetInfo.picSmUrl","showLabels","baseInfo.tableId","baseInfo.tableName","baseInfo.bwType","baseInfo.targetName","baseInfo.compareScore","picDate","picMaxUrl","picWH"]
+ }
+ }
+ }
+ }
+ }
+ }
+}`
+ sources := make(map[string]interface{})
+ queryStartTime := time.Now()
+ buf, err := EsReq("POST", buckersUrl, []byte(buckersBody))
+ if err != nil {
+ return nil, err
+ }
+ queryUseTime := time.Now().Sub(queryStartTime).Seconds()*1000
+ //fmt.Println(queryUseTime)
+ tmpSources, err := SourceAggregationsReturnByGrouped(buf, thresholdTime)
+ if err != nil {
+ return nil, err
+ }
+ sources["result"] = tmpSources
+ sources["total"] = len(tmpSources)
+ sources["queryUseTime"] = queryUseTime
+ //println(sources)
+ return sources, nil
}
//鏍规嵁鏃堕棿鑼冨洿锛屾憚鍍忔満鍒楄〃锛屽垎缁勮仛鍚堜汉鑴稿垪琛�
@@ -296,16 +391,17 @@
}`
//fmt.Println(buckersUrl)
//fmt.Println(buckersBody)
+ queryStartTime := time.Now()
buf, err := EsReq("POST", buckersUrl, []byte(buckersBody))
if err != nil {
return nil, err
}
+ queryUseTime := time.Now().Sub(queryStartTime).Seconds()*1000
- sources, err := SourceAggregations(buf, thresholdTime)
+ sources, err := SourceAggregations(buf, thresholdTime,queryUseTime)
if err != nil {
return nil, err
}
- //println(sources)
return sources, nil
}
--
Gitblit v1.8.0