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 | 133 +++++++++++++++++++++++++++++++++++---------
1 files changed, 105 insertions(+), 28 deletions(-)
diff --git a/esutil/EsClient.go b/esutil/EsClient.go
index 5e7a606..38f4405 100644
--- a/esutil/EsClient.go
+++ b/esutil/EsClient.go
@@ -95,9 +95,22 @@
source["picSmUrl"] = picurl + psm
}
+ prace, exist := source["Race"]
+ if exist {
+ source["race"] = prace
+ }
+
+ pGender, exist := source["Gender"]
+ if exist {
+ source["gender"] = pGender
+ }
+
+ source["ageDescription"] = getAgeDesc(source["Age"])
+
source["videoNum"] = getVideoUrl(source)
- timeFormat := "2019-05-28 15:04:05"
- picDateStr, err := time.Parse(timeFormat, source["picDate"].(string))
+ picDate := source["picDate"].(string)
+ lastIdx := strings.LastIndex(picDate,":")
+ picDateStr := picDate[:lastIdx]
if err == nil {
source["picDate"] = picDateStr
}
@@ -112,6 +125,26 @@
} else {
return nil, dat
}
+}
+
+func getAgeDesc(age interface{})(ageDesc string) {
+ if age !=nil {
+ ageInt := age.(float64)
+ if ageInt >0 && ageInt<7 {
+ ageDesc = "绔ュ勾"
+ } else if ageInt >=7 && ageInt<18 {
+ ageDesc = "灏戝勾"
+ } else if ageInt >=18 && ageInt<40 {
+ ageDesc = "闈掑勾"
+ } else if ageInt >=40 && ageInt<65 {
+ ageDesc = "涓勾"
+ } else if ageInt >=65 {
+ ageDesc = "鑰佸勾"
+ } else {
+ ageDesc = ""
+ }
+ }
+ return ageDesc
}
type BaseInfo struct {
@@ -130,36 +163,60 @@
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 == "浜鸿劯" {
+ likePer,baseName,personId,idCard,personPicUrl,gender,content :="","","","","","",""
+ if source["likePer"] !=nil {
+ likePer = source["likePer"].(string)
+ }
+ if source["BaseName"] !=nil {
+ baseName = source["BaseName"].(string)
+ }
+ if source["personId"] !=nil {
+ personId = source["personId"].(string)
+ }
+ if source["idcard"] !=nil {
+ idCard = source["idcard"].(string)
+ }
+ if source["personPicUrl"] !=nil {
+ personPicUrl = source["personPicUrl"].(string)
+ }
+ if source["Gender"] !=nil {
+ gender = source["Gender"].(string)
+ }
+ if source["content"] !=nil {
+ content = source["content"].(string)
+ }
var baseInfo = BaseInfo{
TaskId:"",//2.0鏂板瓧娈�
TaskName:"",//2.0鏂板瓧娈�
- LikePer:source["likePer"].(string),
+ LikePer:likePer,
TableId:"",//2.0鏂板瓧娈�
- TableName:source["BaseName"].(string),
- PersonId:source["personId"].(string),
- PersonName:source["idcard"].(string),//浜哄憳濮撳悕锛屼粠绠＄悊骞冲彴鑾峰彇
- PersonPicUrl:source["personPicUrl"].(string),
- Gender:source["Gender"].(string),
+ TableName:baseName,
+ PersonId:personId,
+ PersonName:idCard,//浜哄憳濮撳悕锛屼粠绠＄悊骞冲彴鑾峰彇
+ PersonPicUrl:personPicUrl,
+ Gender:gender,
PhoneNum:"",//鎵嬫満鍙凤紝浠庣鐞嗗钩鍙拌幏鍙�
- IDCard:source["idcard"].(string),
+ IDCard:idCard,
MonitorLevel:"",//2.0鏂板瓧娈�
- Content:source["content"].(string),
+ Content:content,
}
- bytes, err := json.Marshal(baseInfo)
- if err !=nil {
- return ""
- }
- return string(bytes)
+
+ baseInfoArr = append(baseInfoArr, baseInfo)
+ //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)
@@ -178,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{
@@ -215,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)
@@ -237,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
@@ -262,9 +336,12 @@
url := fmt.Sprintf("%s%s%s", Eurl, index, "/_search")
seccond := strconv.Itoa(sec)
-
- prama := "{\"query\":{\"bool\":{\"filter\":[{\"term\":{\"personIsHub\":\"1\"}},{\"range\":{\"picDate\":{\"gte\":\"now+8h-" + seccond + "s\",\"lt\":\"now+8h\"}}}]}},\"size\":\"1000\",\"sort\":[{\"picDate\":{\"order\":\"desc\"}}]," +
- "\"_source\":[\"baseInfo\",\"Gender\",\"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