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 | 116 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++--
1 files changed, 112 insertions(+), 4 deletions(-)
diff --git a/esutil/EsClient.go b/esutil/EsClient.go
index 5fdcfa1..bf7737b 100644
--- a/esutil/EsClient.go
+++ b/esutil/EsClient.go
@@ -90,12 +90,33 @@
if !exist {
return errors.New("picSmUrl is not string"), nil
}
- //fmt.Println("picSmUrl: ",psm)
+
if !strings.HasPrefix(psm, "http") {
source["picSmUrl"] = picurl + psm
}
- //videoUrl := getVideoUrl(source)
+
+ prace, exist := source["Race"]
+ if exist {
+ 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]
+ if err == nil {
+ source["picDate"] = picDateStr
+ }
+
+ baseInfo := getSourceBaseInfo(source)
+ source["baseInfo"] = baseInfo
sources = append(sources, source)
}
@@ -104,6 +125,93 @@
} else {
return nil, dat
}
+}
+
+func getAgeDesc(age interface{})(ageDesc string) {
+ if age !=nil {
+ ageInt := age.(float64)
+ if ageInt >0 && ageInt<7 {
+ ageDesc = "绔ュ勾"
+ } else if ageInt >=7 && ageInt<18 {
+ ageDesc = "灏戝勾"
+ } else if ageInt >=18 && ageInt<40 {
+ ageDesc = "闈掑勾"
+ } else if ageInt >=40 && ageInt<65 {
+ ageDesc = "涓勾"
+ } else if ageInt >=65 {
+ ageDesc = "鑰佸勾"
+ } else {
+ ageDesc = ""
+ }
+ }
+ return ageDesc
+}
+
+type BaseInfo struct {
+ TaskId string `json:"taskId"`
+ TaskName string `json:"taskName"`
+ LikePer string `json:"likePer"`
+ TableId string `json:"tableId"`
+ TableName string `json:"tableName"`
+ PersonId string `json:"personId"`
+ PersonPicUrl string `json:"personPicUrl"`
+ PersonName string `json:"personName"`
+ Gender string `json:"gender"`
+ PhoneNum string `json:"phoneNum"`
+ IDCard string `json:"IDCard"`
+ MonitorLevel string `json:"monitorLevel"`
+ Content string `json:"content"`
+}
+
+func getSourceBaseInfo(source map[string]interface{}) []BaseInfo {
+ sdkType := source["sdkType"].(string)
+ baseInfoArr := make([]BaseInfo,0)
+ if sdkType == "浜鸿劯" {
+ likePer,baseName,personId,idCard,personPicUrl,gender,content :="","","","","","",""
+ if source["likePer"] !=nil {
+ likePer = source["likePer"].(string)
+ }
+ if source["BaseName"] !=nil {
+ baseName = source["BaseName"].(string)
+ }
+ if source["personId"] !=nil {
+ personId = source["personId"].(string)
+ }
+ if source["idcard"] !=nil {
+ idCard = source["idcard"].(string)
+ }
+ if source["personPicUrl"] !=nil {
+ personPicUrl = source["personPicUrl"].(string)
+ }
+ if source["Gender"] !=nil {
+ gender = source["Gender"].(string)
+ }
+ if source["content"] !=nil {
+ content = source["content"].(string)
+ }
+ var baseInfo = BaseInfo{
+ TaskId:"",//2.0鏂板瓧娈�
+ TaskName:"",//2.0鏂板瓧娈�
+ LikePer:likePer,
+ TableId:"",//2.0鏂板瓧娈�
+ TableName:baseName,
+ PersonId:personId,
+ PersonName:idCard,//浜哄憳濮撳悕锛屼粠绠＄悊骞冲彴鑾峰彇
+ PersonPicUrl:personPicUrl,
+ Gender:gender,
+ PhoneNum:"",//鎵嬫満鍙凤紝浠庣鐞嗗钩鍙拌幏鍙�
+ IDCard:idCard,
+ MonitorLevel:"",//2.0鏂板瓧娈�
+ Content:content,
+ }
+
+ baseInfoArr = append(baseInfoArr, baseInfo)
+ //bytes, err := json.Marshal(baseInfoArr)
+ //if err !=nil {
+ // return ""
+ //}
+ }
+ return baseInfoArr
}
func getVideoUrl(source map[string]interface{}) (videoUrl string){
@@ -212,8 +320,8 @@
seccond := strconv.Itoa(sec)
- prama := "{\"query\":{\"bool\":{\"filter\":[{\"term\":{\"personIsHub\":\"1\"}},{\"range\":{\"picDate\":{\"gte\":\"now+8h-" + seccond + "s\",\"lt\":\"now+8h\"}}}]}},\"size\":\"1000\",\"sort\":[{\"picDate\":{\"order\":\"desc\"}}]," +
- "\"_source\":[\"baseInfo\",\"gender\",\"indeviceName\",\"imgKey\",\"sdkType\",\"ageDescription\",\"indeviceid\",\"content\",\"ID\",\"picAddress\",\"picMaxUrl\",\"picDate\",\"race\",\"videoNum\",\"picSmUrl\",\"taskName\",\"personIsHub\",\"IDCard\",\"videoIp\",\"videoReqNum\"]" +
+ prama := "{\"query\":{\"bool\":{\"filter\":[{\"range\":{\"picDate\":{\"gte\":\"now+8h-" + seccond + "s\",\"lt\":\"now+8h\"}}}]}},\"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