From b161e60c40f2fa4716a0e6bf1d2d38eb45c1272a Mon Sep 17 00:00:00 2001
From: sunty <1172534965@qq.com>
Date: 星期三, 11 十二月 2019 10:20:59 +0800
Subject: [PATCH] add linktaginfo cameraid
---
EsApi.go | 195 ++++++++++++++++++++++++++++++++----------------
1 files changed, 128 insertions(+), 67 deletions(-)
diff --git a/EsApi.go b/EsApi.go
index b216b6c..1ab935d 100644
--- a/EsApi.go
+++ b/EsApi.go
@@ -72,8 +72,56 @@
if err != nil {
return "", err
}
+
feature := sources[0]["targetInfo"].([]interface{})[0].(map[string]interface{})["feature"].(string)
return feature, nil
+}
+
+//鏍规嵁鐩爣id杩藉姞璺熻釜淇℃伅
+func AppendTargetInfo(id string, targetInfo string, indexName string, serverIp string, serverPort 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)",
+ "params": {
+ "newparam": ` + targetInfo + `
+ }
+ }
+}`
+ fmt.Println(jsonDSL)
+ buf, err := EsReq("POST", url, []byte(jsonDSL))
+ if err != nil {
+ return "", err
+ }
+ json.Unmarshal(buf, &info)
+ out, ok := info.(map[string]interface{})
+ fmt.Println(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
+
}
//鏍规嵁鎶撴媿浜哄憳id鏇存柊锛坴ideourl锛夋憚鍍忔満鍦板潃
@@ -129,7 +177,7 @@
return statu
}
-//鑾峰彇褰撳墠鑺傜偣鎶撴媿搴撴墍鏈変汉鍛業D
+//鑾峰彇褰撳墠鑺傜偣鎶撴媿搴撴墍鏈変汉鍛業D*缂撳瓨*
func GetAllLocalVideopersonsId(compareArgs protomsg.CompareArgs, indexName string, serverIp string, serverPort string, alarmLevelTypes string) (capturetable []string) {
queryStr := ""
queryBody := compareArgs.InputValue
@@ -175,7 +223,7 @@
//鍒ゆ柇甯冮槻绛夌骇
alarmLevelStr := ""
if alarmLevelTypes != "" {
- alarmLevelStr = "{\"terms\":{\"alarmRules.alarmLevel\":[\"" + alarmLevelTypes + "\"]}},"
+ alarmLevelStr = "{\"terms\":{\"alarmRules.alarmLevel.raw\":[\"" + alarmLevelTypes + "\"]}},"
}
//浣跨敤es搴曞眰鏈哄埗澶勭悊鍒嗛〉
@@ -294,34 +342,43 @@
}
//鍒濆鍖栧疄鏃舵姄鎷�
-func InitRealTimeCapture(serverIp string, serverPort string, indexName string, isAlarm bool, quantity int) ([]protomsg.AIOcean, error) {
+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":true
- }
- }
+ ` + strings.Join(filterArr, ",") + `
]
}
},`
- }
+
DSLJson := `{
"size":` + strconv.Itoa(quantity) + `,
` + queryStr + `
"sort":[{"picDate":{"order":"desc"}}],
"_source": {"includes":[],"excludes":["*.feature"]}
}`
+ fmt.Println(DSLJson)
buf, err := EsReq("POST", url, []byte(DSLJson))
if err != nil {
return aIOceanInfo, err
@@ -342,18 +399,6 @@
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":{
@@ -367,11 +412,15 @@
}
}
},
- ` + 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))
@@ -390,25 +439,31 @@
}
//缁煎悎缁熻
-func StatisticsComprehensive(serverIp string, serverPort string, indexName string, isAlarm bool) (total int, err error) {
- isAlarmStr := ""
- if isAlarm == true {
- isAlarmStr = `,{"term":{"isAlarm":true}}`
- }
+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 + `
]
}
}
@@ -451,9 +506,9 @@
}
},
"aggs":{
- "sdkId_status":{
+ "sdkName_status":{
"terms":{
- "field":"taskId"
+ "field":"sdkName.raw"
}
}
}
@@ -472,7 +527,7 @@
if !ok {
return nil, errors.New("first hits change error!")
}
- sdkName_status, ok := middle["sdkId_status"].(map[string]interface{})
+ sdkName_status, ok := middle["sdkName_status"].(map[string]interface{})
if !ok {
return nil, errors.New("first hits change error!")
}
@@ -484,9 +539,9 @@
fmt.Println("change to source error!")
continue
}
- sdkId := tmpbuf["key"].(string)
+ sdkName := tmpbuf["key"].(string)
count := int(tmpbuf["doc_count"].(float64))
- source["id"] = sdkId
+ source["name"] = sdkName
source["value"] = count
sources = append(sources, source)
}
@@ -581,22 +636,22 @@
}
/****************************************浠ヤ笅涓簊dkCompare姣斿缂撳瓨浣跨敤鏂规硶*********************************************/
-//鑾峰彇鏌ヨ鎬绘暟
-func GetTotal(serverIp string, serverPort string, indexName string, shards string) (total int) {
+//鑾峰彇鏌ヨ鎬绘暟 *缂撳瓨*
+func GetTotal(serverIp string, serverPort string, indexName string, shards string, targetType string) (total int) {
JsonDSL := `{
"size": 0,
"query": {
"bool": {
"filter": [{
"term": {
- "targetInfo.targetType.raw": "face"
+ "targetInfo.targetType.raw": "`+targetType+`"
}
}]
}
}
}`
- url := "http://" + serverIp + ":" + serverPort + "/" + indexName + "/_search"
+ url := "http://" + serverIp + ":" + serverPort + "/" + indexName + "/_search?preference=_shards:" + shards + "|_only_local"
buf, err := EsReq("POST", url, []byte(JsonDSL))
if err != nil {
return
@@ -616,11 +671,17 @@
}
-//鏌ヨ鏃堕棿娈垫暟鎹�
-func GetPeriodInfos(serverIp string, serverPort string, startTime string, endTime string, indexName string, shards string) ([]*protomsg.Esinfo, error) {
- var capdbinfo []*protomsg.Esinfo
+//鏌ヨ鏃堕棿娈垫暟鎹� *缂撳瓨*
+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":
+ source = []string{"id","targetInfo.feature","analyServerId","cameraId"}
+ case "track":
+ source = []string{"id","targetInfo.feature","analyServerId","cameraId","targetInfo.attachTarget.feature","linkTagInfo.targetInfo.feature","linkTagInfo.targetInfo.attachTarget.feature","linkTagInfo.cameraId"}
+ }
JsonDSL := `
{
"query": {
@@ -628,7 +689,7 @@
"filter": [
{
"term": {
- "targetInfo.targetType.raw": "face"
+ "targetInfo.targetType.raw": "`+targetType+`"
}
},
{
@@ -643,15 +704,12 @@
}
},
"size": 1000000,
- "_source": [
- "id",
- "targetInfo.feature",
- "analyServerId"
- ]
+ "_source": ["`+strings.Replace(strings.Trim(fmt.Sprint(source), "[]"), " ", "\",\"", -1)+`"]
}
`
//logger.Debug(url)
//logger.Debug(JsonDSL)
+ //fmt.Println(JsonDSL)
buf, err := EsReq("POST", url, []byte(JsonDSL))
if err != nil {
return capdbinfo, errors.New("http request dbtablename info is err!")
@@ -662,19 +720,26 @@
if err != nil {
return capdbinfo, err
}
-
+ //fmt.Println(sources)
// 杩斿洖鎵�鏈夋煡璇㈢殑鏁版嵁
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
+// 鏌ヨ搴曞簱浜哄憳淇℃伅*缂撳瓨*
+func GetOceanFeatures(serverIp string, serverPort string, queryIndexNum int, queryNums int, indexName string, shards string, targetType string) ([]*protomsg.MultiFeaCache, error) {
+ var dbinfos []*protomsg.MultiFeaCache
point := strconv.Itoa(queryIndexNum)
number := strconv.Itoa(queryNums)
JsonDSL := ""
+ var source []string
+ switch targetType {
+ case "face":
+ source = []string{"id","targetInfo.feature","analyServerId"}
+ case "track":
+ source = []string{"id","targetInfo.feature","analyServerId","targetInfo.attachTarget.feature","linkTagInfo.targetInfo.feature","linkTagInfo.targetInfo.attachTarget.feature"}
+ }
+
url := "http://" + serverIp + ":" + serverPort + "/" + indexName + "/_search?preference=_shards:" + shards + "|_only_local"
JsonDSL = ` {
"from": ` + point + `,
@@ -683,18 +748,14 @@
"filter": [
{
"term": {
- "targetInfo.targetType.raw": "face"
+ "targetInfo.targetType.raw": "`+targetType+`"
}
}
]
}
},
"size":` + number + `,
- "_source": [
- "id",
- "targetInfo.feature",
- "analyServerId"
- ]
+ "_source": ["`+strings.Replace(strings.Trim(fmt.Sprint(source), "[]"), " ", "\",\"", -1)+`"]
}`
buf, err := EsReq("POST", url, []byte(JsonDSL))
--
Gitblit v1.8.0