From e7cab31e1177c33e1f5d738b1f7743c1975aecc5 Mon Sep 17 00:00:00 2001
From: liuxiaolong <736321739@qq.com>
Date: 星期四, 13 六月 2019 10:42:34 +0800
Subject: [PATCH] return false when write error
---
esutil/EsClient.go | 17 +++++++++++++----
1 files changed, 13 insertions(+), 4 deletions(-)
diff --git a/esutil/EsClient.go b/esutil/EsClient.go
index b8f814a..715a414 100644
--- a/esutil/EsClient.go
+++ b/esutil/EsClient.go
@@ -81,6 +81,7 @@
return errors.New("picMaxurl is not string"), nil
}
+
if !strings.HasPrefix(pmax, "http") {
source["picMaxUrl"] = picurl + pmax
@@ -93,6 +94,10 @@
if !strings.HasPrefix(psm, "http") {
source["picSmUrl"] = picurl + psm
+ }
+
+ if source["sdkType"] != "浜鸿劯" {//琛屼负娌℃湁瀛樺偍澶у浘
+ source["picMaxUrl"] = source["picSmUrl"]
}
prace, exist := source["Race"]
@@ -331,16 +336,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)
--
Gitblit v1.8.0