From d671ea8ec8658da21990d5418c981d74f6015045 Mon Sep 17 00:00:00 2001
From: liuxiaolong <736321739@qq.com>
Date: 星期三, 11 十二月 2019 11:50:43 +0800
Subject: [PATCH] add conf path
---
esutil/EsClient.go | 126 ++++++++++++++++++++++++++++++++---------
1 files changed, 97 insertions(+), 29 deletions(-)
diff --git a/esutil/EsClient.go b/esutil/EsClient.go
index 03f1f60..bc1e81f 100644
--- a/esutil/EsClient.go
+++ b/esutil/EsClient.go
@@ -10,9 +10,11 @@
"net/http"
"strconv"
"strings"
+ "sync"
"time"
+ "andriodServer/extend/config"
- log "github.com/long/test/log"
+ log "andriodServer/log"
)
func GetEsDataReq(url string, parama string, picurl string, isSource bool) (error, map[string]interface{}) {
@@ -81,6 +83,7 @@
return errors.New("picMaxurl is not string"), nil
}
+
if !strings.HasPrefix(pmax, "http") {
source["picMaxUrl"] = picurl + pmax
@@ -93,6 +96,10 @@
if !strings.HasPrefix(psm, "http") {
source["picSmUrl"] = picurl + psm
+ }
+
+ if source["sdkType"] != "浜鸿劯" {//琛屼负娌℃湁瀛樺偍澶у浘
+ source["picMaxUrl"] = source["picSmUrl"]
}
prace, exist := source["Race"]
@@ -108,13 +115,12 @@
source["ageDescription"] = getAgeDesc(source["Age"])
source["videoNum"] = getVideoUrl(source)
- fmt.Println("BaseName: ", source["BaseName"])
- picDate := source["picDate"].(string)
- lastIdx := strings.LastIndex(picDate,":")
- picDateStr := picDate[:lastIdx]
- if err == nil {
- source["picDate"] = picDateStr
- }
+ //picDate := source["picDate"].(string)
+ //lastIdx := strings.LastIndex(picDate,":")
+ //picDateStr := picDate[:lastIdx]
+ //if err == nil {
+ // source["picDate"] = picDateStr
+ //}
baseInfo := getSourceBaseInfo(source)
source["baseInfo"] = baseInfo
@@ -215,52 +221,83 @@
return baseInfoArr
}
+var videoCacheMap = make(map[string]string,0)
+var lock sync.RWMutex
+
+func setVideoCache(imgKey string, url string) {
+ lock.Lock()
+ defer lock.Unlock()
+ videoCacheMap[imgKey] = url
+}
+
+func getVideoFromCache(imgKey string) string {
+ lock.Lock()
+ defer lock.Unlock()
+ if v,ok := videoCacheMap[imgKey];ok {
+ return v
+ }
+ return ""
+}
+
func getVideoUrl(source map[string]interface{}) (videoUrl string){
imgKey := source["imgKey"].(string)
- picDte := source["picDate"].(string)//鎶撴媿鏃ユ湡
+
+ //鍏堜粠缂撳瓨閲岄潰鍙�
+ cacheUrl := getVideoFromCache(imgKey)
+ if cacheUrl !="" {
+ return cacheUrl
+ }
+
+ picDate := source["picDate"].(string)//鎶撴媿鏃ユ湡
cameraId := source["videoReqNum"].(string)//鎽勫儚鏈篿d
indeviceId := source["indeviceid"].(string)//鍒嗘瀽璁惧id
- deviceMap := make(map[string]string,0)
- deviceMap["DSVAD010120181119"] = "http://172.17.50.241:11111/getRecordVideoPath"
- deviceMap["DSVAD010220181119"] = "http://172.17.50.242:11111/getRecordVideoPath"
- deviceMap["DSVAD010320181119"] = "http://172.17.50.243:11111/getRecordVideoPath"
- deviceMap["DSVAD010420181119"] = "http://172.17.50.244:11111/getRecordVideoPath"
- ngxMap := make(map[string]string,0)
- ngxMap["DSVAD010120181119"] = "http://58.118.225.79:44180/videosource"
- ngxMap["DSVAD010220181119"] = "http://58.118.225.79:44280/videosource"
- ngxMap["DSVAD010320181119"] = "http://58.118.225.79:44380/videosource"
- ngxMap["DSVAD010420181119"] = "http://58.118.225.79:44480/videosource"
+ reqUrl := ""
+ if url,ok := config.ServerMap[indeviceId];!ok {
+ return ""
+ } else {
+ reqUrl = url
+ }
+ log.Log.Infoln("reqUrl:",reqUrl)
-
- 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
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]
+ ngxUrl := config.NgxMap[indeviceId]
+ log.Log.Infoln("ngxUrl:",ngxUrl)
if ngxUrl !="" && len(strArr) >0 {
videoUrl = ngxUrl + strArr[1]
}
}
- fmt.Println("videoReqUrl: ",reqUrl)
- fmt.Println("video: ",videoUrl)
+ 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)
+ }
+ setVideoCache(imgKey, videoUrl)
return videoUrl
}
@@ -274,11 +311,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)
@@ -296,14 +335,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
@@ -316,13 +360,37 @@
return value[i-1]
}
-func PostAction(sec int, Eurl string, picurl string) []byte {
+func PostAction(sec int, Eurl string, picurl string, ishub string, size int, lastT time.Time, curTime time.Time) []byte {
+ //lastTimeStr := lastT.Format("2006-01-02 15:04:05")
+ //curTimeStr := curTime.Format("2006-01-02 15:04:05")
index := "videopersons,personaction"
url := fmt.Sprintf("%s%s%s", Eurl, index, "/_search")
- seccond := strconv.Itoa(sec)
+ sizeStr :=""
+ if size <=0 {
+ sizeStr = "1000"
+ } else {
+ sizeStr = strconv.Itoa(size)
+ }
+ preSec := "10"
+ if sec <=0 {
+ preSec = "10"
+ } else {
+ preSec = strconv.Itoa(sec)
+ }
+ var filterArr []string
+ if ishub == "hub" {
+ filterArr = append(filterArr,"{\"term\":{\"personIsHub\":\"1\"}}")
+ }
- prama := "{\"query\":{\"bool\":{\"filter\":[{\"range\":{\"picDate\":{\"gte\":\"now+8h-" + seccond + "s\",\"lt\":\"now+8h\"}}}]}},\"size\":\"1000\",\"sort\":[{\"picDate\":{\"order\":\"desc\"}}]," +
+ filterArr = append(filterArr, "{\"range\":{\"picDate\":{\"gte\":\"now+8h-"+preSec+"s\",\"lt\":\"now+8h\"}}}")
+
+ filterStr := ""
+ if len(filterArr) >0 {
+ filterStr = strings.Join(filterArr, ",")
+ }
+ log.Log.Infoln("filterArr:", filterStr)
+ prama := "{\"query\":{\"bool\":{\"filter\":["+filterStr+"]}},\"size\":\""+sizeStr+"\",\"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