~suntianyu/webserver.git

			@@ -32,6 +32,34 @@
			data := findEsData(searchBody)
			util.ResponseFormat(c, code.Success, data)
			}
			//获取监控等级
			func getAlarmLevel(alarmlevel []int) ([]string) {
			d := dbapi.DicApi{}
			res,data := d.FindByType("ALARMLEVEL")
			if data == nil {
			fmt.Println("dsadasd")
			}
			fmt.Println(res)
			// fmt.Println(data)
			alarmLevel := make(map[int]string)

			tmp := data.(map[string]interface{})
			for _,value := range tmp["ALARMLEVEL"].([]interface{}) {
			// fmt.Println(value.(map[string]interface{})["value"]," ",value.(map[string]interface{})["name"])
			val := value.(map[string]interface{})["value"].(string)
			name := value.(map[string]interface{})["name"].(string)
			vl,err := strconv.Atoi(val)
			if err != nil {
			fmt.Println("dsadas")
			}
			alarmLevel[vl] = name
			}
			alarmLevelRes := make([]string,len(alarmlevel))
			for i,v := range alarmlevel {
			alarmLevelRes[i] = alarmLevel[v]
			}
			return alarmLevelRes
			}

			func findEsData(searchBody map[string]interface{}) map[string]interface{} {
			webPage := int(searchBody["page"].(float64))
			@@ -76,12 +104,24 @@
			index = config.EsInfo.EsIndex.VideoPersons.IndexName
			esTableIdStr = "{\"terms\":{\"baseInfo.tableId\":[\"" + esTableId + "\"]}},"
			}
			//判断收藏状态
			isCollectStr := ""
			isCollect := searchBody["collection"].(string)
			if isCollect != "" {
			isCollectStr = "{\"term\":{\"isCollect\":\"" + isCollect + "\"}},"
			}

			//判断布防等级id
			alarmLevelId :=searchBody["alarmlevel"].([]interface{})
			alarmLevelStr := ""
			if alarmLevelId != nil && alarmLevelId != 0{
			if alarmLevelId != -1 {
			id := strings.Replace(strings.Trim(fmt.Sprint(getAlarmLevel(alarmLevel)), "[]"), " ", "\",\"", -1)
			alarmLevelStr = "{\"terms\":{\"alarmRules.alarmLevel\":[\"" + id + "\"]}},{\"term\":{\"alarmRules.defenceState\":true}},"
			}else{
			alarmLevelStr = "{\"term\":{\"alarmRules.defenceState\":false}},"
			}
			}

			//使用es底层机制处理分页
			//请求头
			url := "http://" + config.EsInfo.Masterip + ":" + config.EsInfo.Httpport +
			@@ -96,6 +136,7 @@
			"\"query\":{\"bool\":{" + queryStr +
			"\"filter\":[" +
			cameraIdStr +
			alarmLevelStr +
			taskIdStr +
			isCollectStr +
			esTableIdStr +