From e189b1942c8130d473a1a4128c3d9ef5edfaa564 Mon Sep 17 00:00:00 2001
From: sunty <1172534965@qq.com>
Date: 星期五, 23 十月 2020 10:58:30 +0800
Subject: [PATCH] fix

---
 EsApi.go | 1757 ++++++++++++++++++++++++++++++++++++++++++++++------------
 1 files changed, 1,397 insertions(+), 360 deletions(-)

diff --git a/EsApi.go b/EsApi.go
index 62ea6cd..96348c7 100644
--- a/EsApi.go
+++ b/EsApi.go
@@ -1,111 +1,30 @@
 package esutil
 
 import (
-    "encoding/json"
-    "errors"
-    "fmt"
-    "strconv"
-    "strings"
+	"basic.com/pubsub/protomsg.git"
+	"encoding/json"
+	"errors"
+	"fmt"
+	"sort"
+	"strconv"
+	"strings"
 	"sync"
 	"time"
+)
 
-	"basic.com/pubsub/protomsg.git"
-        )
-
-// 鏌ヨ搴曞簱浜哄憳淇℃伅
-func Personinfos( queryIndex int, queryNums int, indexName string, serverIp string, serverPort string, analyServerId string) ([]*protomsg.Esinfo, error){
-            var dbinfos []*protomsg.Esinfo
-            point   := strconv.Itoa(queryIndex)
-            number   := strconv.Itoa(queryNums)
-            JsonDSL  := ""
-            if indexName == "videopersons" {
-                 JsonDSL =  `  {
-                    "from": ` + point +  `, 
-                    "query": {
-                        "bool": {
-                            "filter": [
-                                {
-                                    "term": {
-                                        "analyServerId": "` + analyServerId + `"
-                                    }
-                                }
-                            ]
-                        }
-                    },
-                    "size":`+ number +`,
-                    "_source": [
-                        "id",
-                        "faceFeature"
-                    ]
-                }`
-            }else {
-                 JsonDSL =  `  {
-                    "from": ` + point +  `,        
-                    "query": {
-                        "match_all": {}
-                    },
-                     "size":`+ number +`,
-                     "_source": [
-                       "id",
-                       "tableId",
-                       "faceFeature"
-                       ]
-                    }`
-            }
-            //fmt.Println("url: "+"http://"+serverIp+":"+serverPort+"/"+indexName+"/_search","body: ",JsonDSL)
-    buf, err := EsReq("POST", "http://"+serverIp+":"+serverPort+"/"+indexName+"/_search",[]byte(JsonDSL))
-    if err != nil {
-        return dbinfos ,errors.New("http request dbtablename info is err!")
-    }
-
-      // 杩斿洖 _source 鏁扮粍
-      sources, err := Sourcelist(buf)
-      if err != nil {
-            return dbinfos,err 
-      }
-
-      // 杩斿洖鎵�鏈夋煡璇㈢殑鏁版嵁
-     dbpersoninfos :=  Parsesources(sources)
-      return dbpersoninfos, nil
+var logPrint = func(i ...interface{}) {
+	fmt.Println(i)
 }
 
-// 鏍规嵁搴曞簱id鏌ヨ搴曞簱淇℃伅
-func Dbtablefosbyid (id []string, indexName string, serverIp string, serverPort string) ([]protomsg.Dbtable, error) {
-    var dbinfo []protomsg.Dbtable
-    dbtableId := strings.Replace(strings.Trim(fmt.Sprint(id), "[]"), " ", "\",\"", -1)
-        var dbinfoRequest = `
-            {
-            	"query": {
-            		"bool": {
-            			"filter": [{
-            				"terms": {
-            					"id": [
-            						"`+ dbtableId +`"
-            					]
-            				}
-            			}]
-            		}
-            	},
-                "size":1000000
-            }
-        `
-    buf, err := EsReq("POST", "http://"+serverIp+":"+serverPort+"/"+indexName+"/_search",[]byte(dbinfoRequest))
-    if err != nil {
-        return dbinfo,  err
-    }
-
-    sources, err := Sourcelist(buf)
-    if err != nil {
-        return dbinfo , err
-    }
-
-    dbtable := Dbtablebyid(sources)
-    return dbtable, nil
+func InitLog(fn func(i ...interface{})) {
+	if fn != nil {
+		logPrint = fn
+	}
 }
 
 // 鏍规嵁鎶撴媿浜哄憳id鏌ヨ鎶撴媿浜哄憳淇℃伅
-func Videopersonsinfosbyid (id []string, indexName string, serverIp string, serverPort string) ([]protomsg.Videopersons, error) {
-	var videopersonsInfo []protomsg.Videopersons
+func AIOceaninfosbyid(id []string, indexName string, serverIp string, serverPort string) ([]protomsg.AIOcean, error) {
+	var aIOceanInfo []protomsg.AIOcean
 	videopersonsPersonId := strings.Replace(strings.Trim(fmt.Sprint(id), "[]"), " ", "\",\"", -1)
 	var dbinfoRequest = `
             {
@@ -114,7 +33,7 @@
             			"filter": [{
             				"terms": {
             					"id": [
-            						"`+ videopersonsPersonId +`"
+            						"` + videopersonsPersonId + `"
             					]
             				}
             			}]
@@ -123,179 +42,878 @@
                 "size":1000000
             }
         `
-	buf, err := EsReq("POST", "http://"+serverIp+":"+serverPort+"/"+indexName+"/_search",[]byte(dbinfoRequest))
+	buf, err := EsReq("POST", "http://"+serverIp+":"+serverPort+"/"+indexName+"/_search", []byte(dbinfoRequest))
 	if err != nil {
-		return videopersonsInfo,  err
+		return aIOceanInfo, err
 	}
 
 	sources, err := Sourcelist(buf)
 	if err != nil {
-		return videopersonsInfo , err
+		return aIOceanInfo, err
 	}
 
-	videoperson := Videopersonsbyid(sources)
-	println(videoperson)
-	return videoperson,nil
+	aIOcean := AIOceanAnalysis(sources)
+	return aIOcean, nil
 }
 
-// 鏍规嵁搴曞簱浜哄憳id鏌ヨ搴曞簱浜哄憳淇℃伅
-func Dbpersoninfosbyid (id []string, indexName string, serverIp string, serverPort string) ([]protomsg.Dbperson, error) {
-    var dbinfo []protomsg.Dbperson
-    dbtablePersonId := strings.Replace(strings.Trim(fmt.Sprint(id), "[]"), " ", "\",\"", -1)
-    var dbinfoRequest = `
-            {
-            	"query": {
-            		"bool": {
-            			"filter": [{
-            				"terms": {
-            					"id": [
-            						"`+ dbtablePersonId +`"
-            					]
-            				}
-            			}]
-            		}
-            	},
-                "size":1000000
-            }
-        `
-    buf, err := EsReq("POST", "http://"+serverIp+":"+serverPort+"/"+indexName+"/_search",[]byte(dbinfoRequest))
-    if err != nil {
-        return dbinfo,  err
-    }
-
-    sources, err := Sourcelist(buf)
-    if err != nil {
-        return dbinfo , err
-    }
-
-    dbperson := Dbpersonbyid(sources)
-    println(dbperson)
-    return dbperson,nil
-}
 //鏍规嵁鎶撴媿搴撲汉鍛榠d鏌ヨ鐗瑰緛鍊�
-func GetVideoPersonFaceFeatureById (id string, indexName string, serverIp string, serverPort string) (string, error) {
-    var jsonDSL = `
+func GetVideoPersonFaceFeatureById(id string, indexName string, serverIp string, serverPort string) (string, error) {
+	var jsonDSL = `
             {
             	"query": {
             		"bool": {
             			"filter": [{
             				"term": {
-            					"id":"`+ id +`"
+            					"id":"` + id + `"
             				}
             			}]
             		}
             	},
-                "_source":["faceFeature"]
+                "_source":["targetInfo.feature"]
             }
         `
-    buf, err := EsReq("POST", "http://"+serverIp+":"+serverPort+"/"+indexName+"/_search",[]byte(jsonDSL))
-    if err != nil {
-        return "",  err
-    }
+	buf, err := EsReq("POST", "http://"+serverIp+":"+serverPort+"/"+indexName+"/_search", []byte(jsonDSL))
+	if err != nil {
+		return "", err
+	}
 
-    sources, err := Sourcelist(buf)
-    if err != nil {
-        return "" , err
-    }
-    faceFeature := sources[0]["faceFeature"].(string)
-    return faceFeature,nil
+	sources, err := Sourcelist(buf)
+	if err != nil {
+		return "", err
+	}
+
+	feature := sources[0]["targetInfo"].([]interface{})[0].(map[string]interface{})["feature"].(string)
+	return feature, nil
 }
 
-// 鏍规嵁tableid 鏌ヨtablename
-func Dbtablename(tableid string, indexName string, serverIp string, serverPort string) (tablename string, err error) {
-    var dbinfotable =` {
-        "query": {
-            "bool": {
-                "filter": [
+//鏍规嵁鐩爣id鏌ヨ宸茶拷鍔犳潯鏁�
+func GetLinkTagInfoSize(id string, indexName string, serverIp string, serverPort string) (size int, err error) {
+	url := "http://" + serverIp + ":" + serverPort + "/" + indexName + "/_search"
+	queryDSL := `{
+		  	"query": {
+		    	"term":{
+		      	"id":"` + id + `"
+			}
+		}
+	}`
+	buf, err := EsReq("POST", url, []byte(queryDSL))
+	if err != nil {
+		return -1, err
+	}
+	source, err := Sourcelist(buf)
+	if err != nil {
+		return -1, err
+	}
+	if source[0]["linkTagInfo"] != nil {
+		size = len(source[0]["linkTagInfo"].([]interface{}))
+	} else {
+		return -1, errors.New("璇ユ暟缁勪笉瀛樺湪")
+	}
+	return size, nil
+}
+
+//鏍规嵁鐩爣id杩藉姞璺熻釜淇℃伅
+func AppendTargetInfo(id string, targetInfo string, indexName string, serverIp string, serverPort string, updateTime string) (string, error) {
+	if targetInfo == "" {
+		return "", errors.New("append data is nil")
+	}
+	var info interface{}
+	url := "http://" + serverIp + ":" + serverPort + "/" + indexName + "/_update_by_query?refresh=true"
+	jsonDSL := `{
+  "query": {
+    "term":{
+      "id":"` + id + `"
+    }
+  },
+  "script": {
+    "lang": "painless",
+    "inline": "ctx._source.linkTagInfo.add(params.newparam);ctx._source.updateTime='` + updateTime + `'",
+    "params": {
+      "newparam": ` + targetInfo + `
+    }
+  }
+}`
+	logPrint(jsonDSL)
+	buf, err := EsReq("POST", url, []byte(jsonDSL))
+	if err != nil {
+		return "", err
+	}
+	json.Unmarshal(buf, &info)
+	out, ok := info.(map[string]interface{})
+	logPrint(out)
+	if !ok {
+		return "", errors.New("http response interface can not change map[string]interface{}")
+	}
+	middle, ok := out["updated"].(float64)
+	if !ok {
+		return "", errors.New("first updated change error!")
+	}
+	mes := ""
+	if middle == 1 {
+		mes = "杩藉姞鎴愬姛"
+	}
+	if middle == 0 {
+		mes = "宸茬粡杩藉姞"
+	}
+	return mes, nil
+
+}
+
+/**************************************customer analysis util start**************************************/
+/*******************sort []map util*******************/
+type MapsSort struct {
+	Key     string
+	MapList []map[string]interface{}
+}
+
+func (m *MapsSort) Len() int {
+	return len(m.MapList)
+}
+
+func (m *MapsSort) Less(i, j int) bool {
+	return m.MapList[i][m.Key].(string) > m.MapList[j][m.Key].(string)
+}
+
+func (m *MapsSort) Swap(i, j int) {
+	m.MapList[i], m.MapList[j] = m.MapList[j], m.MapList[i]
+}
+
+/*******************sort []map util*******************/
+//鏍规嵁鏃堕棿鑼冨洿鑱氬悎鎵�鏈夊尯鍩熶汉淇℃伅锛岃繑鍥炲浐瀹氭潯鏁�
+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": {
+        "bool": {
+            "filter": [
                 {
-                    "term": {
-                        "id":"`+tableid+`"
+                    "range": {
+                        "picDate": {
+                            "gte": "` + startTime + `",
+							"lte": "` + endTime + `"
+                        }
+                    }
+                },
+                {
+                    "term":{
+                        "targetInfo.targetType.raw": "FaceDetect"
                     }
                 }
-                ]
+            ]
+        }
+    },
+    "size": 0,
+    "aggs": {
+        "buckets_aggs": {
+            "composite": {
+                "sources": [
+                    {
+                        "faceId": {
+                            "terms": {
+                                "field": "baseInfo.targetId"
+                            }
+                        }
+                    },
+                    {
+                        "areaId": {
+                            "terms": {
+                                "field": "targetInfo.areaId"
+                            }
+                        }
+                    }
+                ],
+                "size": 10000000
+            },
+            "aggs": {
+                "top_attention_hits": {
+                    "top_hits": {
+                        "size": 1000000,
+                        "sort": [
+                            {
+                                "picDate": {
+                                    "order": "asc"
+                                }
+                            }
+                        ],
+                        "_source": {
+                            "includes": [
+                                "baseInfo.targetId",
+                                "targetInfo.picSmUrl",
+								"targetInfo.areaId",
+                                "picDate"
+                            ]
+                        }
+                    }
+                }
             }
-        },
-        "_source": [
-            "tableName"
-        ],
-        "size":1000000
-    }
-    `
-    buf, err := EsReq("POST", "http://"+serverIp+":"+serverPort+"/"+indexName+"/_search",[]byte(dbinfotable))
-    if err != nil {
-        return "" ,errors.New("http request dbtablename info is err!")
-    }
-    sources, err := Sourcelist(buf)
-    if err != nil {
-          return "",err 
-    }
-    for _, source := range sources {
-        if name, ok := source["tableName"].(string); ok {
-            tablename = name
-            break
         }
     }
-    return tablename, nil 
+}`
+	buf, err := EsReq("POST", requestUrl, []byte(requestBody))
+	if err != nil {
+		return nil, err
+	}
+	source, err := FaceSourceAggregations(buf, thresholdTime, thresholdStayTime)
+	if err != nil {
+		return nil, err
+	}
+	if len(source) == 0 {
+		return source, nil
+	}
+	faceSource := make([]map[string]interface{}, 0)
+	for index, info := range source {
+		if int(info["stayTime"].(float64)) > thresholdStayTime {
+			faceSource = append(faceSource, source[index])
+		}
+	}
+	mapsSort := MapsSort{}
+	mapsSort.Key = "endTime"
+	mapsSort.MapList = faceSource
+	sort.Sort(&mapsSort)
+	if len(faceSource) > total {
+		return mapsSort.MapList[:total], nil
+	}
+	return mapsSort.MapList, nil
 }
 
+func GetFaceDataByTimeAndId(startTime string, endTime string, id string, 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": {
+        "bool": {
+            "filter": [
+                {
+                    "range": {
+                        "picDate": {
+                            "gte": "` + startTime + `",
+						 	"lte": "` + endTime + `"
+                        }
+                    }
+                },
+                {
+                    "term":{
+                        "targetInfo.targetType.raw": "FaceDetect"
+                    }
+                },
+				{
+                    "term":{
+                        "baseInfo.targetId": "` + id + `"
+                    }
+                }
+            ]
+        }
+    },
+    "size": 0,
+    "aggs": {
+        "buckets_aggs": {
+            "composite": {
+                "sources": [
+                    {
+                        "faceId": {
+                            "terms": {
+                                "field": "baseInfo.targetId"
+                            }
+                        }
+                    },
+                    {
+                        "areaId": {
+                            "terms": {
+                                "field": "targetInfo.areaId"
+                            }
+                        }
+                    }
+                ],
+                "size": 10000000
+            },
+            "aggs": {
+                "top_attention_hits": {
+                    "top_hits": {
+                        "size": 1000000,
+                        "sort": [
+                            {
+                                "picDate": {
+                                    "order": "asc"
+                                }
+                            }
+                        ],
+                        "_source": {
+                            "includes": [
+                                "baseInfo.targetId",
+                                "targetInfo.picSmUrl",
+								"targetInfo.areaId",
+                                "picDate"
+                            ]
+                        }
+                    }
+                }
+            }
+        }
+    }
+}`
+	buf, err := EsReq("POST", requestUrl, []byte(requestBody))
+	if err != nil {
+		return nil, err
+	}
+	source, err := FaceSourceAggregations(buf, thresholdTime, thresholdStayTime)
+	if err != nil {
+		return nil, err
+	}
+	if len(source) == 0 {
+		return source, nil
+	}
+	faceSource := make([]map[string]interface{}, 0)
+	for index, info := range source {
+		if int(info["stayTime"].(float64)) > thresholdStayTime {
+			faceSource = append(faceSource, source[index])
+		}
+	}
+	mapsSort := MapsSort{}
+	mapsSort.Key = "startTime"
+	mapsSort.MapList = faceSource
+	sort.Sort(&mapsSort)
+	return mapsSort.MapList, nil
+}
 
-//鏍规嵁鎶撴媿浜哄憳id鏇存柊锛坴ideourl锛夋憚鍍忔満鍦板潃
-func UpdateVideourlById(id string, videoUrl string, indexName string, serverIp string, serverPort string)(statu int){
-    var info interface{}
-    var videoUrlInfo = `
+func GetFaceIdDeduplication(startTime string, endTime string, serverIp string, serverPort string, indexName string) (ids []map[string]interface{}, err error) {
+	var requestUrl = "http://" + serverIp + ":" + serverPort + "/" + indexName + "/_search"
+	var requestBody = `{
+    "query": {
+        "bool": {
+            "filter": [
+                {
+                    "range": {
+                        "picDate": {
+                            "gte": "` + startTime + `",
+                            "lte": "` + endTime + `"
+                        }
+                    }
+                },
+                {
+                    "term": {
+                        "targetInfo.targetType.raw": "FaceDetect"
+                    }
+                }
+            ]
+        }
+    },
+    "size": 0,
+    "aggs": {
+        "buckets_aggs": {
+            "composite": {
+                "sources": [
+                    {
+                        "faceId": {
+                            "terms": {
+                                "field": "baseInfo.targetId"
+                            }
+                        }
+                    }
+                ],
+                "size": 10000000
+            },
+            	"aggs": {
+                	"top_attention_hits": {
+                    	"top_hits": {
+                        	"size": 1,
+                        	"sort": [
+                            	{
+                                	"picDate": {
+                                    	"order": "desc"
+                                	}
+                            	}
+                        	],
+                        	"_source": {
+                            	"includes": [
+                                	"picDate"
+                            	]
+                        	}
+                    	}
+             	   	}
+          	  	}
+        	}
+        }
+    }
+}`
+	//fmt.Println(requestUrl)
+	//fmt.Println(requestBody)
+	buf, err := EsReq("POST", requestUrl, []byte(requestBody))
+	if err != nil {
+		return nil, err
+	}
+	ids, err1 := SourceDeduplication(buf)
+	if err1 != nil {
+		return nil, err1
+	}
+	if len(ids) > 1 {
+		mapsSort := MapsSort{}
+		mapsSort.Key = "lastTime"
+		mapsSort.MapList = ids
+		sort.Sort(&mapsSort)
+		return mapsSort.MapList, nil
+	}
+	return ids, nil
+}
+
+//缁熻鍚勪釜鍖哄煙浜烘暟
+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": {
+        "bool": {
+            "filter": [
+                {
+                    "range": {
+                        "picDate": {
+                            "gte": "` + startTime + `",
+                            "lte": "` + endTime + `"
+                        }
+                    }
+                },
+                {
+                    "term": {
+                        "targetInfo.targetType.raw": "Yolo"
+                    }
+                }
+            ]
+        }
+    },
+    "size": 0,
+    "aggs": {
+        "buckets_aggs": {
+            "composite": {
+                "sources": [
+                    {
+                        "areaId": {
+                            "terms": {
+                                "field": "targetInfo.areaId"
+                            }
+                        }
+                    }
+                ],
+                "size": 10000000
+            }
+        }
+    }
+}`
+	buf, err := EsReq("POST", requestUrl, []byte(requestBody))
+	if err != nil {
+		return nil, err
+	}
+	result, err := SourceStatistics(buf)
+	if err != nil {
+		return nil, err
+	}
+	return result, nil
+}
+
+/**************************************customer analysis util end**************************************/
+//鏍规嵁鎽勫儚鏈哄垪琛ㄥ拰鏃堕棿鏌ヨ浜哄憳娴忚杞ㄨ抗
+func GetPersonDataByCameraIdAndTime(cameraId []string, startTime string, endTime string, serverIp string, serverPort string, indexName string) (map[string]interface{}, error) {
+
+	var filterArr []string
+	if cameraId != nil && len(cameraId) > 0 {
+		esCameraId := strings.Replace(strings.Trim(fmt.Sprint(cameraId), "[]"), " ", "\",\"", -1)
+		filterArr = append(filterArr, `{
+							"terms": {
+                        	"cameraId": ["`+esCameraId+`"]
+						}
+				}`)
+	}
+	filterArr = append(filterArr, `{
+                    "range": {
+                        "picDate": {
+                            "gte": "`+startTime+`",
+                            "lte": "`+endTime+`"
+                        }
+                    }
+                }`)
+	filterArr = append(filterArr, `                {
+                    "term": {
+                        "targetInfo.targetType.raw": "Yolo"
+                    }
+                }`)
+	queryStr := strings.Join(filterArr, ",")
+
+	personUrl := "http://" + serverIp + ":" + serverPort + "/" + indexName + "/_search"
+	personBody := `{
+    "query": {
+        "bool": {
+            "filter": [
+				` + queryStr + `
+            ]
+        }
+    },
+    "size": 2147483647,
+    "_source": {
+        "includes": [
+            "cameraId",
+            "cameraName",
+            "cameraAddr",
+            "targetInfo.targetScore",
+            "picDate",
+            "updateTime",
+            "picMaxUrl",
+            "targetInfo.belongsTargetId",
+            "targetInfo.targetLocation",
+			"picWH"
+        ]
+    }
+}`
+	//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 source, nil
+
+}
+
+//鏍规嵁鏃堕棿鑼冨洿锛屾憚鍍忔満鍒楄〃锛屽垎缁勮仛鍚堜汉鑴稿垪琛�,杩斿洖鍒嗙粍鏁版嵁
+func GetFaceDataBucketsByCameraIdAndTimeReturnByGrouped(cameraId []string, personId []string, startTime string, endTime string, thresholdTime float64, serverIp string, ServerPort string, indexName string) (buckersDate map[string]interface{}, err error) {
+	var filterArr []string
+	if cameraId != nil && len(cameraId) > 0 {
+		esCameraId := strings.Replace(strings.Trim(fmt.Sprint(cameraId), "[]"), " ", "\",\"", -1)
+		filterArr = append(filterArr, `{
+							"terms": {
+                        	"cameraId": ["`+esCameraId+`"]
+						}
+				}`)
+	}
+	if personId != nil && len(personId) > 0 {
+		esPersonId := strings.Replace(strings.Trim(fmt.Sprint(personId), "[]"), " ", "\",\"", -1)
+		filterArr = append(filterArr, `{
+			"terms": {
+				"baseInfo.targetId": ["`+esPersonId+`"]
+				}
+			}`)
+	}
+	filterArr = append(filterArr, `{
+                    "range": {
+                        "picDate": {
+                            "gte": "`+startTime+`",
+                            "lte": "`+endTime+`"
+                        }
+                    }
+                }`)
+	filterArr = append(filterArr, `                {
+                    "term": {
+                        "targetInfo.targetType.raw": "FaceDetect"
+                    }
+                }`)
+	queryStr := strings.Join(filterArr, ",")
+
+	var buckersUrl = "http://" + serverIp + ":" + ServerPort + "/" + indexName + "/_search"
+	var buckersBody = `{
+    "query": {
+        "bool": {
+            "filter": [
+				` + queryStr + `
+            ]
+        }
+    },
+    "size": 0,
+    "aggs": {
+        "buckets_aggs": {
+            "composite": {
+                "sources": [
+                    {
+                        "baseInfo.targetId": {
+                            "terms": {
+                                "field": "baseInfo.targetId"
+                            }
+                        }
+                    },
+                    {
+                        "cameraId": {
+                            "terms": {
+                                "field": "cameraId"
+                            }
+                        }
+                    }
+                ],
+                "size": 10000000
+            },
+            "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"]
+                        }
+                    }
+                }
+            }
+        }
+    }
+}`
+	//fmt.Println(buckersUrl)
+	//fmt.Println(buckersBody)
+	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
+}
+
+//鏍规嵁鏃堕棿鑼冨洿锛屾憚鍍忔満鍒楄〃锛屽垎缁勮仛鍚堜汉鑴稿垪琛�
+func GetFaceDataBucketsByCameraIdAndTime(cameraId []string, personId []string, startTime string, endTime string, thresholdTime float64, serverIp string, ServerPort string, indexName string) (buckersDate map[string]interface{}, err error) {
+	var filterArr []string
+	if cameraId != nil && len(cameraId) > 0 {
+		esCameraId := strings.Replace(strings.Trim(fmt.Sprint(cameraId), "[]"), " ", "\",\"", -1)
+		filterArr = append(filterArr, `{
+							"terms": {
+                        	"cameraId": ["`+esCameraId+`"]
+						}
+				}`)
+	}
+	if personId != nil && len(personId) > 0 {
+		esPersonId := strings.Replace(strings.Trim(fmt.Sprint(personId), "[]"), " ", "\",\"", -1)
+		filterArr = append(filterArr, `{
+			"terms": {
+				"baseInfo.targetId": ["`+esPersonId+`"]
+				}
+			}`)
+	}
+	filterArr = append(filterArr, `{
+                    "range": {
+                        "picDate": {
+                            "gte": "`+startTime+`",
+                            "lte": "`+endTime+`"
+                        }
+                    }
+                }`)
+	filterArr = append(filterArr, `                {
+                    "term": {
+                        "targetInfo.targetType.raw": "FaceDetect"
+                    }
+                }`)
+	queryStr := strings.Join(filterArr, ",")
+
+	var buckersUrl = "http://" + serverIp + ":" + ServerPort + "/" + indexName + "/_search"
+	var buckersBody = `{
+    "query": {
+        "bool": {
+            "filter": [
+				` + queryStr + `
+            ]
+        }
+    },
+    "size": 0,
+    "aggs": {
+        "buckets_aggs": {
+            "composite": {
+                "sources": [
+                    {
+                        "baseInfo.targetId": {
+                            "terms": {
+                                "field": "baseInfo.targetId"
+                            }
+                        }
+                    },
+                    {
+                        "cameraId": {
+                            "terms": {
+                                "field": "cameraId"
+                            }
+                        }
+                    }
+                ],
+                "size": 10000000
+            },
+            "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"]
+                        }
+                    }
+                }
+            }
+        }
+    }
+}`
+	//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, queryUseTime)
+	if err != nil {
+		return nil, err
+	}
+	return sources, nil
+}
+
+//鏍规嵁鎶撴媿浜哄憳id鏇存柊锛坧icurl锛夊浘鐗囧湴鍧�
+func UpdatePicUrlById(id string, picUrl string, indexName string, serverIp string, serverPort string) (err error) {
+	updateTime := time.Now().Format("2006-01-02 15:04:05")
+	tRes, err := AIOceaninfosbyid([]string{id}, indexName, serverIp, serverPort)
+	if err != nil || len(tRes) == 0 {
+		return err
+	}
+	picMaxUrls := tRes[0].PicMaxUrl
+	sourceStr := `
+        "source": "ctx._source.picMaxUrl.add('` + picUrl + `');ctx._source.updateTime='` + updateTime + `'"
+`
+	if len(picMaxUrls) >= 2 {
+		sourceStr = `"source": "ctx._source.picMaxUrl[1]='` + picUrl + `';ctx._source.updateTime='` + updateTime + `'"`
+	}
+	var info interface{}
+	url := "http://" + serverIp + ":" + serverPort + "/" + indexName + "/_update_by_query?refresh=true"
+
+	var picUrlInfo = `
         {
           "script": {
-            "source": "ctx._source.videoUrl='` + videoUrl + `'"	
+           ` + sourceStr + `
+          },
+              "query": {
+    		    "bool": {
+    		        "filter": [
+    		            {
+    		                "term": {
+    		                    "id": "` + id + `"
+    		                }
+    		            }
+    		        ]
+    		    }
+    		}
+        }
+        `
+	//logPrint("url: ", url, videoUrlInfo)
+	//fmt.Println(url, picUrlInfo)
+	buf, err := EsReq("POST", url, []byte(picUrlInfo))
+	if err != nil {
+		logPrint("http request videoUrlInfo info is err!")
+		return err
+	}
+	json.Unmarshal(buf, &info)
+	//logPrint(info)
+	out, ok := info.(map[string]interface{})
+	if !ok {
+		logPrint("http response interface can not change map[string]interface{}")
+		return errors.New("http response interface can not change map[string]interface{}")
+	}
+	middle, ok := out["updated"].(float64)
+	if !ok {
+		logPrint("first updated change error!", out)
+		return errors.New("first updated change error!")
+	}
+	if middle == 1 {
+		return nil
+	}
+	if middle == 0 {
+		return errors.New("宸茬粡淇敼")
+	}
+	return nil
+}
+
+//鏍规嵁鎶撴媿浜哄憳id鏇存柊锛坴ideourl锛夋憚鍍忔満鍦板潃
+func UpdateVideourlById(id string, videoUrl string, indexName string, serverIp string, serverPort string, command int) (statu int, err error) {
+
+	var info interface{}
+	url := "http://" + serverIp + ":" + serverPort + "/" + indexName + "/_update_by_query?refresh=true"
+	sourceStr := "ctx._source.videoUrl='" + videoUrl + "'"
+	if command >= 0 {
+		sourceStr = "ctx._source.linkTagInfo[" + strconv.Itoa(command) + "].videoUrl='" + videoUrl + "'"
+	}
+	var videoUrlInfo = `
+        {
+          "script": {
+            "source": "` + sourceStr + `"	
           },
           "query": {
             "term": {
-              "id": "` +id+ `"
+              "id": "` + id + `"
             }
-          },
-            "size":1000000
+          }
         }
         `
-    buf, err := EsReq("POST", "http://"+serverIp+":"+serverPort+"/"+indexName+"/_update_by_query",[]byte(videoUrlInfo))
-    if err != nil {
-        fmt.Println("http request videoUrlInfo info is err!")
-        statu = 500
-        return
-    }
-    json.Unmarshal(buf, &info)
-    out, ok := info.(map[string]interface{})
-    if !ok {
-        fmt.Println("http response interface can not change map[string]interface{}")
-        statu = 500
-        return
-    }
-
-    middle, ok := out["updated"].(float64)
-    if !ok {
-        fmt.Println("first updated change error!")
-        statu = 500
-        return
-    }
-    if middle == 1{
-        statu = 200
-        return
-    }
-    if middle == 0{
-        statu = 201
-        return
-    }
-    return statu
+	//logPrint("url: ", url, videoUrlInfo)
+	buf, err := EsReq("POST", url, []byte(videoUrlInfo))
+	if err != nil {
+		logPrint("http request videoUrlInfo info is err!")
+		statu = 500
+		return statu, err
+	}
+	json.Unmarshal(buf, &info)
+	//logPrint(info)
+	out, ok := info.(map[string]interface{})
+	if !ok {
+		logPrint("http response interface can not change map[string]interface{}")
+		statu = 500
+		return statu, errors.New("http response interface can not change map[string]interface{}")
+	}
+	middle, ok := out["updated"].(float64)
+	if !ok {
+		logPrint("first updated change error!")
+		statu = 500
+		return statu, errors.New("first updated change error!")
+	}
+	if middle == 1 {
+		statu = 200
+		return statu, nil
+	}
+	if middle == 0 {
+		statu = 201
+		return statu, errors.New("宸茬粡淇敼")
+	}
+	return statu, nil
 }
 
-//鑾峰彇褰撳墠鑺傜偣鎶撴媿搴撴墍鏈変汉鍛業D
-func GetAllLocalVideopersonsId(compareArgs protomsg.CompareArgs, indexName string, serverIp string, serverPort string) (capturetable []string) {
+//鑾峰彇褰撳墠鑺傜偣鎶撴媿搴撴墍鏈変汉鍛業D*缂撳瓨*
+func GetAllLocalVideopersonsId(compareArgs protomsg.CompareArgs, indexName string, serverIp string, serverPort string, alarmLevelTypes string) (capturetable []string) {
 	queryStr := ""
 	queryBody := compareArgs.InputValue
 	//妫�绱㈡
 	if queryBody != "" {
-		queryStr = "\"must\":[{\"multi_match\":{\"query\":\"" + queryBody + "\",\"fields\":[\"alarmRules.alarmLevel^1.5\",\"ageDescription^1.5\",\"taskName^1.5\",\"baseInfo.tableName^1.5\",\"sex^2.0\",\"race^2.0\",\"content^1.0\",\"baseInfo.idCard^1.8\",\"cameraAddr^1.0\"]," +
+		queryStr = "\"must\":[{\"multi_match\":{\"query\":\"" + queryBody + "\",\"fields\":[\"cameraAddr^1.5\",\"taskName^1.5\",\"sdkName^1.5\",\"showLabels^3.0\",\"baseInfo.tableName^1.5\",\"baseInfo.targetName^1.5\",\"baseInfo.labels^1.5\",\"alarmRules.alarmLevel^1.5\",\"linkTag^1.5\"]," +
 			"\"type\":\"cross_fields\",\"operator\":\"OR\",\"slop\":0,\"prefix_length\":0,\"max_expansions\":50,\"zero_terms_query\":\"NONE\",\"auto_generate_synonyms_phrase_query\":true,\"fuzzy_transpositions\":true,\"boost\":1}}],"
 	}
-	if compareArgs.SearchTime == nil || len(compareArgs.SearchTime)!=2 {
+	if compareArgs.SearchTime == nil || len(compareArgs.SearchTime) != 2 {
 		return nil
 	}
 	gteDate := compareArgs.SearchTime[0]
@@ -329,6 +947,12 @@
 		isCollectStr = "{\"term\":{\"isCollect\":\"" + isCollect + "\"}},"
 	}
 
+	//鍒ゆ柇甯冮槻绛夌骇
+	alarmLevelStr := ""
+	if alarmLevelTypes != "" {
+		alarmLevelStr = "{\"terms\":{\"alarmRules.alarmLevel.raw\":[\"" + alarmLevelTypes + "\"]}},"
+	}
+
 	//浣跨敤es搴曞眰鏈哄埗澶勭悊鍒嗛〉
 
 	analyServerFilterStr := ""
@@ -352,7 +976,9 @@
 			"\"size\":\"1000\"," +
 			"\"query\":{\"bool\":{" + queryStr +
 			"\"filter\":[" +
+			"{\"term\":{\"targetInfo.targetType.raw\":\"FaceDetect\"}}," +
 			cameraIdStr +
+			alarmLevelStr +
 			taskIdStr +
 			isCollectStr +
 			esTableIdStr +
@@ -364,20 +990,20 @@
 		go func(reqParam string) {
 			defer wg.Done()
 
-			//fmt.Println(url)
-			//fmt.Println(prama)
+			logPrint(url)
+			logPrint(prama)
 			buf, err := EsReq("POST", url, []byte(reqParam))
 
 			if err != nil {
-				fmt.Println("http request videoUrlInfo info is err!")
-				fmt.Println(len(capturetable))
+				logPrint("http request videoUrlInfo info is err!")
+				logPrint(len(capturetable))
 				return
 			}
 
 			sources, err := Sourcelistforscroll(buf)
 
 			if err != nil {
-				fmt.Println(len(capturetable))
+				logPrint(len(capturetable))
 				return
 			}
 			for _, source := range sources["sourcelist"].([]map[string]interface{}) {
@@ -401,12 +1027,12 @@
             "scroll": "1m", 
             "scroll_id" : "` + scroll_id + `"
         }`
