From 22955cd5a948ace0f497c9d618914607f86dba5c Mon Sep 17 00:00:00 2001 From: liuxiaolong <736321739@qq.com> Date: 星期四, 06 六月 2019 15:41:19 +0800 Subject: [PATCH] add hub flag --- esutil/EsClient.go | 8 ++++++-- 1 files changed, 6 insertions(+), 2 deletions(-) diff --git a/esutil/EsClient.go b/esutil/EsClient.go index 385698f..6b7c6d3 100644 --- a/esutil/EsClient.go +++ b/esutil/EsClient.go @@ -331,7 +331,7 @@ 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") @@ -340,7 +340,11 @@ 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) -- Gitblit v1.8.0