From 6225f722fd54187b18f6b1a97d044e6918c8ce3b Mon Sep 17 00:00:00 2001
From: sunty <1172534965@qq.com>
Date: 星期四, 21 十一月 2019 17:46:59 +0800
Subject: [PATCH] fix StatisticsComprehensive

---
 EsApi.go |   20 ++++++++++----------
 1 files changed, 10 insertions(+), 10 deletions(-)

diff --git a/EsApi.go b/EsApi.go
index 7bb04ff..09cd5e7 100644
--- a/EsApi.go
+++ b/EsApi.go
@@ -396,24 +396,24 @@
 }
 
 //缁煎悎缁熻
-func StatisticsComprehensive(serverIp string, serverPort string, indexName string, isAlarm bool) (total int, err error) {
+func StatisticsComprehensive(serverIp string, serverPort string, indexName string, isAlarm string) (total int, err error) {
 	url := "http://" + serverIp + ":" + serverPort +
 		"/" + indexName + "/_search"
-	alarmJson := ""
-	if !isAlarm {
-		alarmJson = `
-		{
-			"term":{
-			"isAlarm":` + strconv.FormatBool(isAlarm) + `
-		}
-		},`
+	isAlarmStr := ""
+	if isAlarm != "all" {
+		isAlarmStr = `				{
+					"term":{
+						"isAlarm":"` + isAlarm + `"
+					}
+				}`
+
 	}
 	DSLJson := `{
 	"size":0,
 	"query":{
 		"bool":{
 			"filter":[
-				` + alarmJson + `
+				` + isAlarmStr + `
 				{
 				"range":{
 					"picDate":{

--
Gitblit v1.8.0