Merge branch 'master' of http://192.168.1.14:10010/r/webserver

liuxiaolong

2019-07-25 a6c7dc63c5a69111b23e5748b6aab56e94c3b331

 controllers/esSearch.go

@@ -37,12 +37,11 @@
   d := dbapi.DicApi{}
        res,data := d.FindByType("ALARMLEVEL")
        if data == nil {
                fmt.Println("dsadasd")
                fmt.Println("data is nil")
        }
   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"]) 
@@ -50,13 +49,17 @@
         name := value.(map[string]interface{})["name"].(string)
         vl,err := strconv.Atoi(val)
         if err != nil {
            fmt.Println("dsadas")
            fmt.Println(err)
         }
         alarmLevel[vl] = name
      }
   alarmLevelRes := make([]string,len(alarmlevel))
      for i,v := range  alarmlevel  {
         if v < 0 {
            alarmLevelRes[i] = "撤防"
         }else {
         alarmLevelRes[i] =  alarmLevel[v]
         }
      }
   return alarmLevelRes   
}
@@ -113,24 +116,9 @@
   //判断布防等级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 + "\"]}},"		
      }
      alarmLevelTypes := strings.Replace(strings.Trim(fmt.Sprint(getAlarmLevel(alarmLevelId)), "[]"), " ", "\",\"", -1)
      alarmLevelStr = "{\"terms\":{\"alarmRules.alarmLevel\":[\"" + alarmLevelTypes + "\"]}},"
   }
      
   //使用es底层机制处理分页
@@ -148,7 +136,6 @@
      "\"filter\":[" +
      cameraIdStr +
      alarmLevelStr +
      defenceStateStr +
      taskIdStr +
      isCollectStr +
      esTableIdStr +