fix alarmLevel

sunty

2019-07-24 2dda39aa3ca4488bfa270f0be8e886a3773c9707

 controllers/esSearch.go

@@ -32,34 +32,32 @@
   data := findEsData(searchBody)
   util.ResponseFormat(c, code.Success, data)
}

func getAlarmLevel(alarmlevel int) (string) {
//获取监控等级
func getAlarmLevel(alarmlevel []int) ([]string) {
   d := dbapi.DicApi{}
        res,data := d.FindByType("ALARMLEVEL")
        if data == nil {
                fmt.Println("data is 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(err)
            fmt.Println("dsadas")
         }
         alarmLevel[vl] = name

      }
		
      // fmt.Println(alarmLevel)

      alarmLevelRes = alarmLevel[alarmlevel]
   alarmLevelRes := make([]string,len(alarmlevel))
      for i,v := range  alarmlevel  {
         alarmLevelRes[i] =  alarmLevel[v]
      }
      return alarmLevelRes   
}

@@ -113,15 +111,14 @@
      isCollectStr = "{\"term\":{\"isCollect\":\"" + isCollect + "\"}},"
   }
   //判断布防等级id
   alarmLevelId :=searchBody["alarmlevel"].(int)
   alarmLevelId :=searchBody["alarmlevel"].([]interface{})
   alarmLevelStr := ""
   if alarmLevelId != nil && alarmLevelId != 0{
      if alarmLevelId != -1 {
         id := getAlarmLevel(alarmLevelId)
         alarmLevelStr = "{\"terms\":{\"alarmRules.alarmLevel\":[\"" + id + "\"]}},{\"terms\":{\"alarmRules.defenceState\":[\"true\"]}},"

         id := strings.Replace(strings.Trim(fmt.Sprint(getAlarmLevel(alarmLevel)), "[]"), " ", "\",\"", -1)
         alarmLevelStr = "{\"terms\":{\"alarmRules.alarmLevel\":[\"" + id + "\"]}},{\"term\":{\"alarmRules.defenceState\":true}},"
      }else{
         alarmLevelStr = "{\"terms\":{\"alarmRules.defenceState\":[\"false\"]}},"
         alarmLevelStr = "{\"term\":{\"alarmRules.defenceState\":false}},"
      }
   }