From 74f4798a0f8578aa4609cd05f57f19f43a115afc Mon Sep 17 00:00:00 2001
From: liuxiaolong <liuxiaolong@aiotlink.com>
Date: 星期二, 28 七月 2020 20:06:55 +0800
Subject: [PATCH] fix face to FaceDetect
---
esutil/EsClient.go | 20 +++++++++++++++-----
1 files changed, 15 insertions(+), 5 deletions(-)
diff --git a/esutil/EsClient.go b/esutil/EsClient.go
index 7d392c8..ea1a079 100644
--- a/esutil/EsClient.go
+++ b/esutil/EsClient.go
@@ -98,11 +98,16 @@
if !exist {
continue
}
- alarmLevel, exist := source["alarmLevel"]
+ alarmRules, exist := source["alarmRules"]
if exist {
- d["alarmLevel"] = alarmLevel
+ if alarmB,ae := json.Marshal(alarmRules);ae ==nil {
+ var alarmRArr []AlarmRule
+ if ae = json.Unmarshal(alarmB, &alarmRArr);ae ==nil && len(alarmRArr) >0 {
+ d["alarmLevel"] = alarmRArr[0].AlarmLevel
+ }
+ }
} else {
- d["alarmLevel"] = "涓�绾�"
+ d["alarmLevel"] = ""
}
pmArr := pmax.([]interface{})
if len(pmArr) > 0 {
@@ -127,7 +132,7 @@
if len(tiArr) > 0 {
ti := tiArr[0]
d["picSmUrl"] = ti.PicSmUrl
- if ti.TargetType == "face" {
+ if ti.TargetType == "FaceDetect" {
sLabelStr, ok := source["showLabels"]
if ok {
labelArr := strings.Split(sLabelStr.(string), "/")
@@ -166,6 +171,11 @@
} else {
return nil, dat
}
+}
+
+type AlarmRule struct {
+ GroupId string `json:"groupId"`
+ AlarmLevel string `json:"alarmLevel"`
}
type TargetInfo struct {
@@ -286,7 +296,7 @@
mustNotStr = strings.Join(mustNotArr, ",")
}
param := "{\"query\":{\"bool\":{\"filter\":["+filterStr+"],\"must_not\":["+mustNotStr+"]}},\"size\":\""+sizeStr+"\",\"sort\":[{\"picDate\":{\"order\":\"desc\"}}]," +
- "\"_source\":{\"includes\":[\"cameraAddr\",\"baseInfo\",\"targetInfo\",\"content\",\"id\",\"picMaxUrl\",\"picDate\",\"showLabels\",\"taskName\",\"sdkName\",\"videoUrl\"],\"excludes\":[\"*.feature\",\"*.attachTarget\",\"*.targetLocation\",\"alarmRules\"]}" +
+ "\"_source\":{\"includes\":[\"cameraAddr\",\"baseInfo\",\"targetInfo\",\"content\",\"id\",\"picMaxUrl\",\"picDate\",\"showLabels\",\"taskName\",\"sdkName\",\"videoUrl\",\"alarmRules\"],\"excludes\":[\"*.feature\",\"*.attachTarget\",\"*.targetLocation\"]}" +
"}"
err, tokenRes := GetEsDataReq(url, param, true)
--
Gitblit v1.8.0