-

sunty

2019-11-21 d36b669d795731432da8674a4485d1da3347b67c

-

 EsApi.go

@@ -294,28 +294,37 @@
}

//初始化实时抓拍
func InitRealTimeCapture(serverIp string, serverPort string, indexName string, isAlarm bool, category string, quantity int) ([]protomsg.AIOcean, error) {
func InitRealTimeCapture(serverIp string, serverPort string, indexName string, isAlarm string, category string, quantity int) ([]protomsg.AIOcean, error) {
    var aIOceanInfo []protomsg.AIOcean
    url := "http://" + serverIp + ":" + serverPort +
        "/" + indexName + "/_search"
    isAlarmStr := ""
    if isAlarm != "all" {
        isAlarmStr = `                {
                    "term":{
                        "isAlarm":"` + isAlarm + `"
                    }
                }`

    }

    categoryStr := ""
    if category != "" {
    if category != "all" {
        categoryStr = `                {
                    "term":{
                        "targetInfo.targetType":"` + category + `"
                    }
                },`
                }`

    }
    if categoryStr != "" && isAlarmStr != "" {
        isAlarmStr = isAlarmStr+","
    }
    queryStr := `"query":{
        "bool":{
            "filter":[
                ` + isAlarmStr + `
                ` + categoryStr + `
                {
                    "term":{
                        "isAlarm":` + strconv.FormatBool(isAlarm) + `
                    }
                }
            ]
        }
    },`
@@ -390,20 +399,26 @@
func StatisticsComprehensive(serverIp string, serverPort string, indexName string, isAlarm bool) (total int, err error) {
    url := "http://" + serverIp + ":" + serverPort +
        "/" + indexName + "/_search"
    alarmJson := ""
    if !isAlarm {
        alarmJson = `
        {
            "term":{
            "isAlarm":` + strconv.FormatBool(isAlarm) + `
        }
        },`
    }
    DSLJson := `{
    "size":0,
    "query":{
        "bool":{
            "filter":[{
            "filter":[
                ` + alarmJson + `
                {
                "range":{
                    "picDate":{
                        "gte":"now+8h/d"
                        }
                    }
                },
                {
                    "term":{
                        "isAlarm":` + strconv.FormatBool(isAlarm) + `
                    }
                }
                ]