From 319916a777780df40675c7e22d2520f524612330 Mon Sep 17 00:00:00 2001
From: liuxiaolong <736321739@qq.com>
Date: 星期一, 11 十一月 2019 16:44:10 +0800
Subject: [PATCH] fix picDate to minisec
---
esutil/EsClient.go | 26 +++++++++++++++-----------
1 files changed, 15 insertions(+), 11 deletions(-)
diff --git a/esutil/EsClient.go b/esutil/EsClient.go
index cc3c801..7046bcc 100644
--- a/esutil/EsClient.go
+++ b/esutil/EsClient.go
@@ -115,12 +115,12 @@
source["ageDescription"] = getAgeDesc(source["Age"])
source["videoNum"] = getVideoUrl(source)
- picDate := source["picDate"].(string)
- lastIdx := strings.LastIndex(picDate,":")
- picDateStr := picDate[:lastIdx]
- if err == nil {
- source["picDate"] = picDateStr
- }
+ //picDate := source["picDate"].(string)
+ //lastIdx := strings.LastIndex(picDate,":")
+ //picDateStr := picDate[:lastIdx]
+ //if err == nil {
+ // source["picDate"] = picDateStr
+ //}
baseInfo := getSourceBaseInfo(source)
source["baseInfo"] = baseInfo
@@ -361,30 +361,34 @@
}
func PostAction(sec int, Eurl string, picurl string, ishub string, size int, lastT time.Time, curTime time.Time) []byte {
- lastTimeStr := lastT.Format("2006-01-02 15:04:05")
- curTimeStr := curTime.Format("2006-01-02 15:04:05")
+ //lastTimeStr := lastT.Format("2006-01-02 15:04:05")
+ //curTimeStr := curTime.Format("2006-01-02 15:04:05")
index := "videopersons,personaction"
url := fmt.Sprintf("%s%s%s", Eurl, index, "/_search")
startTime := time.Now()
sizeStr :=""
if size <=0 {
- sizeStr = "100"
+ sizeStr = "1000"
} else {
sizeStr = strconv.Itoa(size)
}
-
+ preSec := "10"
+ if sec <=0 {
+ preSec = "10"
+ }
var filterArr []string
if ishub == "hub" {
filterArr = append(filterArr,"{\"term\":{\"personIsHub\":\"1\"}}")
}
- filterArr = append(filterArr, "{\"range\":{\"picDate\":{\"gte\":\""+lastTimeStr+"\",\"lt\":\""+curTimeStr+"\"}}}")
+ filterArr = append(filterArr, "{\"range\":{\"picDate\":{\"gte\":\"now+8h-"+preSec+"s\",\"lt\":\"now+8h\"}}}")
filterStr := ""
if len(filterArr) >0 {
filterStr = strings.Join(filterArr, ",")
}
+ log.Log.Infoln("filterArr:", filterStr)
prama := "{\"query\":{\"bool\":{\"filter\":["+filterStr+"]}},\"size\":\""+sizeStr+"\",\"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\"]" +
"}"
--
Gitblit v1.8.0