add discovery

liuxiaolong

2019-07-25 f88a44f58396fb36a979cfe5640a36d6ac2d7289

 controllers/esSearch.go

@@ -111,24 +111,24 @@
      isCollectStr = "{\"term\":{\"isCollect\":\"" + isCollect + "\"}},"
   }
   //判断布防等级id
   alarmLevelId :=searchBody["alarmlevel"].([]interface{})
   alarmLevelId :=searchBody["alarmlevel"].([]int)
   alarmLevelStr := ""
   defenceStateStr = ""
   defenceStateStr := ""
   if len(alarmLevelId) > 0 {
      flag := false
      for i,v := range alarmLevelId {
         if v == -1 {
            alarmLevelId = append(alarmLevel[:i], alarmLevel[i+1:]...)
            alarmLevelId = append(alarmLevelId[:i], alarmLevelId[i+1:]...)
            defenceStateStr = "{\"term\":{\"alarmRules.defenceState\":false}},"
            flag = true
            breake
            break
         }
      }
      if len(alarmLevelId) > 0{
         if flag == false {
            defenceStateStr = "{\"term\":{\"alarmRules.defenceState\":true}},"
         }
         id := strings.Replace(strings.Trim(fmt.Sprint(getAlarmLevel(alarmLevel)), "[]"), " ", "\",\"", -1)
         id := strings.Replace(strings.Trim(fmt.Sprint(getAlarmLevel(alarmLevelId)), "[]"), " ", "\",\"", -1)
         alarmLevelStr = "{\"terms\":{\"alarmRules.alarmLevel\":[\"" + id + "\"]}},"      
      }
   }