From a5e6ddc46a0306f630ac53a8e0e3843bf8c17a05 Mon Sep 17 00:00:00 2001
From: liuxiaolong <liuxiaolong@aiotlink.com>
Date: 星期三, 07 四月 2021 16:43:09 +0800
Subject: [PATCH] 修复日志路径问题
---
esutil/EsClient.go | 30 ++++++++++++++++++++----------
1 files changed, 20 insertions(+), 10 deletions(-)
diff --git a/esutil/EsClient.go b/esutil/EsClient.go
index ea1a079..f0239fc 100644
--- a/esutil/EsClient.go
+++ b/esutil/EsClient.go
@@ -132,23 +132,29 @@
if len(tiArr) > 0 {
ti := tiArr[0]
d["picSmUrl"] = ti.PicSmUrl
+ d["targetType"] = ti.TargetType
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{}{}
}
- d["sdkType"] = "浜鸿劯"
+ d["sdkType"] = source["taskName"]
} else {
d["sdkType"] = source["taskName"]
d["picSmUrl"] = d["picMaxUrl"]
@@ -188,7 +194,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"`
@@ -207,7 +213,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"`
@@ -256,7 +262,11 @@
Content: t.Content,
})
}
+ } else {
+ fmt.Println("unmarshal bInfos err:", err)
}
+ } else {
+ fmt.Println("marshal bInfos err:", err)
}
return baseInfoArr
--
Gitblit v1.8.0