From d671ea8ec8658da21990d5418c981d74f6015045 Mon Sep 17 00:00:00 2001
From: liuxiaolong <736321739@qq.com>
Date: 星期三, 11 十二月 2019 11:50:43 +0800
Subject: [PATCH] add conf path
---
esutil/EsClient.go | 30 +++++++++++++++++-------------
1 files changed, 17 insertions(+), 13 deletions(-)
diff --git a/esutil/EsClient.go b/esutil/EsClient.go
index de71523..bc1e81f 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,25 +361,29 @@
}
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"
+ } else {
+ preSec = strconv.Itoa(sec)
+ }
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 {
@@ -390,7 +394,7 @@
"\"_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)
- log.Log.Infoln("鏉℃暟:",size,"鑰楁椂锛�",time.Since(startTime))
+
if err != nil {
log.Log.Errorln(err)
return nil
--
Gitblit v1.8.0