-				//fmt.Println(scroll_url)
-				//fmt.Println(jsonDSL)
+				logPrint(scroll_url)
+				logPrint(jsonDSL)
 				buf, err := EsReq("POST", scroll_url, []byte(jsonDSL))
 
 				if err != nil {
-					fmt.Println("lenth1: ", len(capturetable))
+					logPrint("lenth1: ", len(capturetable))
 					return
 				}
 				nextSources, err := Sourcelistforscroll(buf)
@@ -416,16 +1042,16 @@
 				}
 
 				nextM := nextSources["sourcelist"].([]map[string]interface{})
-				//fmt.Println("id",nextSources)
+				//logPrint("id",nextSources)
 				if nextM == nil || len(nextM) == 0 {
-					//fmt.Println("lenth: ", len(capturetable))
+					//logPrint("lenth: ", len(capturetable))
 					return
 				}
-				//fmt.Println("id")
+				//logPrint("id")
 				for _, source := range nextM {
 					tmpList = append(tmpList, source["id"].(string))
 				}
-				//fmt.Println("tmpList: ", len(tmpList))
+				//logPrint("tmpList: ", len(tmpList))
 				lock.Lock()
 				capturetable = append(capturetable, tmpList...)
 				lock.Unlock()
@@ -437,121 +1063,69 @@
 	}
 	wg.Wait()
 
