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 | 85 ++++++++++++++++++++++++++++++++++++++++++
1 files changed, 85 insertions(+), 0 deletions(-)
diff --git a/esutil/EsClient.go b/esutil/EsClient.go
index fa64d44..ef5c658 100644
--- a/esutil/EsClient.go
+++ b/esutil/EsClient.go
@@ -1,6 +1,7 @@
package esutil
import (
+ "bytes"
"encoding/json"
"errors"
"fmt"
@@ -92,6 +93,8 @@
if !strings.HasPrefix(psm, "http") {
source["picSmUrl"] = picurl + psm
}
+ //videoUrl := getVideoUrl(source)
+ source["videoNum"] = getVideoUrl(source)
sources = append(sources, source)
}
@@ -100,6 +103,87 @@
} else {
return nil, dat
}
+}
+
+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
+
+ var deviceMap map[string]string
+ deviceMap["DSVAD010120181119"] = "http://58.118.225.79:41241/ManCarAnaly/perVideoPic/uploadRtnVideo"
+ deviceMap["DSVAD010220181119"] = "http://58.118.225.79:41242/ManCarAnaly/perVideoPic/uploadRtnVideo"
+ deviceMap["DSVAD010320181119"] = "http://58.118.225.79:41243/ManCarAnaly/perVideoPic/uploadRtnVideo"
+ deviceMap["DSVAD010420181119"] = "http://58.118.225.79:41244/ManCarAnaly/perVideoPic/uploadRtnVideo"
+
+ reqUrl := deviceMap[indeviceId]
+ var paramMap map[string]interface{}
+ paramMap["imgKey"] = imgKey
+ paramMap["picDate"] = picDte
+ paramMap["videoPath"] = cameraId
+
+ respBytes, err := doPostRequest(reqUrl, "application/x-www-form-urlencoded", paramMap, nil, nil)
+ if err != nil {
+ return ""
+ }
+ var resp RespVideo
+ err = json.Unmarshal(respBytes, &resp)
+ 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"`
+ 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
+ var bodyJson []byte
+ if body != nil {
+ var err error
+ bodyJson, err = json.Marshal(body)
+ if err != nil {
+ return resultBytes, err
+ }
+ }
+ request, err := http.NewRequest("POST", url, bytes.NewBuffer(bodyJson))
+ if err != nil {
+ return resultBytes, err
+ }
+ request.Header.Set("Content-type", contentType)
+ //add params
+ q := request.URL.Query()
+ if params != nil {
+ for key, val := range params {
+ q.Add(key, val)
+ }
+ request.URL.RawQuery = q.Encode()
+ }
+ // add headers
+ if headers != nil {
+ for key, val := range headers {
+ request.Header.Add(key, val)
+ }
+ }
+ client := &http.Client{}
+ resp, err := client.Do(request)
+ if err != nil {
+ return resultBytes, err
+ }
+ defer resp.Body.Close()
+ resultBytes, err = ioutil.ReadAll(resp.Body)
+ if err != nil {
+ return resultBytes, err
+ }
+ return resultBytes, nil
}
//sdk绫诲瀷
@@ -119,6 +203,7 @@
"\"_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)
+
if err != nil {
log.Log.Errorln(err)
return nil
--
Gitblit v1.8.0