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 |   10 +++++++---
 1 files changed, 7 insertions(+), 3 deletions(-)

diff --git a/esutil/EsClient.go b/esutil/EsClient.go
index 4e93e4a..bf7737b 100644
--- a/esutil/EsClient.go
+++ b/esutil/EsClient.go
@@ -100,13 +100,17 @@
 				source["race"] = prace
 			}
 
+			pGender, exist := source["Gender"]
+			if exist {
+				source["gender"] = pGender
+			}
+
 			source["ageDescription"] = getAgeDesc(source["Age"])
 
 			source["videoNum"] = getVideoUrl(source)
 			picDate := source["picDate"].(string)
 			lastIdx := strings.LastIndex(picDate,":")
-			picDateStr := picDate[lastIdx-1]
-			fmt.Println("picDate: ", picDateStr)
+			picDateStr := picDate[:lastIdx]
 			if err == nil {
 				source["picDate"] = picDateStr
 			}
@@ -317,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