-	fmt.Println("lenth_all: ", len(capturetable))
-	fmt.Println("鑰楁椂锛�", time.Since(ts))
+	logPrint("lenth_all: ", len(capturetable))
+	logPrint("鑰楁椂锛�", time.Since(ts))
 	return capturetable
 }
 
-//鑾峰彇搴曞簱浜哄憳ID
-func GetDbpersonsId(compareArgs  protomsg.CompareArgs,indexName string, serverIp string, serverPort string) (source map[string][]string) {
-    queryStr := ""
-    queryBody := compareArgs.InputValue
-    //妫�绱㈡
-    if queryBody != "" {
-        queryStr = "\"must\":[{\"multi_match\":{\"query\":\"" + queryBody + "\",\"fields\":[\"personName^1.5\",\"age^1.5\",\"idCard^1.5\",\"phoneNum^1.5\",\"sex^2.0\",\"reserved^2.0\"]," +
-            "\"type\":\"cross_fields\",\"operator\":\"OR\",\"slop\":0,\"prefix_length\":0,\"max_expansions\":50,\"zero_terms_query\":\"NONE\",\"auto_generate_synonyms_phrase_query\":true,\"fuzzy_transpositions\":true,\"boost\":1}}],"
-    }
-    //鍒ゆ柇搴撹〃ID
-    tableId := compareArgs.Tabs
-    esTableId := ""
-    esTableIdStr := ""
-    if tableId != nil && len(tableId) > 0 {
-        esTableId = strings.Replace(strings.Trim(fmt.Sprint(tableId), "[]"), " ", "\",\"", -1)
-        esTableIdStr = "{\"terms\":{\"tableId\":[\"" + esTableId + "\"]}}"
-    }
-
-    prama := "{" +
-        "\"size\":\"100000000\"," +
-        "\"query\":{\"bool\":{" + queryStr +
-        "\"filter\":[" +
-        esTableIdStr +
-        "]}}," +
-        "\"_source\":[\"id\",\"tableId\"]" +
-        "}"
-
-    url := "http://" + serverIp + ":" + serverPort +
-        "/" + indexName + "/_search?search_type=dfs_query_then_fetch"
-    fmt.Println(url)
-    fmt.Println(prama)		
-    buf, err := EsReq("POST", url,[]byte(prama))
-    if err != nil {
-        fmt.Println("http request videoUrlInfo info is err!")
-        return
-    }
-    sources, err := Sourcelist(buf)
-    if err != nil {
-        return
-    }
-    tabsource := make(map[string][]string)
-    for _, source := range  sources{
-        tableId := source["tableId"].(string)
-        id := source["id"].(string)
-        tabsource[tableId] = append(tabsource[tableId], id)
-    }
-    return tabsource
-}
-
 //鍒濆鍖栧疄鏃舵姄鎷�
