From c9296a4e0869aa9b4a98df7d0433ef0d6b9a0b10 Mon Sep 17 00:00:00 2001
From: sunty <1172534965@qq.com>
Date: 星期四, 21 十一月 2019 16:11:23 +0800
Subject: [PATCH] fix init
---
EsClient.go | 53 +++++++++++++++++++++++++----------------------------
1 files changed, 25 insertions(+), 28 deletions(-)
diff --git a/EsClient.go b/EsClient.go
index 1f01186..5bb105d 100644
--- a/EsClient.go
+++ b/EsClient.go
@@ -61,38 +61,24 @@
var ok bool
for _, source := range sources {
var tmpinfo protomsg.Esinfo
- tmpinfo.FaceFeature, ok = source["faceFeature"].(string)
- if !ok {
- continue
- }
-
tmpinfo.Id, ok = source["id"].(string)
if !ok {
continue
}
- tmpinfo.Tableid, ok = source["tableId"].(string)
+ if source["targetInfo"] != nil {
+ for _, v := range source["targetInfo"].([]interface{}) {
+ m := v.(map[string]interface{})
+ tmpinfo.FaceFeature, ok = m["feature"].(string)
+ if !ok {
+ continue
+ }
+ }
+ }
+ tmpinfo.AnalyServerId, ok = source["analyServerId"].(string)
if !ok {
continue
}
-
esinfos = append(esinfos, &tmpinfo)
-
- // tmpinfo.PersonName,ok = source["personName"].(string)
- // //Isnil("personName", ok)
- // tmpinfo.PersonPicUrl,ok = source["personPicUrl"].(string)
- // //Isnil("personPicUrl", ok)
- // tmpinfo.PhoneNum,ok = source["phoneNum"].(string)
- // //Isnil("phoneNum", ok)
- // tmpinfo.Sex,ok = source["sex"].(string)
- // //Isnil("sex", ok)
- // tmpinfo.Idcard,ok = source["idCard"].(string)
- // //Isnil("idCard", ok)
- // tmpinfo.MonitorLevel,ok = source["monitorLevel"].(string)
-
- // 鏍规嵁 tableid 鑾峰彇 tablename
- // name, _:= Dbtablename(tmpinfo.TableId)
- // tmpinfo.TableName= name
- // binfos.Infos = append(binfos.Infos, &tmpinfo)
}
return
@@ -122,7 +108,12 @@
tmpinfo.TaskId, ok = source["taskId"].(string)
tmpinfo.TaskName, ok = source["taskName"].(string)
tmpinfo.SdkName, ok = source["sdkName"].(string)
- tmpinfo.PicMaxUrl, ok = source["picMaxUrl"].(string)
+
+ if source["picMaxUrl"] != nil {
+ for _,v := range source["picMaxUrl"].([]interface{}) {
+ tmpinfo.PicMaxUrl = append(tmpinfo.PicMaxUrl, v.(string))
+ }
+ }
tmpinfo.VideoUrl, ok = source["videoUrl"].(string)
tmpinfo.PicDate, ok = source["picDate"].(string)
if source["targetInfo"] != nil {
@@ -130,6 +121,7 @@
m := v.(map[string]interface{})
var ti protomsg.TargetInfo
ti.TargetId, ok = m["targetId"].(string)
+ ti.TargetType, ok = m["targetType"].(string)
ti.TargetScore, ok = m["targetScore"].(float64)
ti.Feature, ok = m["feature"].(string)
ti.PicSmUrl, ok = m["picSmUrl"].(string)
@@ -166,7 +158,7 @@
bi.CompareScore, ok = m["compareScore"].(float64)
bi.BwType, ok = m["bwType"].(string)
bi.TargetId, ok = m["targetId"].(string)
- bi.TableName, ok = m["tableName"].(string)
+ bi.TargetName, ok = m["targetName"].(string)
bi.TargetPicUrl, ok = m["targetPicUrl"].(string)
bi.MonitorLevel, ok = m["monitorLevel"].(string)
bi.Labels, ok = m["labels"].(string)
@@ -216,7 +208,11 @@
lti.TaskId, ok = lm["taskId"].(string)
lti.TaskName, ok = lm["taskName"].(string)
lti.SdkName, ok = lm["sdkName"].(string)
- lti.PicMaxUrl, ok = lm["picMaxUrl"].(string)
+ if lm["picMaxUrl"] != nil {
+ for _,v := range lm["picMaxUrl"].([]interface{}) {
+ lti.PicMaxUrl = append(lti.PicMaxUrl, v.(string))
+ }
+ }
lti.VideoUrl, ok = lm["videoUrl"].(string)
lti.PicDate, ok = lm["picDate"].(string)
if lm["targetInfo"] != nil {
@@ -224,6 +220,7 @@
m := v.(map[string]interface{})
var ti protomsg.TargetInfo
ti.TargetId, ok = m["targetId"].(string)
+ ti.TargetType, ok = m["targetType"].(string)
ti.TargetScore, ok = m["targetScore"].(float64)
ti.Feature, ok = m["feature"].(string)
ti.PicSmUrl, ok = m["picSmUrl"].(string)
@@ -260,7 +257,7 @@
bi.CompareScore, ok = m["compareScore"].(float64)
bi.BwType, ok = m["bwType"].(string)
bi.TargetId, ok = m["targetId"].(string)
- bi.TableName, ok = m["tableName"].(string)
+ bi.TargetName, ok = m["targetName"].(string)
bi.TargetPicUrl, ok = m["targetPicUrl"].(string)
bi.MonitorLevel, ok = m["monitorLevel"].(string)
bi.Labels, ok = m["labels"].(string)
--
Gitblit v1.8.0