From 93262f2823b1f1e2a780172fe5669d59853fdaf1 Mon Sep 17 00:00:00 2001
From: 龙赣华 <slongertian@gmail.com>
Date: 星期二, 28 五月 2019 12:01:42 +0800
Subject: [PATCH] merge esclient.go
---
esutil/EsClient.go | 52 +++++++++++++++++++++++++++++++++++-----------------
1 files changed, 35 insertions(+), 17 deletions(-)
diff --git a/esutil/EsClient.go b/esutil/EsClient.go
index 266a8ab..ef5c658 100644
--- a/esutil/EsClient.go
+++ b/esutil/EsClient.go
@@ -15,7 +15,7 @@
log "github.com/long/test/log"
)
-func GetEsDataReq(url string, parama string, isSource bool) (error, map[string]interface{}) {
+func GetEsDataReq(url string, parama string, picurl string, isSource bool) (error, map[string]interface{}) {
//log.Log.Infoln("es 鏌ヨ璇锋眰璺緞" + url) // 閰嶇疆淇℃伅 鑾峰彇
req, err := http.NewRequest("POST", url, strings.NewReader(parama))
@@ -64,6 +64,7 @@
}
source["id"] = value.(map[string]interface{})["_id"]
+
sdkType := source["sdkType"]
if sdkType != nil {
sdk, err := strconv.Atoi(sdkType.(string))
@@ -74,6 +75,24 @@
source["sdkType"] = sdkTypeToValue(sdk)
}
+ pmax, exist := source["picMaxUrl"].(string)
+ if !exist {
+ return errors.New("picMaxurl is not string"), nil
+ }
+
+ if !strings.HasPrefix(pmax, "http") {
+ source["picMaxUrl"] = picurl + pmax
+
+ }
+
+ psm, exist := source["picSmUrl"].(string)
+ if !exist {
+ return errors.New("picSmUrl is not string"), nil
+ }
+
+ if !strings.HasPrefix(psm, "http") {
+ source["picSmUrl"] = picurl + psm
+ }
//videoUrl := getVideoUrl(source)
source["videoNum"] = getVideoUrl(source)
@@ -86,11 +105,11 @@
}
}
-func getVideoUrl(source map[string]interface{}) (videoUrl string){
+func getVideoUrl(source map[string]interface{}) (videoUrl string) {
imgKey := source["imgKey"].(string)
- picDte := source["picDate"].(string)//鎶撴媿鏃ユ湡
- cameraId := source["videoReqNum"].(string)//鎽勫儚鏈篿d
- indeviceId := source["indeviceid"].(string)//鍒嗘瀽璁惧id
+ picDte := source["picDate"].(string) //鎶撴媿鏃ユ湡
+ cameraId := source["videoReqNum"].(string) //鎽勫儚鏈篿d
+ indeviceId := source["indeviceid"].(string) //鍒嗘瀽璁惧id
var deviceMap map[string]string
deviceMap["DSVAD010120181119"] = "http://58.118.225.79:41241/ManCarAnaly/perVideoPic/uploadRtnVideo"
@@ -105,26 +124,25 @@
paramMap["videoPath"] = cameraId
respBytes, err := doPostRequest(reqUrl, "application/x-www-form-urlencoded", paramMap, nil, nil)
- if err !=nil{
+ if err != nil {
return ""
}
var resp RespVideo
err = json.Unmarshal(respBytes, &resp)
- if err !=nil {
+ if err != nil {
return ""
}
return resp.VideoPath
}
-type RespVideo struct{
- Code int32 `json:"code"`
- ErrorStr string `json:"errorStr"`
- Msg string `json:"msg"`
- Resp interface{}
- Status string `json:"status"`
+type RespVideo struct {
+ Code int32 `json:"code"`
+ ErrorStr string `json:"errorStr"`
+ Msg string `json:"msg"`
+ Resp interface{}
+ Status string `json:"status"`
VideoPath string `json:"videoPath"`
}
-
func doPostRequest(url string, contentType string, body map[string]interface{}, params map[string]string, headers map[string]string) ([]byte, error) {
var resultBytes []byte
@@ -175,17 +193,17 @@
return value[i-1]
}
-func PostAction(sec int, Eurl string) []byte {
+func PostAction(sec int, Eurl string, picurl string) []byte {
index := "videopersons,personaction"
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\",\"indeviceName\",\"sdkType\",\"ageDescription\",\"content\",\"ID\",\"picAddress\",\"picMaxUrl\",\"picDate\",\"race\",\"videoNum\",\"picSmUrl\",\"taskName\",\"personIsHub\",\"IDCard\",\"videoIp\",\"videoReqNum\"]" +
+ "\"_source\":[\"baseInfo\",\"gender\",\"indeviceName\",\"imageKey\",\"sdkType\",\"ageDescription\",\"indeviceid\",\"content\",\"ID\",\"picAddress\",\"picMaxUrl\",\"picDate\",\"race\",\"videoNum\",\"picSmUrl\",\"taskName\",\"personIsHub\",\"IDCard\",\"videoIp\",\"videoReqNum\"]" +
"}"
+ err, tokenRes := GetEsDataReq(url, prama, picurl, true)
- err, tokenRes := GetEsDataReq(url, prama, true)
if err != nil {
log.Log.Errorln(err)
return nil
--
Gitblit v1.8.0