-func InitRealTimeCapture(serverIp string, serverPort string, indexName string, isAlarm bool	,quantity int) ([]protomsg.Videopersons, error){
-	var videopersonsInfo []protomsg.Videopersons
+func InitRealTimeCapture(serverIp string, serverPort string, indexName string, isAlarm string, category string, quantity int) ([]protomsg.AIOcean, error) {
+	var aIOceanInfo []protomsg.AIOcean
 	url := "http://" + serverIp + ":" + serverPort +
 		"/" + indexName + "/_search"
-	queryStr := ""
-	if isAlarm == true {
-		queryStr = `"query":{
-		"match_all":{}
-	},`
-	} else {
-		queryStr = `"query":{
+	var filterArr []string
+	if isAlarm != "all" {
+		filterArr = append(filterArr, `				{
+					"term":{
+						"isAlarm":"`+isAlarm+`"
+					}
+				}`)
+	}
+
+	if category != "all" {
+		filterArr = append(filterArr, `				{
+					"term":{
+						"targetInfo.targetType.raw":"`+category+`"
+					}
+				}`)
+
+	}
+
+	queryStr := `"query":{
 		"bool":{
 			"filter":[
-				{
-					"term":{
-						"isAlarm":1
-					}
-				}
+				` + strings.Join(filterArr, ",") + `
 			]
 		}
 	},`
-	}
+
 	DSLJson := `{
-	"size":`+strconv.Itoa(quantity)+`,
-	`+queryStr+`
+	"size":` + strconv.Itoa(quantity) + `,
+	` + queryStr + `
 	"sort":[{"picDate":{"order":"desc"}}],
-	"_source": ["baseInfo", "alarmRules", "sex", "analyServerName", "sdkName", "ageDescription", "content", "id", "cameraAddr", "picMaxUrl", "picDate", "race", "videoUrl", "picSmUrl", "taskName", "personIsHub", "isAlarm", "analyServerIp", "cameraId"]
+	"_source": {"includes":[],"excludes":["*.feature"]}
 	}`
+	//logPrint(DSLJson)
 	buf, err := EsReq("POST", url, []byte(DSLJson))
 	if err != nil {
-		return videopersonsInfo, err
+		return aIOceanInfo, err
 	}
 
 	sources, err := Sourcelist(buf)
 	if err != nil {
-		return videopersonsInfo, err
+		return aIOceanInfo, err
 	}
 
-	videoperson := Videopersonsbyid(sources)
-	//fmt.Println(len(videoperson))
-	return videoperson, nil
+	aIOcean := AIOceanAnalysis(sources)
+	//logPrint(len(videoperson))
+	return aIOcean, nil
 }
 
 //瀹炴椂鎶撴媿
-func RealTimeCapture(serverIp string, serverPort string, indexName string, isAlarm bool	) ([]protomsg.Videopersons, error){
-	var videopersonsInfo []protomsg.Videopersons
+func RealTimeCapture(serverIp string, serverPort string, indexName string, isAlarm bool) ([]protomsg.AIOcean, error) {
+	var aIOceanInfo []protomsg.AIOcean
 	url := "http://" + serverIp + ":" + serverPort +
 		"/" + indexName + "/_search"
-	queryStr := ""
-	if isAlarm == true {
-		fmt.Println("continue")
-	} else {
-		queryStr = `
-				{
-					"term":{
-						"isAlarm":1
-					}
-				}
-					`
-	}
 	DSLJson := `{
 	"size":20,
 	"query":{
@@ -565,54 +1139,63 @@
 						}		
 					}
 				},
-			`+queryStr+`
+				{
+					"term":{
+						"isAlarm":` + strconv.FormatBool(isAlarm) + `
+					}
+				}
 			]
 		}
 	},
