From f851fa7727e4b2384bd5c32793bd58c07e55a53d Mon Sep 17 00:00:00 2001
From: liuxiaolong <736321739@qq.com>
Date: 星期四, 12 十二月 2019 14:24:24 +0800
Subject: [PATCH] FindAllFile add page and size
---
controllers/esSearch.go | 8 ++++----
1 files changed, 4 insertions(+), 4 deletions(-)
diff --git a/controllers/esSearch.go b/controllers/esSearch.go
index ca7340f..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,11 +200,11 @@
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\"]}" +
"}"
- //logger.Debug("findEsData.param:",prama)
+ logger.Debug("findEsData.param:",prama)
//鏁版嵁瑙ｆ瀽
tokenRes := esutil.GetEsDataReq(url, prama, true)
//fmt.Println(tokenRes)
--
Gitblit v1.8.0