From 016e5b4b487b0ddaa85716db028b65f03ece15d2 Mon Sep 17 00:00:00 2001
From: liuxiaolong <liuxiaolong@aiotlink.com>
Date: 星期二, 28 七月 2020 20:37:16 +0800
Subject: [PATCH] rm log
---
esutil/EsClient.go | 37 ++++++++++++++++++++-----------------
1 files changed, 20 insertions(+), 17 deletions(-)
diff --git a/esutil/EsClient.go b/esutil/EsClient.go
index 7bbcde6..dc18aab 100644
--- a/esutil/EsClient.go
+++ b/esutil/EsClient.go
@@ -100,19 +100,13 @@
}
alarmRules, exist := source["alarmRules"]
if exist {
- fmt.Println("exist alarmRules")
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 {
- fmt.Println("unmarshal ae:", ae)
}
- } else {
- fmt.Println("ae:", ae)
}
} else {
- fmt.Println("no alarmRules")
d["alarmLevel"] = ""
}
pmArr := pmax.([]interface{})
@@ -138,19 +132,24 @@
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), "/")
- if len(labelArr) == 3 {
- d["gender"] = labelArr[0]
- d["ageDescription"] = labelArr[1]
- d["race"] = labelArr[2]
- }
+ //labelArr := strings.Split(sLabelStr.(string), "/")
+ //if len(labelArr) == 3 {
+ // d["gender"] = labelArr[0]
+ // d["ageDescription"] = labelArr[1]
+ // d["race"] = labelArr[2]
+ //}
+ d["showLabels"] = sLabelStr
+ } else {
+ d["showLabels"] = ""
}
+
if bInfos,ok := source["baseInfo"]; ok && bInfos != nil {
- d["baseInfo"] = getSourceBaseInfo(bInfos)
+ bd := getSourceBaseInfo(bInfos)
+ d["baseInfo"] = bd
} else {
d["baseInfo"] = []interface{}{}
}
@@ -194,7 +193,7 @@
type BaseInfo struct {
TaskId string `json:"taskId"`
TaskName string `json:"taskName"`
- LikePer string `json:"likePer"`
+ LikePer float32 `json:"likePer"`
TableId string `json:"tableId"`
TableName string `json:"tableName"`
PersonId string `json:"personId"`
@@ -213,7 +212,7 @@
TargetName string `json:"targetName"`
TargetId string `json:"targetId"`
TableId string `json:"tableId"`
- CompareScore string `json:"compareScore"`
+ CompareScore float32 `json:"compareScore"`
MonitorLevel string `json:"monitorLevel"`
Content string `json:"content"`
TableName string `json:"tableName"`
@@ -262,7 +261,11 @@
Content: t.Content,
})
}
+ } else {
+ fmt.Println("unmarshal bInfos err:", err)
}
+ } else {
+ fmt.Println("marshal bInfos err:", err)
}
return baseInfoArr
@@ -302,7 +305,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\",\"alarmRules\"],\"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