From c9296a4e0869aa9b4a98df7d0433ef0d6b9a0b10 Mon Sep 17 00:00:00 2001
From: sunty <1172534965@qq.com>
Date: 星期四, 21 十一月 2019 16:11:23 +0800
Subject: [PATCH] fix init
---
EsApi.go | 23 ++++++++++++++---------
1 files changed, 14 insertions(+), 9 deletions(-)
diff --git a/EsApi.go b/EsApi.go
index 5d02530..a5651cb 100644
--- a/EsApi.go
+++ b/EsApi.go
@@ -298,17 +298,22 @@
var aIOceanInfo []protomsg.AIOcean
url := "http://" + serverIp + ":" + serverPort +
"/" + indexName + "/_search"
- queryStr := `"query":{
+ categoryStr := ""
+ if category != "" {
+ categoryStr = ` {
+ "term":{
+ "targetInfo.targetType":"` + category + `"
+ }
+ },`
+
+ }
+ queryStr := `"query":{
"bool":{
"filter":[
+ ` + categoryStr + `
{
"term":{
- "isAlarm":`+strconv.FormatBool(isAlarm)+`
- }
- },
- {
- "term":{
- "targetInfo.targetType":"`+category+`"
+ "isAlarm":` + strconv.FormatBool(isAlarm) + `
}
}
]
@@ -357,7 +362,7 @@
},
{
"term":{
- "isAlarm":`+strconv.FormatBool(isAlarm)+`
+ "isAlarm":` + strconv.FormatBool(isAlarm) + `
}
}
]
@@ -398,7 +403,7 @@
},
{
"term":{
- "isAlarm":`+strconv.FormatBool(isAlarm)+`
+ "isAlarm":` + strconv.FormatBool(isAlarm) + `
}
}
]
--
Gitblit v1.8.0