From 22ddb0631572b367aabd7cdd0604f8b98ea998fb Mon Sep 17 00:00:00 2001
From: sunty <1172534965@qq.com>
Date: 星期二, 08 十月 2019 11:55:04 +0800
Subject: [PATCH] fix EsApi
---
EsClient.go | 13 ++++++++-----
1 files changed, 8 insertions(+), 5 deletions(-)
diff --git a/EsClient.go b/EsClient.go
index 9a69741..8b2afb9 100644
--- a/EsClient.go
+++ b/EsClient.go
@@ -58,9 +58,8 @@
//瑙ｆ瀽鎶撴媿搴撲汉鍛樼粨鏋�
func Videopersonsbyid(sources []map[string]interface{}) (tmpinfos []protomsg.Videopersons) {
var ok bool
-
- var tmpinfo protomsg.Videopersons
for _, source := range sources{
+ var tmpinfo protomsg.Videopersons
tmpinfo.Id, ok = source["id"].(string)
if !ok {
continue
@@ -157,7 +156,8 @@
fmt.Println(source["alarmRules"])
for _,v := range source["alarmRules"].([]interface{}) {
m := v.(map[string]interface{})
- ar := protomsg.AlarmRules{}
+ var ar protomsg.AlarmRules
+ //ar := protomsg.AlarmRules{}
ar.GroupId,ok = m["groupId"].(string)
Isnil("groupId",ok)
ar.AlarmLevel,ok = m["alarmLevel"].(string)
@@ -166,16 +166,18 @@
Isnil("ruleText",ok)
ar.DefenceState,ok = m["defenceState"].(bool)
Isnil("DefenceState",ok)
- tmpinfo.AlarmRules = append( tmpinfo.AlarmRules, &ar)
+ tmpinfo.AlarmRules = append(tmpinfo.AlarmRules, &ar)
}
}
+
if source["baseInfo"] != nil {
fmt.Println(source["baseInfo"])
for _,v := range source["baseInfo"].([]interface{}) {
m := v.(map[string]interface{})
fmt.Println("m:",m)
- bi := protomsg.BaseInfo{}
+ var bi protomsg.BaseInfo
+ //bi := protomsg.BaseInfo{}
bi.TableId,ok = m["tableId"].(string)
Isnil("tableId",ok)
bi.TableName,ok = m["tableName"].(string)
@@ -222,6 +224,7 @@
return tmpinfos
}
+
//瑙ｆ瀽搴曞簱浜哄憳缁撴瀯
func Dbpersonbyid(sources []map[string]interface{}) (tmpinfos []protomsg.Dbperson) {
var ok bool
--
Gitblit v1.8.0