-	"_source": ["baseInfo", "alarmRules", "sex", "analyServerName", "sdkName", "ageDescription", "content", "id", "cameraAddr", "picMaxUrl", "picDate", "race", "videoUrl", "picSmUrl", "taskName", "personIsHub", "isAlarm", "analyServerIp", "cameraId", "isAckAlarm"]
+	"_source": {"includes":[],"excludes":["*.feature"]}
 	}`
 
 	buf, err := EsReq("POST", url, []byte(DSLJson))
 	if err != nil {
-		return videopersonsInfo, err
+		return aIOceanInfo, err
 	}
 
 	sources, err := Sourcelist(buf)
 	if err != nil {
-		return videopersonsInfo, err
+		return aIOceanInfo, err
 	}
 
-	videoperson := Videopersonsbyid(sources)
-	fmt.Println(len(videoperson))
-	return videoperson, nil
+	aIOcean := AIOceanAnalysis(sources)
+	logPrint(len(aIOcean))
+	return aIOcean, nil
 }
 
 //缁煎悎缁熻
-func StatisticsComprehensive(serverIp string, serverPort string, indexName string, isAlarm bool) (total int, err error){
-	isAlarmStr := ""
-	if isAlarm == true {
-		isAlarmStr = `,{"term":{"isAlarm":1}}`
-	}
+func StatisticsComprehensive(serverIp string, serverPort string, indexName string, isAlarm string) (total int, err error) {
 	url := "http://" + serverIp + ":" + serverPort +
 		"/" + indexName + "/_search"
+	isAlarmStr := ""
+	if isAlarm != "all" {
+		isAlarmStr = `				{
+					"term":{
+						"isAlarm":"` + isAlarm + `"
+					}
+				},`
+
+	}
 	DSLJson := `{
 	"size":0,
 	"query":{
 		"bool":{
-			"filter":[{
+			"filter":[
+				` + isAlarmStr + `
+				{
 				"range":{
 					"picDate":{
 						"gte":"now+8h/d"
 						}
 					}
 				}
-				`+isAlarmStr+`
 				]
 			}
 		}
 	}`
-	//fmt.Println(DSLJson)
-	buf, err := EsReq("POST",url,[]byte(DSLJson))
+	buf, err := EsReq("POST", url, []byte(DSLJson))
 	if err != nil {
 		return total, err
 	}
@@ -627,14 +1210,14 @@
 		return total, errors.New("first hits change error!")
 	}
 	total = int(middle["total"].(float64))
-	//fmt.Println(total)
-	return total,nil
+	//logPrint(total)
+	return total, nil
 }
 
 //瀹炴椂鎶ヨ浠诲姟姣旂巼
-func RealTimeAlarmTaskRate(serverIp string, serverPort string, indexName string) (sources []map[string]interface{},err error){
+func RealTimeAlarmTaskRate(serverIp string, serverPort string, indexName string) (sources []map[string]interface{}, err error) {
 	url := "http://" + serverIp + ":" + serverPort +
-		"/"+indexName+"/_search"
+		"/" + indexName + "/_search"
 	DSLJson := `{
 	"size":0,
 	"query":{
@@ -649,14 +1232,14 @@
 		}
 	},
 	"aggs":{
-		"sdkName_status":{
+		"taskName_status":{
 			"terms":{
 				"field":"taskName.raw"
 			}
 		}
 	}
 }`
-	buf, err := EsReq("POST",url,[]byte(DSLJson))
+	buf, err := EsReq("POST", url, []byte(DSLJson))
 	if err != nil {
 		return nil, err
 	}
@@ -670,16 +1253,16 @@
 	if !ok {
 		return nil, errors.New("first hits change error!")
 	}
-	sdkName_status, ok := middle["sdkName_status"].(map[string]interface{})
+	sdkName_status, ok := middle["taskName_status"].(map[string]interface{})
 	if !ok {
 		return nil, errors.New("first hits change error!")
 	}
-
-	for _, in := range sdkName_status["buckets"].([]interface{}){
-		var source = make(map[string]interface{},0)
+	//fmt.Println(sdkName_status)
+	for _, in := range sdkName_status["buckets"].([]interface{}) {
+		var source = make(map[string]interface{}, 0)
 		tmpbuf, ok := in.(map[string]interface{})
 		if !ok {
-			fmt.Println("change to source error!")
+			logPrint("change to source error!")
 			continue
 		}
 		sdkName := tmpbuf["key"].(string)
@@ -688,14 +1271,29 @@
 		source["value"] = count
 		sources = append(sources, source)
 	}
-	//fmt.Println("tmpSource",sources)
-	return sources,nil
+	//logPrint("tmpSource",sources)
+	return sources, nil
 }
 
 //鑱氬悎浠诲姟鍒楄〃锛宼askId+taskName
-func AggregateTaskList(serverIp string, serverPort string, indexName string) (sources []map[string]interface{},err error){
+func AggregateTaskList(serverIp string, serverPort string, indexName string, analyServerId string) (sources []map[string]interface{}, err error) {
 	url := "http://" + serverIp + ":" + serverPort +
-		"/"+indexName+"/_search"
+		"/" + indexName + "/_search"
+	serverFilterStr := ""
+	if analyServerId != "" {
+		serverFilterStr = `,
+			"query": {
+			"bool": {
+				"filter": [
+				{
+				"term": {
+				"analyServerId": "` + analyServerId + `"
+				}
+				}
+			]
+			}
+		}`
+	}
 	DSLJson := `{
     "size": 0,
     "aggs": {
@@ -717,12 +1315,13 @@
                         }
                     }
                 ],
-                "size":"1000"
+                "size":"1000000"
             }
         }
     }
