From edbb60128b0bf53e735d62feab38b5d7f42be7f0 Mon Sep 17 00:00:00 2001
From: liuxiaolong <736321739@qq.com>
Date: 星期三, 29 五月 2019 13:17:33 +0800
Subject: [PATCH] fix bug
---
esutil/EsClient.go | 32 +++++++++++++++++---------------
1 files changed, 17 insertions(+), 15 deletions(-)
diff --git a/esutil/EsClient.go b/esutil/EsClient.go
index 97e8aeb..bf7737b 100644
--- a/esutil/EsClient.go
+++ b/esutil/EsClient.go
@@ -100,14 +100,19 @@
source["race"] = prace
}
+ pGender, exist := source["Gender"]
+ if exist {
+ source["gender"] = pGender
+ }
+
source["ageDescription"] = getAgeDesc(source["Age"])
source["videoNum"] = getVideoUrl(source)
-
- picDateStr, err := time.Parse("2006-01-02 15:04:05", source["picDate"].(string))
- fmt.Println("picDate: ", picDateStr.Format("2006-01-02 15:04:05"))
+ picDate := source["picDate"].(string)
+ lastIdx := strings.LastIndex(picDate,":")
+ picDateStr := picDate[:lastIdx]
if err == nil {
- source["picDate"] = picDateStr.Format("2006-01-02 15:04:05")
+ source["picDate"] = picDateStr
}
baseInfo := getSourceBaseInfo(source)
@@ -123,9 +128,8 @@
}
func getAgeDesc(age interface{})(ageDesc string) {
- fmt.Println("ageInterface: ", age)
if age !=nil {
- ageInt := age.(int)
+ ageInt := age.(float64)
if ageInt >0 && ageInt<7 {
ageDesc = "绔ュ勾"
} else if ageInt >=7 && ageInt<18 {
@@ -140,7 +144,6 @@
ageDesc = ""
}
}
- fmt.Println("ageDescription: ", ageDesc)
return ageDesc
}
@@ -160,7 +163,7 @@
Content string `json:"content"`
}
-func getSourceBaseInfo(source map[string]interface{}) (baseInfoJson string) {
+func getSourceBaseInfo(source map[string]interface{}) []BaseInfo {
sdkType := source["sdkType"].(string)
baseInfoArr := make([]BaseInfo,0)
if sdkType == "浜鸿劯" {
@@ -203,13 +206,12 @@
}
baseInfoArr = append(baseInfoArr, baseInfo)
- bytes, err := json.Marshal(baseInfoArr)
- if err !=nil {
- return ""
- }
- return string(bytes)
+ //bytes, err := json.Marshal(baseInfoArr)
+ //if err !=nil {
+ // return ""
+ //}
}
- return ""
+ return baseInfoArr
}
func getVideoUrl(source map[string]interface{}) (videoUrl string){
@@ -319,7 +321,7 @@
seccond := strconv.Itoa(sec)
prama := "{\"query\":{\"bool\":{\"filter\":[{\"range\":{\"picDate\":{\"gte\":\"now+8h-" + seccond + "s\",\"lt\":\"now+8h\"}}}]}},\"size\":\"1000\",\"sort\":[{\"picDate\":{\"order\":\"desc\"}}]," +
- "\"_source\":[\"baseInfo\",\"Gender\",\"Age\",\"personId\",\"personPicUrl\",\"indeviceName\",\"imgKey\",\"sdkType\",\"ageDescription\",\"indeviceid\",\"content\",\"Id\",\"picAddress\",\"picMaxUrl\",\"picDate\",\"Race\",\"videoNum\",\"picSmUrl\",\"taskName\",\"personIsHub\",\"idcard\",\"videoIp\",\"videoReqNum\"]" +
+ "\"_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