sunty
2019-11-21 c9296a4e0869aa9b4a98df7d0433ef0d6b9a0b10
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) + `
               }
            }
            ]