AggregateTaskList filter analyServerId if need

liuxiaolong

2019-10-28 6eaaf713ab1b73f3efa22df5ad8e8645b7c52a11

 EsApi.go

@@ -693,9 +693,24 @@
}

//聚合任务列表，taskId+taskName
func AggregateTaskList(serverIp string, serverPort string, indexName string) (sources []map[string]interface{},err error){
func AggregateTaskList(serverIp string, serverPort string, indexName string, analyServerId string) (sources []map[string]interface{},err error){
   url := "http://" + serverIp + ":" + serverPort +
      "/"+indexName+"/_search"
   serverFilterStr := ""
   if analyServerId != "" {
      serverFilterStr = `,
         "query": {
         "bool": {
            "filter": [
            {
            "term": {
            "analyServerId": "`+analyServerId+`"
            }
            }
         ]
         }
      }`
   }
   DSLJson := `{
    "size": 0,
    "aggs": {
@@ -717,10 +732,11 @@
                        }
                    }
                ],
                "size":"1000"
                "size":"100000000"
            }
        }
    }
   `+serverFilterStr+`
}`
   buf, err := EsReq("POST",url,[]byte(DSLJson))
   if err != nil {