add hub flag

liuxiaolong

2019-06-06 22955cd5a948ace0f497c9d618914607f86dba5c

 esutil/EsClient.go

@@ -242,6 +242,7 @@
   if err !=nil{
      return ""
   }

   var resp RespVideo
   err = json.Unmarshal(respBytes, &resp)
   if err !=nil {
@@ -261,7 +262,12 @@
      }
   }
   if videoUrl == ""{
      fmt.Println("resp: ",resp)
      respMap := make(map[string]interface{},0)
      err := json.Unmarshal(respBytes, &respMap)
      if err !=nil {
         fmt.Println("resp UnmarshalToMap err: ",err)
      }
      fmt.Println("resp: ",respMap)
   }
   return videoUrl
}
@@ -325,16 +331,20 @@
   return value[i-1]
}

func PostAction(sec int, Eurl string, picurl string) []byte {
func PostAction(sec int, Eurl string, picurl string, ishub string) []byte {
   index := "videopersons,personaction"
   url := fmt.Sprintf("%s%s%s", Eurl, index, "/_search")

   seccond := strconv.Itoa(sec)
   preSec := ""
   if sec > 30 {
      preSec = "-30s"
   if sec > 60 {
      preSec = "-60s"
   }
   prama := "{\"query\":{\"bool\":{\"filter\":[{\"range\":{\"picDate\":{\"gte\":\"now+8h-" + seccond + "s\",\"lt\":\"now+8h"+preSec+"\"}}}]}},\"size\":\"1000\",\"sort\":[{\"picDate\":{\"order\":\"desc\"}}]," +
   var ishubReq =""
   if ishub == "hub" {
      ishubReq = "{\"term\":{\"personIsHub\":\"1\"}},"
   }
   prama := "{\"query\":{\"bool\":{\"filter\":["+ishubReq+"{\"range\":{\"picDate\":{\"gte\":\"now+8h-" + seccond + "s\",\"lt\":\"now+8h"+preSec+"\"}}}]}},\"size\":\"1000\",\"sort\":[{\"picDate\":{\"order\":\"desc\"}}]," +
      "\"_source\":[\"baseInfo\",\"Gender\",\"BaseName\",\"Age\",\"personId\",\"personPicUrl\",\"indeviceName\",\"imgKey\",\"sdkType\",\"ageDescription\",\"indeviceid\",\"content\",\"Id\",\"picAddress\",\"picMaxUrl\",\"picDate\",\"Race\",\"videoNum\",\"picSmUrl\",\"taskName\",\"personIsHub\",\"idcard\",\"videoIp\",\"videoReqNum\"]" +
      "}"
   err, tokenRes := GetEsDataReq(url, prama, picurl, true)