From 41c8c9062aa846cac1117716bc920ac9d451ace2 Mon Sep 17 00:00:00 2001
From: liuxiaolong <liuxiaolong@aiotlink.com>
Date: 星期四, 18 六月 2020 14:05:54 +0800
Subject: [PATCH] fix
---
esutil/EsClient.go | 53 +++++++++++++++++++++++++++++++++++++++++++++++------
1 files changed, 47 insertions(+), 6 deletions(-)
diff --git a/esutil/EsClient.go b/esutil/EsClient.go
index bcf3c83..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))
@@ -27,7 +57,7 @@
resp, err := client.Do(req)
if err != nil {
- return err, nil
+ return err, nil
}
defer resp.Body.Close()
@@ -47,7 +77,7 @@
}
// 鏄惁闇�瑕� 瑙ｆ瀽 es 杩斿洖鐨� source
if isSource {
- dat, ok := dat["hits"].(map[string]interface{})
+ dat, ok := dat["hits"].(map[string]interface{})
if !ok {
return errors.New("data is not type of map[string]interface{}"), nil
}
@@ -63,7 +93,7 @@
}
d["id"] = value.(map[string]interface{})["_id"]
-
+ d["picDate"] = source["picDate"]
pmax, exist := source["picMaxUrl"]
if !exist {
continue
@@ -71,16 +101,21 @@
pmArr := pmax.([]interface{})
if len(pmArr) > 0 {
d["picMaxUrl"] = pmArr[0]
+ } else {
+ d["picMaxUrl"] = ""
}
+ d["picAddress"] = source["cameraAddr"]
tB, err := json.Marshal(source["targetInfo"])
if err != nil {
- continue
+ log.Log.Infoln("err:", err)
+ continue
}
tiArr := []TargetInfo{}
err = json.Unmarshal(tB, &tiArr)
if err !=nil {
+ log.Log.Infoln("err:", err)
continue
}
if len(tiArr) > 0 {
@@ -102,7 +137,13 @@
} else {
d["baseInfo"] = []interface{}{}
}
+ d["sdkType"] = "浜鸿劯"
+ } else {
+ d["sdkType"] = source["taskName"]
+ d["picSmUrl"] = d["picMaxUrl"]
}
+ } else {
+ d["picSmUrl"] = d["picMaxUrl"]
}
@@ -220,7 +261,7 @@
var filterArr []string
//鏄惁鏌ユ姤璀︽暟鎹�
if ishub == "hub" {
- filterArr = append(filterArr,"{\"term\":{\"alarmRules.alarmLevel.raw\":\"涓�绾"}}")
+ filterArr = append(filterArr,"{\"term\":{\"alarmRules.alarmLevel.raw\":\"浜岀骇\"}}")
}
filterArr = append(filterArr, "{\"range\":{\"picDate\":{\"gte\":\"now+8h-"+preSec+"s\",\"lt\":\"now+8h\"}}}")
@@ -230,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\"],\"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