From 87051e0ff26fbb47b4aa828b22dcfd6a628a47d0 Mon Sep 17 00:00:00 2001
From: liuxiaolong <736321739@qq.com>
Date: 星期四, 26 十二月 2019 11:17:49 +0800
Subject: [PATCH] update capture lib
---
controllers/esSearch.go | 6 +++---
1 files changed, 3 insertions(+), 3 deletions(-)
diff --git a/controllers/esSearch.go b/controllers/esSearch.go
index 314ef31..161e1ac 100644
--- a/controllers/esSearch.go
+++ b/controllers/esSearch.go
@@ -158,8 +158,8 @@
linkTagInfoAlarmLevelStr := ""
if len(alarmLevelId) > 0 {
alarmLevelTypes := strings.Replace(strings.Trim(fmt.Sprint(getAlarmLevel(alarmLevelId)), "[]"), " ", "\",\"", -1)
- alarmLevelStr = "{\"terms\":{\"alarmRules.alarmLevel\":[\"" + alarmLevelTypes + "\"]}},"
- linkTagInfoAlarmLevelStr = "{\"terms\":{\"linkTagInfo.alarmRules.alarmLevel\":[\"" + alarmLevelTypes + "\"]}},"
+ alarmLevelStr = "{\"terms\":{\"alarmRules.alarmLevel.raw\":[\"" + alarmLevelTypes + "\"]}},"
+ linkTagInfoAlarmLevelStr = "{\"terms\":{\"linkTagInfo.alarmRules.alarmLevel.raw\":[\"" + alarmLevelTypes + "\"]}},"
}
//浣跨敤es搴曞眰鏈哄埗澶勭悊鍒嗛〉
@@ -200,7 +200,7 @@
linkTagInfoAnalyServerFilterStr +
"{\"range\":{\"linkTagInfo.picDate\":{\"from\":\"" + gteDate + "\",\"to\":\"" + lteDate + "\",\"include_lower\":true,\"include_upper\":true,\"boost\":1}}}"+
"]}}" +
- "]," +
+ "]}}," +
"\"sort\":[{\"_score\":{\"order\":\"desc\"}},{\"picDate\":{\"order\":\"desc\"}}]," +
"\"_source\":{\"includes\":[],\"excludes\":[\"*.feature\"]}" +
"}"
--
Gitblit v1.8.0