From efbf83e4778cb61e7da23c8a4a62b352929b40ea Mon Sep 17 00:00:00 2001
From: liuxiaolong <736321739@qq.com>
Date: 星期四, 21 十一月 2019 17:56:38 +0800
Subject: [PATCH] fix
---
EsApi.go | 671 ++++++++++++++++++++++++++-----------------------------
1 files changed, 316 insertions(+), 355 deletions(-)
diff --git a/EsApi.go b/EsApi.go
index 391f9e6..f5cd55c 100644
--- a/EsApi.go
+++ b/EsApi.go
@@ -1,110 +1,20 @@
package esutil
import (
- "encoding/json"
- "errors"
- "fmt"
- "strconv"
- "strings"
+ "encoding/json"
+ "errors"
+ "fmt"
+ "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
-}
-
-// 鏍规嵁搴曞簱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
-}
+)
// 鏍规嵁鎶撴媿浜哄憳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 = `
{
@@ -113,7 +23,7 @@
"filter": [{
"terms": {
"id": [
- "`+ videopersonsPersonId +`"
+ "` + videopersonsPersonId + `"
]
}
}]
@@ -122,177 +32,114 @@
"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)
+ println(aIOcean)
+ 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": [
- {
- "term": {
- "id":"`+tableid+`"
- }
- }
- ]
- }
- },
- "_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
-}
-
//鏍规嵁鎶撴媿浜哄憳id鏇存柊锛坴ideourl锛夋憚鍍忔満鍦板潃
-func UpdateVideourlById(id string, videoUrl string, indexName string, serverIp string, serverPort string)(statu int){
- var info interface{}
- var videoUrlInfo = `
+func UpdateVideourlById(id string, videoUrl string, indexName string, serverIp string, serverPort string, command int) (statu int) {
+
+ 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": "ctx._source.videoUrl='` + videoUrl + `'"
+ "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
+ //fmt.Println("url: ", url, videoUrlInfo)
+ buf, err := EsReq("POST", url, []byte(videoUrlInfo))
+ if err != nil {
+ fmt.Println("http request videoUrlInfo info is err!")
+ statu = 500
+ return
+ }
+ json.Unmarshal(buf, &info)
+ //fmt.Println(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
}
//鑾峰彇褰撳墠鑺傜偣鎶撴媿搴撴墍鏈変汉鍛業D
-func GetAllLocalVideopersonsId(compareArgs protomsg.CompareArgs, indexName string, serverIp string, serverPort string) (capturetable []string) {
+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 {
+ return nil
}
gteDate := compareArgs.SearchTime[0]
lteDate := compareArgs.SearchTime[1]
@@ -325,6 +172,12 @@
isCollectStr = "{\"term\":{\"isCollect\":\"" + isCollect + "\"}},"
}
+ //鍒ゆ柇甯冮槻绛夌骇
+ alarmLevelStr := ""
+ if alarmLevelTypes != "" {
+ alarmLevelStr = "{\"terms\":{\"alarmRules.alarmLevel.raw\":[\"" + alarmLevelTypes + "\"]}},"
+ }
+
//浣跨敤es搴曞眰鏈哄埗澶勭悊鍒嗛〉
analyServerFilterStr := ""
@@ -333,7 +186,7 @@
analyServerFilterStr = "{\"term\":{\"analyServerId\":\"" + analyServerId + "\"}},"
}
-
+ ts := time.Now()
//棣栨璇锋眰澶�
url := "http://" + serverIp + ":" + serverPort +
"/" + indexName + "/_search?search_type=dfs_query_then_fetch;scroll=1m"
@@ -341,14 +194,16 @@
var lock sync.RWMutex
var wg sync.WaitGroup
- for i := 0; i < 32; i++ {
+ for i := 0; i < 48; i++ {
//璇锋眰浣�
prama := "{" +
"\"slice\":{\"id\":" + strconv.Itoa(i) + ",\"max\":48}," +
"\"size\":\"1000\"," +
"\"query\":{\"bool\":{" + queryStr +
"\"filter\":[" +
+ "{\"term\":{\"targetInfo.targetType.raw\":\"face\"}}," +
cameraIdStr +
+ alarmLevelStr +
taskIdStr +
isCollectStr +
esTableIdStr +
@@ -357,12 +212,12 @@
"\"_source\":[\"id\"]" +
"}"
wg.Add(1)
- go func() {
+ go func(reqParam string) {
defer wg.Done()
//fmt.Println(url)
//fmt.Println(prama)
- buf, err := EsReq("POST", url, []byte(prama))
+ buf, err := EsReq("POST", url, []byte(reqParam))
if err != nil {
fmt.Println("http request videoUrlInfo info is err!")
@@ -377,7 +232,9 @@
return
}
for _, source := range sources["sourcelist"].([]map[string]interface{}) {
+ lock.Lock()
capturetable = append(capturetable, source["id"].(string))
+ lock.Unlock()
}
scroll_id := sources["scroll_id"].(string)
@@ -427,128 +284,73 @@
next_scroll_id = nextSources["scroll_id"].(string)
}
-
- fmt.Println(len(capturetable))
-
- }()
+ }(prama)
}
wg.Wait()
- //fmt.Println("lenth_all: ", len(capturetable))
- //fmt.Println("鑰楁椂锛�", time.Since(ts))
+ fmt.Println("lenth_all: ", len(capturetable))
+ fmt.Println("鑰楁椂锛�", 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":"` + 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"]}
}`
+ fmt.Println(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)
+ aIOcean := AIOceanAnalysis(sources)
//fmt.Println(len(videoperson))
- return videoperson, nil
+ 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":{
@@ -562,54 +364,64 @@
}
}
},
- `+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)
+ fmt.Println(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
}
@@ -625,13 +437,13 @@
}
total = int(middle["total"].(float64))
//fmt.Println(total)
- return total,nil
+ 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":{
@@ -648,12 +460,12 @@
"aggs":{
"sdkName_status":{
"terms":{
- "field":"taskName.raw"
+ "field":"sdkName.raw"
}
}
}
}`
- buf, err := EsReq("POST",url,[]byte(DSLJson))
+ buf, err := EsReq("POST", url, []byte(DSLJson))
if err != nil {
return nil, err
}
@@ -672,8 +484,8 @@
return nil, errors.New("first hits change error!")
}
- for _, in := range sdkName_status["buckets"].([]interface{}){
- var source = make(map[string]interface{},0)
+ 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!")
@@ -686,13 +498,28 @@
sources = append(sources, source)
}
//fmt.Println("tmpSource",sources)
- return sources,nil
+ 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": {
@@ -714,12 +541,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
}
@@ -738,8 +566,8 @@
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!")
@@ -755,6 +583,139 @@
sources = append(sources, source)
}
//fmt.Println("tmpSource",sources)
- return sources,nil
+ return sources, nil
}
+
+/****************************************浠ヤ笅涓簊dkCompare姣斿缂撳瓨浣跨敤鏂规硶*********************************************/
+//鑾峰彇鏌ヨ鎬绘暟
+func GetTotal(serverIp string, serverPort string, indexName string, shards string) (total int) {
+ JsonDSL := `{
+ "size": 0,
+ "query": {
+ "bool": {
+ "filter": [{
+ "term": {
+ "targetInfo.targetType.raw": "face"
+ }
+ }]
+ }
+ }
+}`
+
+ url := "http://" + serverIp + ":" + serverPort + "/" + indexName + "/_search"
+ 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) ([]*protomsg.Esinfo, error) {
+ var capdbinfo []*protomsg.Esinfo
+ url := "http://" + serverIp + ":" + serverPort + "/" + indexName + "/_search?preference=_shards:" + shards + "|_only_local"
+
+ JsonDSL := `
+ {
+ "query": {
+ "bool": {
+ "filter": [
+ {
+ "term": {
+ "targetInfo.targetType.raw": "face"
+ }
+ },
+ {
+ "range": {
+ "picDate": {
+ "gte": "` + startTime + `",
+ "lt": "` + endTime + `"
+ }
+ }
+ }
+ ]
+ }
+ },
+ "size": 1000000,
+ "_source": [
+ "id",
+ "targetInfo.feature",
+ "analyServerId"
+ ]
+ }
+ `
+ //logger.Debug(url)
+ //logger.Debug(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
+ }
+
+ // 杩斿洖鎵�鏈夋煡璇㈢殑鏁版嵁
+ capdbinfos := Parsesources(sources)
+ return capdbinfos, nil
+
+}
+
+// 鏌ヨ搴曞簱浜哄憳淇℃伅
+func GetOceanFeatures(serverIp string, serverPort string, queryIndexNum int, queryNums int, indexName string, shards string) ([]*protomsg.Esinfo, error) {
+ var dbinfos []*protomsg.Esinfo
+ point := strconv.Itoa(queryIndexNum)
+ number := strconv.Itoa(queryNums)
+ JsonDSL := ""
+ url := "http://" + serverIp + ":" + serverPort + "/" + indexName + "/_search?preference=_shards:" + shards + "|_only_local"
+ JsonDSL = ` {
+ "from": ` + point + `,
+ "query": {
+ "bool": {
+ "filter": [
+ {
+ "term": {
+ "targetInfo.targetType.raw": "face"
+ }
+ }
+ ]
+ }
+ },
+ "size":` + number + `,
+ "_source": [
+ "id",
+ "targetInfo.feature",
+ "analyServerId"
+ ]
+ }`
+
+ buf, err := EsReq("POST", url, []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
+}
--
Gitblit v1.8.0