From efbf83e4778cb61e7da23c8a4a62b352929b40ea Mon Sep 17 00:00:00 2001
From: liuxiaolong <736321739@qq.com>
Date: 星期四, 21 十一月 2019 17:56:38 +0800
Subject: [PATCH] fix
---
EsApi.go | 21 ++++++++-------------
1 files changed, 8 insertions(+), 13 deletions(-)
diff --git a/EsApi.go b/EsApi.go
index 09cd5e7..f5cd55c 100644
--- a/EsApi.go
+++ b/EsApi.go
@@ -298,33 +298,28 @@
var aIOceanInfo []protomsg.AIOcean
url := "http://" + serverIp + ":" + serverPort +
"/" + indexName + "/_search"
- isAlarmStr := ""
+ var filterArr []string
if isAlarm != "all" {
- isAlarmStr = ` {
+ filterArr = append(filterArr,` {
"term":{
"isAlarm":"` + isAlarm + `"
}
- }`
-
+ }`)
}
- categoryStr := ""
if category != "all" {
- categoryStr = ` {
+ filterArr = append(filterArr,` {
"term":{
"targetInfo.targetType":"` + category + `"
}
- }`
+ }`)
}
- if categoryStr != "" && isAlarmStr != "" {
- isAlarmStr = isAlarmStr+","
- }
+
queryStr := `"query":{
"bool":{
"filter":[
- ` + isAlarmStr + `
- ` + categoryStr + `
+ `+strings.Join(filterArr,",")+`
]
}
},`
@@ -405,7 +400,7 @@
"term":{
"isAlarm":"` + isAlarm + `"
}
- }`
+ },`
}
DSLJson := `{
--
Gitblit v1.8.0