fix

liuxiaolong

2019-11-21 efbf83e4778cb61e7da23c8a4a62b352929b40ea

fix

 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 := `{