From a954c488d12c825217c36476fd27ac720f0ff16e Mon Sep 17 00:00:00 2001
From: liuxiaolong <liuxiaolong@aiotlink.com>
Date: 星期四, 18 六月 2020 11:42:47 +0800
Subject: [PATCH] add GetEsVideoById
---
esutil/EsClient.go | 35 +++++++++++++++++++++++++++++++++--
1 files changed, 33 insertions(+), 2 deletions(-)
diff --git a/esutil/EsClient.go b/esutil/EsClient.go
index 81129aa..7215b26 100644
--- a/esutil/EsClient.go
+++ b/esutil/EsClient.go
@@ -1,6 +1,7 @@
package esutil
import (
+ "bytes"
"encoding/json"
"errors"
"fmt"
@@ -13,6 +14,35 @@
log "andriodServer/log"
)
+
+func EsReq(method string, url string, parama []byte) (buf []byte, err error) {
+ //defer elapsed("page")()
+ timeout := time.Duration(100 * time.Second)
+ client := http.Client{
+ Timeout: timeout,
+ }
+ request, err := http.NewRequest(method, url, bytes.NewBuffer(parama))
+ request.Header.Set("Content-type", "application/json")
+
+ if err != nil {
+ fmt.Println("build request fail !")
+ return nil, err
+ }
+
+ resp, err := client.Do(request)
+ if err != nil {
+ fmt.Println("request error: ", err)
+ return nil, err
+ }
+
+ defer resp.Body.Close()
+ body, err := ioutil.ReadAll(resp.Body)
+ if err != nil {
+ fmt.Println(err)
+ return nil, err
+ }
+ return body, nil
+}
func GetEsDataReq(url string, param string, isSource bool) (error, map[string]interface{}) {
req, err := http.NewRequest("POST", url, strings.NewReader(param))
@@ -74,6 +104,7 @@
} else {
d["picMaxUrl"] = ""
}
+ d["picAddress"] = source["cameraAddr"]
tB, err := json.Marshal(source["targetInfo"])
if err != nil {
@@ -108,7 +139,7 @@
}
d["sdkType"] = "浜鸿劯"
} else {
- d["sdkType"] = source["sdkName"]
+ d["sdkType"] = source["taskName"]
d["picSmUrl"] = d["picMaxUrl"]
}
} else {
@@ -240,7 +271,7 @@
filterStr = strings.Join(filterArr, ",")
}
param := "{\"query\":{\"bool\":{\"filter\":["+filterStr+"]}},\"size\":\""+sizeStr+"\",\"sort\":[{\"picDate\":{\"order\":\"desc\"}}]," +
- "\"_source\":{\"includes\":[\"baseInfo\",\"targetInfo\",\"content\",\"id\",\"picMaxUrl\",\"picDate\",\"showLabels\",\"taskName\",\"sdkName\"],\"excludes\":[\"*.feature\",\"*.attachTarget\",\"*.targetLocation\",\"alarmRules\"]}" +
+ "\"_source\":{\"includes\":[\"cameraAddr\",\"baseInfo\",\"targetInfo\",\"content\",\"id\",\"picMaxUrl\",\"picDate\",\"showLabels\",\"taskName\",\"sdkName\",\"videoUrl\"],\"excludes\":[\"*.feature\",\"*.attachTarget\",\"*.targetLocation\",\"alarmRules\"]}" +
"}"
err, tokenRes := GetEsDataReq(url, param, true)
--
Gitblit v1.8.0