From d5f1d6930d6366e8be1a882bdf00c3e3686a6a26 Mon Sep 17 00:00:00 2001
From: liuxiaolong <736321739@qq.com>
Date: 星期五, 01 十一月 2019 15:43:12 +0800
Subject: [PATCH] fix
---
esutil/EsClient.go | 306 +++++++++++++++++++++++++++++++++++++++++++++++++-
1 files changed, 299 insertions(+), 7 deletions(-)
diff --git a/esutil/EsClient.go b/esutil/EsClient.go
index fdf50d6..7d46d06 100644
--- a/esutil/EsClient.go
+++ b/esutil/EsClient.go
@@ -1,6 +1,7 @@
package esutil
import (
+ "bytes"
"encoding/json"
"errors"
"fmt"
@@ -9,12 +10,14 @@
"net/http"
"strconv"
"strings"
+ "sync"
"time"
+ "andriodServer/config"
- log "github.com/long/test/log"
+ log "andriodServer/log"
)
-func GetEsDataReq(url string, parama string, isSource bool) (error, map[string]interface{}) {
+func GetEsDataReq(url string, parama string, picurl string, isSource bool) (error, map[string]interface{}) {
//log.Log.Infoln("es 鏌ヨ璇锋眰璺緞" + url) // 閰嶇疆淇℃伅 鑾峰彇
req, err := http.NewRequest("POST", url, strings.NewReader(parama))
@@ -63,6 +66,7 @@
}
source["id"] = value.(map[string]interface{})["_id"]
+
sdkType := source["sdkType"]
if sdkType != nil {
sdk, err := strconv.Atoi(sdkType.(string))
@@ -72,6 +76,55 @@
source["sdkType"] = sdkTypeToValue(sdk)
}
+
+ pmax, exist := source["picMaxUrl"].(string)
+ //fmt.Println("picMaxUrl: ",pmax)
+ if !exist {
+ return errors.New("picMaxurl is not string"), nil
+ }
+
+
+ if !strings.HasPrefix(pmax, "http") {
+ source["picMaxUrl"] = picurl + pmax
+
+ }
+
+ psm, exist := source["picSmUrl"].(string)
+ if !exist {
+ return errors.New("picSmUrl is not string"), nil
+ }
+
+ if !strings.HasPrefix(psm, "http") {
+ source["picSmUrl"] = picurl + psm
+ }
+
+ if source["sdkType"] != "浜鸿劯" {//琛屼负娌℃湁瀛樺偍澶у浘
+ source["picMaxUrl"] = source["picSmUrl"]
+ }
+
+ 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)
}
data["datalist"] = sources
@@ -81,6 +134,223 @@
}
}
+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
+}
+
+var videoCacheMap = make(map[string]string,0)
+var lock sync.RWMutex
+
+func setVideoCache(imgKey string, url string) {
+ lock.Lock()
+ defer lock.Unlock()
+ videoCacheMap[imgKey] = url
+}
+
+func getVideoFromCache(imgKey string) string {
+ lock.Lock()
+ defer lock.Unlock()
+ if v,ok := videoCacheMap[imgKey];ok {
+ return v
+ }
+ return ""
+}
+
+func getVideoUrl(source map[string]interface{}) (videoUrl string){
+ imgKey := source["imgKey"].(string)
+
+ //鍏堜粠缂撳瓨閲岄潰鍙�
+ cacheUrl := getVideoFromCache(imgKey)
+ if cacheUrl !="" {
+ return cacheUrl
+ }
+
+ picDate := source["picDate"].(string)//鎶撴媿鏃ユ湡
+ cameraId := source["videoReqNum"].(string)//鎽勫儚鏈篿d
+ indeviceId := source["indeviceid"].(string)//鍒嗘瀽璁惧id
+
+ reqUrl := ""
+ if url,ok := config.ServerMap[indeviceId];!ok {
+ return ""
+ } else {
+ reqUrl = url
+ }
+
+ paramMap := make(map[string]interface{},0)
+ paramMap["imgKey"] = imgKey
+ paramMap["picDate"] = picDate
+ paramMap["videoNum"] = cameraId
+
+ respBytes, err := doPostRequest(reqUrl, "application/json", paramMap, nil, nil)
+ if err !=nil{
+ return ""
+ }
+
+ var resp RespVideo
+ err = json.Unmarshal(respBytes, &resp)
+ if err !=nil {
+ return ""
+ }
+
+ filePath := resp.FilePath
+ videoUrl = ""
+ if !strings.Contains(filePath, "/cut"){
+ videoUrl = ""
+ fmt.Printf("videoReqUrl:%s ,imgKey:%s ,picDate:%s ,cameraId:%s ,filePath:%s \n ",reqUrl,imgKey,picDate,cameraId,filePath)
+ } else {
+ strArr := strings.Split(filePath, "/cut")
+ ngxUrl := config.NgxMap[indeviceId]
+ if ngxUrl !="" && len(strArr) >0 {
+ videoUrl = ngxUrl + strArr[1]
+ }
+ }
+ if videoUrl == ""{
+ respMap := make(map[string]interface{},0)
+ err := json.Unmarshal(respBytes, &respMap)
+ if err !=nil {
+ fmt.Println("resp UnmarshalToMap err: ",err)
+ }
+ fmt.Println("resp: ",respMap)
+ }
+ setVideoCache(imgKey, videoUrl)
+ return videoUrl
+}
+
+type RespVideo struct{
+ FilePath string `json:"file_path"`
+}
+func doPostRequest(url string, contentType string, body map[string]interface{}, params map[string]string, headers map[string]string) ([]byte, error) {
+ var resultBytes []byte
+ var bodyJson []byte
+ if body != nil {
+ var err error
+ bodyJson, err = json.Marshal(body)
+ if err != nil {
+ log.Log.Errorln("doPostRequestMarshal err:",err)
+ return resultBytes, err
+ }
+ }
+ request, err := http.NewRequest("POST", url, bytes.NewBuffer(bodyJson))
+ if err != nil {
+ log.Log.Errorln("NewRequest ERR:",err)
+ return resultBytes, err
+ }
+ request.Header.Set("Content-type", contentType)
+ //add params
+ q := request.URL.Query()
+ if params != nil {
+ for key, val := range params {
+ q.Add(key, val)
+ }
+ request.URL.RawQuery = q.Encode()
+ }
+ // add headers
+ if headers != nil {
+ for key, val := range headers {
+ request.Header.Add(key, val)
+ }
+ }
+ timeOut:= time.Duration(8*time.Second)//set request timeout
+ client := &http.Client{
+ Timeout:timeOut,
+ }
+ resp, err := client.Do(request)
+ if err != nil {
+ log.Log.Errorln("DoRequest ERR:",err)
+ return resultBytes, err
+ }
+ defer resp.Body.Close()
+ resultBytes, err = ioutil.ReadAll(resp.Body)
+ if err != nil {
+ log.Log.Errorln("ReadAll ERR:",err)
+ return resultBytes, err
+ }
+ return resultBytes, nil
+}
+
//sdk绫诲瀷
func sdkTypeToValue(i int) string {
value := []string{"浜鸿劯", "杞﹁締", "浜轰綋", "鍏ヤ镜", "鎷ユ尋", "闈犲彸琛�", "浜哄憳寮傚父", "涓綋闈欐"}
@@ -88,16 +358,38 @@
return value[i-1]
}
-func PostAction(sec int, Eurl string) []byte {
+func PostAction(sec int, Eurl string, picurl string, ishub string, size int) []byte {
index := "videopersons,personaction"
url := fmt.Sprintf("%s%s%s", Eurl, index, "/_search")
-
+ startTime := time.Now()
seccond := strconv.Itoa(sec)
+ preSec := ""
+ if sec > 60 {
+ preSec = "-60s"
+ }
+ sizeStr :=""
+ if size <=0 {
+ sizeStr = "100"
+ } else {
+ sizeStr = strconv.Itoa(size)
+ }
- 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\",\"sdkType\",\"ageDescription\",\"content\",\"ID\",\"picAddress\",\"picMaxUrl\",\"picDate\",\"race\",\"videoNum\",\"picSmUrl\",\"taskName\",\"personIsHub\",\"IDCard\",\"videoIp\",\"videoReqNum\"]" +
+ var filterArr []string
+ if ishub == "hub" {
+ filterArr = append(filterArr,"{\"term\":{\"personIsHub\":\"1\"}}")
+ }
+ if sec > 60 {
+ filterArr = append(filterArr, "{\"range\":{\"picDate\":{\"gte\":\"now+8h-" + seccond + "s\",\"lt\":\"now+8h"+preSec+"\"}}}")
+ }
+ filterStr := ""
+ if len(filterArr) >0 {
+ filterStr = strings.Join(filterArr, ",")
+ }
+ 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\"]" +
"}"
- err, tokenRes := GetEsDataReq(url, prama, true)
+ 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