From a6b70dc77c22af74b13f70715b6328ec65c7e312 Mon Sep 17 00:00:00 2001
From: sunty <1172534965@qq.com>
Date: 星期三, 20 十一月 2019 20:54:54 +0800
Subject: [PATCH] add targetType

---
 EsClient.go |    2 ++
 EsApi.go    |    2 +-
 2 files changed, 3 insertions(+), 1 deletions(-)

diff --git a/EsApi.go b/EsApi.go
index b216b6c..6061321 100644
--- a/EsApi.go
+++ b/EsApi.go
@@ -175,7 +175,7 @@
 	//鍒ゆ柇甯冮槻绛夌骇
 	alarmLevelStr := ""
 	if alarmLevelTypes != "" {
-		alarmLevelStr = "{\"terms\":{\"alarmRules.alarmLevel\":[\"" + alarmLevelTypes + "\"]}},"
+		alarmLevelStr = "{\"terms\":{\"alarmRules.alarmLevel.raw\":[\"" + alarmLevelTypes + "\"]}},"
 	}
 
 	//浣跨敤es搴曞眰鏈哄埗澶勭悊鍒嗛〉
diff --git a/EsClient.go b/EsClient.go
index 35ce7e5..5bb105d 100644
--- a/EsClient.go
+++ b/EsClient.go
@@ -121,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)
@@ -219,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)

--
Gitblit v1.8.0