add endTime omitenpty add taglist serverId filter add baseInfo{persoNname p...

sunty

2019-07-31 28bf0226d1df3817bec0947d6d1ad11356dcd290

 controllers/esSearch.go

@@ -33,37 +33,38 @@
   data := findEsData(searchBody)
   util.ResponseFormat(c, code.Success, data)
}

//获取监控等级
func getAlarmLevel(alarmlevel []interface{}) ([]string) {
func getAlarmLevel(alarmlevel []interface{}) []string {
   d := dbapi.DicApi{}
        res,data := d.FindByType("ALARMLEVEL")
        if data == nil {
                logger.Debug("data is nil")
        }
   res, data := d.FindByType("ALARMLEVEL")
   if data == nil {
      logger.Debug("data is nil")
   }
   logger.Debug(res)
      // logger.Debug(data)
   // logger.Debug(data)
   alarmLevel := make(map[int]string)
   tmp := data.(map[string]interface{})
      for _,value := range tmp["ALARMLEVEL"].([]interface{}) {
         // logger.Debug(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 {
            logger.Debug(err)
         }
         alarmLevel[vl] = name
   for _, value := range tmp["ALARMLEVEL"].([]interface{}) {
      // logger.Debug(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 {
         logger.Debug(err)
      }
   alarmLevelRes := make([]string,len(alarmlevel))
      for i,v := range  alarmlevel  {
         value := int(v.(float64))
         if value < 0 {
            alarmLevelRes[i] = "撤防"
         }else {
            alarmLevelRes[i] =  alarmLevel[value]
         }
      alarmLevel[vl] = name
   }
   alarmLevelRes := make([]string, len(alarmlevel))
   for i, v := range alarmlevel {
      value := int(v.(float64))
      if value < 0 {
         alarmLevelRes[i] = "撤防"
      } else {
         alarmLevelRes[i] = alarmLevel[value]
      }
   return alarmLevelRes	
   }
   return alarmLevelRes
}

func findEsData(searchBody map[string]interface{}) map[string]interface{} {
@@ -80,7 +81,7 @@
   queryBody := searchBody["inputValue"].(string)
   //检索框
   if queryBody != "" {
      queryStr = "\"must\":[{\"multi_match\":{\"query\":\"" + queryBody + "\",\"fields\":[\"alarmRules.alarmLevel^1.5\",\"ageDescription^1.5\",\"taskName^1.5\",\"baseInfo.tableName^1.5\",\"sex^2.0\",\"race^2.0\",\"content^1.0\",\"baseInfo.idCard^1.8\",\"cameraAddr^1.0\"]," +
      queryStr = "\"must\":[{\"multi_match\":{\"query\":\"" + queryBody + "\",\"fields\":[\"baseInfo.sex\",\"baseInfo.phoneNum.raw^1.5\",\"baseInfo.personName.raw^1.5\",\"alarmRules.alarmLevel^1.5\",\"ageDescription^1.5\",\"taskName^1.5\",\"baseInfo.tableName^1.5\",\"sex^2.0\",\"race^2.0\",\"content^1.0\",\"baseInfo.idCard^1.8\",\"cameraAddr^1.0\"]," +
         "\"type\":\"cross_fields\",\"operator\":\"OR\",\"slop\":0,\"prefix_length\":0,\"max_expansions\":50,\"zero_terms_query\":\"NONE\",\"auto_generate_synonyms_phrase_query\":true,\"fuzzy_transpositions\":true,\"boost\":1}}],"
   }
   gteDate := searchBody["searchTime"].([]interface{})[0].(string)
@@ -116,13 +117,13 @@
      isCollectStr = "{\"term\":{\"isCollect\":\"" + isCollect + "\"}},"
   }
   //判断布防等级id
   alarmLevelId :=searchBody["alarmlevel"].([]interface{})
   alarmLevelId := searchBody["alarmlevel"].([]interface{})
   alarmLevelStr := ""
   if len(alarmLevelId) > 0 {
      alarmLevelTypes := strings.Replace(strings.Trim(fmt.Sprint(getAlarmLevel(alarmLevelId)), "[]"), " ", "\",\"", -1)
      alarmLevelStr = "{\"terms\":{\"alarmRules.alarmLevel\":[\"" + alarmLevelTypes + "\"]}},"
   }
		

   //使用es底层机制处理分页
   //请求头
   url := "http://" + config.EsInfo.Masterip + ":" + config.EsInfo.Httpport +