disable alarmLevel

sunty

2019-07-25 135644d52bb9f9ad9f05831b1bd1fbb01f06082d

disable alarmLevel

 controllers/esSearch.go

@@ -111,27 +111,27 @@
        isCollectStr = "{\"term\":{\"isCollect\":\"" + isCollect + "\"}},"
    }
    //判断布防等级id
    alarmLevelId :=searchBody["alarmlevel"].([]int)
    alarmLevelStr := ""
    defenceStateStr := ""
    if len(alarmLevelId) > 0 {
        flag := false
        for i,v := range alarmLevelId {
            if v == -1 {
                alarmLevelId = append(alarmLevelId[:i], alarmLevelId[i+1:]...)
                defenceStateStr = "{\"term\":{\"alarmRules.defenceState\":false}},"
                flag = true
                break
            }
        }
        if len(alarmLevelId) > 0{
            if flag == false {
                defenceStateStr = "{\"term\":{\"alarmRules.defenceState\":true}},"
            }
            id := strings.Replace(strings.Trim(fmt.Sprint(getAlarmLevel(alarmLevelId)), "[]"), " ", "\",\"", -1)
            alarmLevelStr = "{\"terms\":{\"alarmRules.alarmLevel\":[\"" + id + "\"]}},"		
        }
    }
    // alarmLevelId :=searchBody["alarmlevel"].([]int)
    // alarmLevelStr := ""
    // defenceStateStr := ""
    // if len(alarmLevelId) > 0 {
    //     flag := false
    //     for i,v := range alarmLevelId {
    //         if v == -1 {
    //             alarmLevelId = append(alarmLevelId[:i], alarmLevelId[i+1:]...)
    //             defenceStateStr = "{\"term\":{\"alarmRules.defenceState\":false}},"
    //             flag = true
    //             break
    //         }
    //     }
    //     if len(alarmLevelId) > 0{
    //         if flag == false {
    //             defenceStateStr = "{\"term\":{\"alarmRules.defenceState\":true}},"
    //         }
    //         id := strings.Replace(strings.Trim(fmt.Sprint(getAlarmLevel(alarmLevelId)), "[]"), " ", "\",\"", -1)
    //         alarmLevelStr = "{\"terms\":{\"alarmRules.alarmLevel\":[\"" + id + "\"]}},"		
    //     }
    // }
        
    //使用es底层机制处理分页
    //请求头
@@ -147,8 +147,8 @@
        "\"query\":{\"bool\":{" + queryStr +
        "\"filter\":[" +
        cameraIdStr +
        alarmLevelStr +
        defenceStateStr +
        // alarmLevelStr +
        // defenceStateStr +
        taskIdStr +
        isCollectStr +
        esTableIdStr +