From a27f1d9078dba3b11f0a3c1e536a2f98b64d250d Mon Sep 17 00:00:00 2001
From: liuxiaolong <736321739@qq.com>
Date: 星期四, 30 五月 2019 10:49:02 +0800
Subject: [PATCH] change time to [-60s,-40s]
---
esutil/EsClient.go | 72 +++++++++++++++++++++++------------
1 files changed, 47 insertions(+), 25 deletions(-)
diff --git a/esutil/EsClient.go b/esutil/EsClient.go
index 97e8aeb..38f4405 100644
--- a/esutil/EsClient.go
+++ b/esutil/EsClient.go
@@ -100,14 +100,19 @@
source["race"] = prace
}
+ pGender, exist := source["Gender"]
+ if exist {
+ source["gender"] = pGender
+ }
+
source["ageDescription"] = getAgeDesc(source["Age"])
source["videoNum"] = getVideoUrl(source)
-
- picDateStr, err := time.Parse("2006-01-02 15:04:05", source["picDate"].(string))
- fmt.Println("picDate: ", picDateStr.Format("2006-01-02 15:04:05"))
+ picDate := source["picDate"].(string)
+ lastIdx := strings.LastIndex(picDate,":")
+ picDateStr := picDate[:lastIdx]
if err == nil {
- source["picDate"] = picDateStr.Format("2006-01-02 15:04:05")
+ source["picDate"] = picDateStr
}
baseInfo := getSourceBaseInfo(source)
@@ -123,9 +128,8 @@
}
func getAgeDesc(age interface{})(ageDesc string) {
- fmt.Println("ageInterface: ", age)
if age !=nil {
- ageInt := age.(int)
+ ageInt := age.(float64)
if ageInt >0 && ageInt<7 {
ageDesc = "绔ュ勾"
} else if ageInt >=7 && ageInt<18 {
@@ -140,7 +144,6 @@
ageDesc = ""
}
}
- fmt.Println("ageDescription: ", ageDesc)
return ageDesc
}
@@ -160,7 +163,7 @@
Content string `json:"content"`
}
-func getSourceBaseInfo(source map[string]interface{}) (baseInfoJson string) {
+func getSourceBaseInfo(source map[string]interface{}) []BaseInfo {
sdkType := source["sdkType"].(string)
baseInfoArr := make([]BaseInfo,0)
if sdkType == "浜鸿劯" {
@@ -203,18 +206,17 @@
}
baseInfoArr = append(baseInfoArr, baseInfo)
- bytes, err := json.Marshal(baseInfoArr)
- if err !=nil {
- return ""
- }
- return string(bytes)
+ //bytes, err := json.Marshal(baseInfoArr)
+ //if err !=nil {
+ // return ""
+ //}
}
- return ""
+ return baseInfoArr
}
func getVideoUrl(source map[string]interface{}) (videoUrl string){
imgKey := source["imgKey"].(string)
- picDte := source["picDate"].(string)//鎶撴媿鏃ユ湡
+ picDate := source["picDate"].(string)//鎶撴媿鏃ユ湡
cameraId := source["videoReqNum"].(string)//鎽勫儚鏈篿d
indeviceId := source["indeviceid"].(string)//鍒嗘瀽璁惧id
deviceMap := make(map[string]string,0)
@@ -233,31 +235,41 @@
reqUrl := deviceMap[indeviceId]
paramMap := make(map[string]interface{},0)
paramMap["imgKey"] = imgKey
- paramMap["picDate"] = picDte
+ paramMap["picDate"] = picDate
paramMap["videoNum"] = cameraId
respBytes, err := doPostRequest(reqUrl, "application/json", paramMap, nil, nil)
if err !=nil{
return ""
}
+
var resp RespVideo
err = json.Unmarshal(respBytes, &resp)
if err !=nil {
return ""
}
- filePath := resp.FilePath
+ filePath := resp.FilePath
+ videoUrl = ""
if !strings.Contains(filePath, "/cut"){
- return ""
+ 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]
if ngxUrl !="" && len(strArr) >0 {
- return ngxUrl + strArr[1]
+ videoUrl = ngxUrl + strArr[1]
}
}
-
- return ""
+ 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
}
type RespVideo struct{
@@ -270,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)
@@ -292,14 +306,19 @@
request.Header.Add(key, val)
}
}
- client := &http.Client{}
+ timeOut:= time.Duration(8*time.Second)//set request timeout
+ client := &http.Client{
+ Timeout:timeOut,
+ }
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
@@ -317,9 +336,12 @@
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\"}}]," +
- "\"_source\":[\"baseInfo\",\"Gender\",\"Age\",\"personId\",\"personPicUrl\",\"indeviceName\",\"imgKey\",\"sdkType\",\"ageDescription\",\"indeviceid\",\"content\",\"Id\",\"picAddress\",\"picMaxUrl\",\"picDate\",\"Race\",\"videoNum\",\"picSmUrl\",\"taskName\",\"personIsHub\",\"idcard\",\"videoIp\",\"videoReqNum\"]" +
+ preSec := ""
+ if sec > 40 {
+ preSec = "-40s"
+ }
+ prama := "{\"query\":{\"bool\":{\"filter\":[{\"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