+	` + serverFilterStr + `
 }`
-	buf, err := EsReq("POST",url,[]byte(DSLJson))
+	buf, err := EsReq("POST", url, []byte(DSLJson))
 	if err != nil {
 		return nil, err
 	}
@@ -741,11 +1340,11 @@
 		return nil, errors.New("first hits change error!")
 	}
 
-	for _, in := range task_status["buckets"].([]interface{}){
-		var source = make(map[string]interface{},0)
+	for _, in := range task_status["buckets"].([]interface{}) {
+		var source = make(map[string]interface{}, 0)
 		tmpbuf, ok := in.(map[string]interface{})
 		if !ok {
-			fmt.Println("change to source error!")
+			logPrint("change to source error!")
 			continue
 		}
 		task := tmpbuf["key"].(map[string]interface{})
@@ -757,7 +1356,445 @@
 		source["count"] = count
 		sources = append(sources, source)
 	}
-	//fmt.Println("tmpSource",sources)
-	return sources,nil
+	//logPrint("tmpSource",sources)
+	return sources, nil
 
 }
+
+//娣诲姞鍗冲皢鍒犻櫎淇″彿
+func AddDeleteSignal() {
+
+}
+
+/****************************************浠ヤ笅涓簊dkCompare姣斿缂撳瓨浣跨敤鏂规硶*********************************************/
+//鑾峰彇鏌ヨ鎬绘暟 *缂撳瓨*
+func GetTotal(serverIp string, serverPort string, indexName string, shards string, targetType string) (total int) {
+	JsonDSL := `{
+	"size": 0,
+	"query": {
+		"bool": {
+			"filter": [{
+				"term": {
+					"targetInfo.targetType.raw": "` + targetType + `"
+				}
+			}]
+		}
+	}
+}`
+
+	url := "http://" + serverIp + ":" + serverPort + "/" + indexName + "/_search?preference=_shards:" + shards + "|_only_local"
+	buf, err := EsReq("POST", url, []byte(JsonDSL))
+	if err != nil {
+		return
+	}
+	var info interface{}
+	json.Unmarshal(buf, &info)
+	out, ok := info.(map[string]interface{})
+	if !ok {
+		return
+	}
+	middle, ok := out["hits"].(map[string]interface{})
+	if !ok {
+		return
+	}
+	total = int(middle["total"].(float64))
+	return total
+
+}
+
+//鏌ヨ鏃堕棿娈垫暟鎹� *缂撳瓨*
+func GetPeriodInfos(serverIp string, serverPort string, startTime string, endTime string, indexName string, shards string, targetType string) ([]*protomsg.MultiFeaCache, error) {
+	var capdbinfo []*protomsg.MultiFeaCache
+	url := "http://" + serverIp + ":" + serverPort + "/" + indexName + "/_search?preference=_shards:" + shards + "|_only_local"
+	var source []string
+	switch targetType {
+	case "face", "FaceDetect":
+		source = []string{"id", "targetInfo.feature", "analyServerId", "cameraId"}
+	case "track":
+		source = []string{"id", "targetInfo.feature", "analyServerId", "cameraId", "targetInfo.attachTarget.feature", "targetInfo.targetLocation", "linkTagInfo.targetInfo.feature", "linkTagInfo.targetInfo.attachTarget.feature", "linkTagInfo.cameraId", "linkTagInfo.targetInfo.targetLocation"}
+	}
+	JsonDSL := `
+				{
+				    "query": {
+				        "bool": {
+				            "filter": [
+				                {
+				                    "term": {
+				                        "targetInfo.targetType.raw": "` + targetType + `"
+				                    }
+				                },
+				                {
+				                    "range": {
+				                        "picDate": {
+				                            "gte": "` + startTime + `",
+				                            "lt": "` + endTime + `"
+				                        }
+				                    }
+				                }
+				            ]
+				        }
+				    },
+				    "size": 1000000,
+				    "_source": ["` + strings.Replace(strings.Trim(fmt.Sprint(source), "[]"), " ", "\",\"", -1) + `"]
+				}
+    `
+	//logger.Debug(url)
+	//logger.Debug(JsonDSL)
+	//logPrint(JsonDSL)
+	buf, err := EsReq("POST", url, []byte(JsonDSL))
+	if err != nil {
+		return capdbinfo, errors.New("http request dbtablename info is err!")
+	}
+
+	// 杩斿洖 _source 鏁扮粍
+	sources, err := Sourcelist(buf)
+	if err != nil {
+		return capdbinfo, err
+	}
+	//logPrint(sources)
+	// 杩斿洖鎵�鏈夋煡璇㈢殑鏁版嵁
+	capdbinfos := Parsesources(sources)
+	return capdbinfos, nil
+}
+
+// 鏌ヨ搴曞簱浜哄憳淇℃伅*缂撳瓨*
+func GetOceanFeatures(serverIp string, serverPort string, queryNums int, indexName string, shards string, targetType string) ([]*protomsg.MultiFeaCache, error) {
+	//queryIndexNum int
+	//var dbinfos []*protomsg.MultiFeaCache
+	dbinfos := make([]*protomsg.MultiFeaCache, 0)
+	//dbinfosss := make([]*protomsg.MultiFeaCache,0)
+	//dbinfoss = append(dbinfoss, dbinfosss...)
+
+	JsonDSL := ""
+	var source []string
+	switch targetType {
+	case "face", "FaceDetect":
+		source = []string{"id", "targetInfo.feature", "analyServerId"}
+	case "track":
+		source = []string{"id", "targetInfo.feature", "analyServerId", "targetInfo.attachTarget.feature", "targetInfo.targetLocation", "linkTagInfo.targetInfo.feature", "linkTagInfo.targetInfo.attachTarget.feature", "linkTagInfo.targetInfo.targetLocation"}
+	}
+
+	url := "http://" + serverIp + ":" + serverPort + "/" + indexName + "/_search?preference=_shards:" + shards + "|_only_local;scroll=1m"
+
+	var lock sync.RWMutex
+	var wg sync.WaitGroup
+
+	for i := 0; i < 48; i++ {
+		//璇锋眰浣�
+		JsonDSL = `  {
+                    "slice": {
+						"id": "` + strconv.Itoa(i) + `",
+						"max": 48 
+					},
+					"size":` + strconv.Itoa(queryNums) + `,
+                    "query": {
+						"bool": {
+							"filter": [
+								{
+									"term": {
+										"targetInfo.targetType.raw": "` + targetType + `"
+								}
+									}
+							]
+						}	
+					},
+                     "_source": ["` + strings.Replace(strings.Trim(fmt.Sprint(source), "[]"), " ", "\",\"", -1) + `"]
+                    }`
+		wg.Add(1)
+		go func(reqJsonDSL string) {
+			defer wg.Done()
+
+			//fmt.Println(url)
+			//fmt.Println(prama)
+			//logPrint("url: ",url)
+			//logPrint("url: ",reqJsonDSL)
+			buf, err := EsReq("POST", url, []byte(reqJsonDSL))
+			if err != nil {
+				logPrint("EsReq: ", err)
+				return
+			}
+
+			// 杩斿洖 _source 鏁扮粍
+			sources, err := Sourcelistforscroll(buf)
+			if err != nil {
+				logPrint("EsReq: ", err)
+				return
+			}
+			// 杩斿洖鎵�鏈夋煡璇㈢殑鏁版嵁
+			ftmpDatas := Parsesources(sources["sourcelist"].([]map[string]interface{}))
+			lock.Lock()
+			dbinfos = append(dbinfos, ftmpDatas...)
+			//logPrint("prsLen: ", len(Parsesources(sources["sourcelist"].([]map[string]interface{}))))
+			//logPrint("dbinfosLen: ", len(dbinfos))
+			lock.Unlock()
+
+			scroll_id := sources["scroll_id"].(string)
+
+			//scroll璇锋眰澶�
+			scroll_url := "http://" + serverIp + ":" + serverPort + "/_search/scroll"
+			for {
+				next_scroll_id := ""
+				if next_scroll_id != "" {
+					scroll_id = next_scroll_id
+				}
+				jsonDSL := `{
+            "scroll": "1m", 
+            "scroll_id" : "` + scroll_id + `"
+        }`
+				//fmt.Println(scroll_url)
+				//fmt.Println(jsonDSL)
+				buf, err := EsReq("POST", scroll_url, []byte(jsonDSL))
+
+				if err != nil {
+					//fmt.Println("lenth1: ", len(dbinfos))
+					return
+				}
+				nextSources, err := Sourcelistforscroll(buf)
+
+				if nextSources == nil {
+					return
+				}
+
+				nextM := nextSources["sourcelist"].([]map[string]interface{})
+				//fmt.Println("id",nextSources)
+				if nextM == nil || len(nextM) == 0 {
+					//fmt.Println("lenth: ", len(capturetable))
+					return
+				}
+				tmpDatas := Parsesources(nextM)
+				lock.Lock()
+				dbinfos = append(dbinfos, tmpDatas...)
+				//logPrint("tmpDatasLen: ", len(tmpDatas))
+				//logPrint("AdbinfosLen: ", len(dbinfos))
+				lock.Unlock()
+
+				next_scroll_id = nextSources["scroll_id"].(string)
+			}
+
+		}(JsonDSL)
+	}
+	wg.Wait()
+
+	//fmt.Println("lenth_all: ", len(dbinfos))
+
+	return dbinfos, nil
+}
+
+//************************CORN TASK*******************************
+//鏌ヨ鏃ユ湡鑼冨洿鍐呮槸鍚﹁繕瀛樺湪鏁版嵁
+func QueryAnalyServerData(serverIp string, serverPort string, indexName string, startTime string, endTime string, analyServerId string) (result bool, err error) {
+	url := "http://" + serverIp + ":" + serverPort + "/" + indexName + "/_search"
+	deleteJson := `{
+	"query":{
+		"bool":{
+			"filter":[{
+				"range":{
+					"updateTime":{
+						"gte":"` + startTime + `",
+						"lte":"` + endTime + `"
+					}
+				}
+			},
+			{
+				"term":{
+					"analyServerId":"` + analyServerId + `"
+				}
+			}
+			]
+		}
+	}
+}	`
+	buf, err := EsReq("POST", url, []byte(deleteJson))
+	if err != nil {
+		return false, errors.New("璇锋眰澶辫触")
+	}
+	resTotal, err := SourceTotal(buf)
+	if err != nil {
+		return false, errors.New("瑙g爜澶辫触")
+	}
+	if resTotal == -1 || resTotal == 0 {
+		result = false
+	} else {
+		result = true
+	}
+	return result, nil
+}
+
+//鎸夋棩鏈熻寖鍥达紝鏈嶅姟鍣↖d鍒犻櫎鏁版嵁
+func DeleteAnalyServerData(serverIp string, serverPort string, indexName string, startTime string, endTime string, analyServerId string) (result bool, err error) {
+	url := "http://" + serverIp + ":" + serverPort + "/" + indexName + "/_delete_by_query"
+	deleteJson := `{
+	"query":{
+		"bool":{
+			"filter":[{
+				"range":{
+					"updateTime":{
+						"gte":"` + startTime + `",
+						"lte":"` + endTime + `"
+					}
+				}
+			},
+			{
+				"term":{
+					"analyServerId":"` + analyServerId + `"
+				}
+			}
+			]
+		}
+	}
+}	`
+	buf, err := EsReq("POST", url, []byte(deleteJson))
+	if err != nil {
+		return false, errors.New("璇锋眰澶辫触")
+	}
+	deleteRes, err := SourceDeleted(buf)
+	if err != nil {
+		return false, errors.New("瑙g爜澶辫触")
+	}
+	if deleteRes == -1 {
+		result = false
+	} else {
+		result = true
+	}
+	return result, nil
+}
+
+//缁欐墍鏈夎妭鐐硅拷鍔犲垹闄や换鍔′俊鎭�
+func AddDelTask(serverIp string, serverPort string, indexName string, startTime string, endTime string, analyServerId string) (result bool, err error) {
+	url := "http://" + serverIp + ":" + serverPort + "/" + indexName + "/_update_by_query"
+	addJson := `{
+    "script": {
+    	"lang":"painless",
+        "inline": "ctx._source.instantTask.add(params.newtask)",
+        "params": {
+            "newtask": {
+                "instantClearId": "` + analyServerId + `",
+                "startTime": "` + startTime + `",
+                "endTime": "` + endTime + `"
+            }
+        }
+    },
+    "query": {
+        "bool": {
+            "filter": [
+                {
+                    "term": {
+                        "application": "loopCoverage"
+                    }
+                }
+            ]
+        }
+    }
+}`
+	buf, err := EsReq("POST", url, []byte(addJson))
+	if err != nil {
+		return false, errors.New("璇锋眰澶辫触")
+	}
+	updateRes, err := SourceUpdated(buf)
+	if err != nil {
+		return false, errors.New("瑙g爜澶辫触")
+	}
+	if updateRes == -1 {
+		result = false
+	} else {
+		result = true
+	}
+	return result, nil
+}
+
+//绉婚櫎宸叉墽琛屽畬鐨勫垹闄や换鍔�
+func DeleteDelTask(serverIp string, serverPort string, indexName string, analyServerId string) (result bool, err error) {
+	url := "http://" + serverIp + ":" + serverPort + "/" + indexName + "/_update_by_query"
+	deleteJson := `{
+    "script": {
+    	"lang":"painless",
+        "inline": "ctx._source.instantTask.remove(0)"
+    },
+    "query": {
+        "bool": {
+        	"filter":[{
+        		"term":{
+        			"id":"` + analyServerId + `"
+        		}
+        	}]
+        }
+    }
+}`
+	buf, err := EsReq("POST", url, []byte(deleteJson))
+	if err != nil {
+		return false, errors.New("璇锋眰澶辫触")
+	}
+	updateRes, err := SourceUpdated(buf)
+	if err != nil {
+		return false, errors.New("瑙g爜澶辫触")
+	}
+	if updateRes == -1 {
+		result = false
+	} else {
+		result = true
+	}
+	return result, nil
+}
+
+type ShardInfo struct {
+	ShardIndex string `json:"shardIndex"` //鍒嗙墖鎵�灞炵储寮曞悕绉�
+	ShardNum   int    `json:"shardNum"`   //鍒嗙墖鍙�
+	ShardRole  string `json:"shardRole"`  //鍒嗙墖瑙掕壊(涓诲垎鐗囷細primary 鍓湰鍒嗙墖锛歳eplica)
+	ShardState string `json:"shardState"` //鍒嗙墖鐘舵��(鍚敤锛歋TARTED 鏈惎鐢細UNASSIGNED)
+	ShardDocs  int    `json:"shardDocs"`  //鍒嗙墖宸蹭繚瀛樻枃妗f暟
+	ShardStore string `json:"shardStore"` //鍒嗙墖褰撳墠瀛樺偍鏁版嵁澶у皬
+	ShardIp    string `json:"shardIp"`    //鍒嗙墖鎵�鍦ㄨ妭鐐筰p
+	ShardNode  string `json:"shardNode"`  //鍒嗙墖鎵�鍦ㄨ妭鐐瑰悕绉�
+}
+
+//鑾峰彇绱㈠紩鍒嗙墖淇℃伅
+func GetShardsByIndex(serverIp string, serverPort string, indexName string) ([]ShardInfo, error) {
+	url := "http://" + serverIp + ":" + serverPort + "/_cat/shards?v"
+	buf, err := EsReq("GET", url, []byte(""))
+	if err != nil {
+		return nil, err
+	}
+	var inf = []ShardInfo{}
+	res := strings.Split(string(buf), "\n")[1:]
+	for _, r := range res {
+		if r != "" {
+
+			inx := strings.Fields(r)
+			index := inx[0]
+			shard, _ := strconv.Atoi(inx[1])
+			prired := inx[2]
+			if prired == "r" {
+				prired = "replica"
+			}
+			if prired == "p" {
+				prired = "primary"
+			}
+			state := inx[3]
+			docs := 0
+			store := ""
+			ip := ""
+			node := ""
+			if state == "STARTED" {
+				docs, _ = strconv.Atoi(inx[4])
+				store = inx[5]
+				ip = inx[6]
+				node = inx[7]
+			}
+			if index == indexName {
+				inf = append(inf, ShardInfo{
+					ShardIndex: index,
+					ShardNum:   shard,
+					ShardRole:  prired,
+					ShardState: state,
+					ShardDocs:  docs,
+					ShardStore: store,
+					ShardIp:    ip,
+					ShardNode:  node,
+				})
+
+			}
+		}
+
+	}
+	return inf, nil
+}

--
Gitblit v1.8.0