From a66d7b87a8683347973b357cba3cb23bbf12c6b1 Mon Sep 17 00:00:00 2001
From: liuxiaolong <liuxiaolong@aiotlink.com>
Date: 星期二, 28 七月 2020 20:24:04 +0800
Subject: [PATCH] score use float32
---
esutil/EsClient.go | 21 +++++++++++----------
1 files changed, 11 insertions(+), 10 deletions(-)
diff --git a/esutil/EsClient.go b/esutil/EsClient.go
index ddadef7..53a9edd 100644
--- a/esutil/EsClient.go
+++ b/esutil/EsClient.go
@@ -100,16 +100,11 @@
}
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 {
d["alarmLevel"] = ""
@@ -137,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), "/")
@@ -149,7 +144,9 @@
}
if bInfos,ok := source["baseInfo"]; ok && bInfos != nil {
- d["baseInfo"] = getSourceBaseInfo(bInfos)
+ bd := getSourceBaseInfo(bInfos)
+ fmt.Println("bd:", bd)
+ d["baseInfo"] = bd
} else {
d["baseInfo"] = []interface{}{}
}
@@ -193,7 +190,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"`
@@ -212,7 +209,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"`
@@ -261,7 +258,11 @@
Content: t.Content,
})
}
+ } else {
+ fmt.Println("unmarshal bInfos err:", err)
}
+ } else {
+ fmt.Println("marshal bInfos err:", err)
}
return baseInfoArr
@@ -301,7 +302,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