From 22955cd5a948ace0f497c9d618914607f86dba5c Mon Sep 17 00:00:00 2001
From: liuxiaolong <736321739@qq.com>
Date: 星期四, 06 六月 2019 15:41:19 +0800
Subject: [PATCH] add hub flag
---
esutil/EsClient.go | 31 ++++++++++++++++++++++++-------
1 files changed, 24 insertions(+), 7 deletions(-)
diff --git a/esutil/EsClient.go b/esutil/EsClient.go
index 2bd3650..6b7c6d3 100644
--- a/esutil/EsClient.go
+++ b/esutil/EsClient.go
@@ -242,15 +242,18 @@
if err !=nil{
return ""
}
+
var resp RespVideo
err = json.Unmarshal(respBytes, &resp)
if err !=nil {
return ""
}
+
filePath := resp.FilePath
videoUrl = ""
if !strings.Contains(filePath, "/cut"){
videoUrl = ""
+ fmt.Printf("videoReqUrl:%s ,imgKey:%s ,picDate:%s ,cameraId:%s ,filePath:%s \n ",reqUrl,imgKey,picDate,cameraId,filePath)
} else {
strArr := strings.Split(filePath, "/cut")
ngxUrl := ngxMap[indeviceId]
@@ -258,11 +261,14 @@
videoUrl = ngxUrl + strArr[1]
}
}
- if videoUrl == "" {
- fmt.Println("videoReqUrl: ",reqUrl)
- fmt.Printf("imgKey:%s ,picDate:%s ,cameraId:%s ",imgKey,picDate,cameraId)
+ if videoUrl == ""{
+ respMap := make(map[string]interface{},0)
+ err := json.Unmarshal(respBytes, &respMap)
+ if err !=nil {
+ fmt.Println("resp UnmarshalToMap err: ",err)
+ }
+ fmt.Println("resp: ",respMap)
}
-
return videoUrl
}
@@ -276,11 +282,13 @@
var err error
bodyJson, err = json.Marshal(body)
if err != nil {
+ log.Log.Errorln("doPostRequestMarshal err:",err)
return resultBytes, err
}
}
request, err := http.NewRequest("POST", url, bytes.NewBuffer(bodyJson))
if err != nil {
+ log.Log.Errorln("NewRequest ERR:",err)
return resultBytes, err
}
request.Header.Set("Content-type", contentType)
@@ -304,11 +312,13 @@
}
resp, err := client.Do(request)
if err != nil {
+ log.Log.Errorln("DoRequest ERR:",err)
return resultBytes, err
}
defer resp.Body.Close()
resultBytes, err = ioutil.ReadAll(resp.Body)
if err != nil {
+ log.Log.Errorln("ReadAll ERR:",err)
return resultBytes, err
}
return resultBytes, nil
@@ -321,13 +331,20 @@
return value[i-1]
}
-func PostAction(sec int, Eurl string, picurl string) []byte {
+func PostAction(sec int, Eurl string, picurl string, ishub string) []byte {
index := "videopersons,personaction"
url := fmt.Sprintf("%s%s%s", Eurl, index, "/_search")
seccond := strconv.Itoa(sec)
-
- prama := "{\"query\":{\"bool\":{\"filter\":[{\"range\":{\"picDate\":{\"gte\":\"now+8h-" + seccond + "s\",\"lt\":\"now+8h\"}}}]}},\"size\":\"1000\",\"sort\":[{\"picDate\":{\"order\":\"desc\"}}]," +
+ preSec := ""
+ if sec > 60 {
+ preSec = "-60s"
+ }
+ var ishubReq =""
+ if ishub == "hub" {
+ ishubReq = "{\"term\":{\"personIsHub\":\"1\"}},"
+ }
+ prama := "{\"query\":{\"bool\":{\"filter\":["+ishubReq+"{\"range\":{\"picDate\":{\"gte\":\"now+8h-" + seccond + "s\",\"lt\":\"now+8h"+preSec+"\"}}}]}},\"size\":\"1000\",\"sort\":[{\"picDate\":{\"order\":\"desc\"}}]," +
"\"_source\":[\"baseInfo\",\"Gender\",\"BaseName\",\"Age\",\"personId\",\"personPicUrl\",\"indeviceName\",\"imgKey\",\"sdkType\",\"ageDescription\",\"indeviceid\",\"content\",\"Id\",\"picAddress\",\"picMaxUrl\",\"picDate\",\"Race\",\"videoNum\",\"picSmUrl\",\"taskName\",\"personIsHub\",\"idcard\",\"videoIp\",\"videoReqNum\"]" +
"}"
err, tokenRes := GetEsDataReq(url, prama, picurl, true)
--
Gitblit v1.8.0