From f308c3d7ac1dc86e7b151f736fa3ad96309245f4 Mon Sep 17 00:00:00 2001
From: liuxiaolong <736321739@qq.com>
Date: 星期二, 28 五月 2019 18:11:01 +0800
Subject: [PATCH] test rm personIsHub=1
---
esutil/EsClient.go | 128 +++++++++++++++++++++++++++++++++++-------
1 files changed, 105 insertions(+), 23 deletions(-)
diff --git a/esutil/EsClient.go b/esutil/EsClient.go
index 266a8ab..be812d8 100644
--- a/esutil/EsClient.go
+++ b/esutil/EsClient.go
@@ -15,7 +15,7 @@
log "github.com/long/test/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))
@@ -64,6 +64,7 @@
}
source["id"] = value.(map[string]interface{})["_id"]
+
sdkType := source["sdkType"]
if sdkType != nil {
sdk, err := strconv.Atoi(sdkType.(string))
@@ -74,8 +75,35 @@
source["sdkType"] = sdkTypeToValue(sdk)
}
- //videoUrl := getVideoUrl(source)
+ 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
+ }
+
source["videoNum"] = getVideoUrl(source)
+ timeFormat := "2019-05-28 15:04:05"
+ picDateStr, err := time.Parse(timeFormat, source["picDate"].(string))
+ if err == nil {
+ source["picDate"] = picDateStr
+ }
+
+ baseInfo := getSourceBaseInfo(source)
+ source["baseInfo"] = baseInfo
sources = append(sources, source)
}
@@ -86,25 +114,74 @@
}
}
+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{}) (baseInfoJson string) {
+ sdkType := source["sdkType"].(string)
+ if sdkType == "浜鸿劯" {
+ var baseInfo = BaseInfo{
+ TaskId:"",//2.0鏂板瓧娈�
+ TaskName:"",//2.0鏂板瓧娈�
+ LikePer:source["likePer"].(string),
+ TableId:"",//2.0鏂板瓧娈�
+ TableName:source["BaseName"].(string),
+ PersonId:source["personId"].(string),
+ PersonName:source["idcard"].(string),//浜哄憳濮撳悕锛屼粠绠＄悊骞冲彴鑾峰彇
+ PersonPicUrl:source["personPicUrl"].(string),
+ Gender:source["Gender"].(string),
+ PhoneNum:"",//鎵嬫満鍙凤紝浠庣鐞嗗钩鍙拌幏鍙�
+ IDCard:source["idcard"].(string),
+ MonitorLevel:"",//2.0鏂板瓧娈�
+ Content:source["content"].(string),
+ }
+ bytes, err := json.Marshal(baseInfo)
+ if err !=nil {
+ return ""
+ }
+ return string(bytes)
+ }
+ return ""
+}
+
func getVideoUrl(source map[string]interface{}) (videoUrl string){
imgKey := source["imgKey"].(string)
picDte := source["picDate"].(string)//鎶撴媿鏃ユ湡
cameraId := source["videoReqNum"].(string)//鎽勫儚鏈篿d
indeviceId := source["indeviceid"].(string)//鍒嗘瀽璁惧id
+ deviceMap := make(map[string]string,0)
+ deviceMap["DSVAD010120181119"] = "http://172.17.50.241:11111/getRecordVideoPath"
+ deviceMap["DSVAD010220181119"] = "http://172.17.50.242:11111/getRecordVideoPath"
+ deviceMap["DSVAD010320181119"] = "http://172.17.50.243:11111/getRecordVideoPath"
+ deviceMap["DSVAD010420181119"] = "http://172.17.50.244:11111/getRecordVideoPath"
- var deviceMap map[string]string
- deviceMap["DSVAD010120181119"] = "http://58.118.225.79:41241/ManCarAnaly/perVideoPic/uploadRtnVideo"
- deviceMap["DSVAD010220181119"] = "http://58.118.225.79:41242/ManCarAnaly/perVideoPic/uploadRtnVideo"
- deviceMap["DSVAD010320181119"] = "http://58.118.225.79:41243/ManCarAnaly/perVideoPic/uploadRtnVideo"
- deviceMap["DSVAD010420181119"] = "http://58.118.225.79:41244/ManCarAnaly/perVideoPic/uploadRtnVideo"
+ ngxMap := make(map[string]string,0)
+ ngxMap["DSVAD010120181119"] = "http://58.118.225.79:44180/videosource"
+ ngxMap["DSVAD010220181119"] = "http://58.118.225.79:44280/videosource"
+ ngxMap["DSVAD010320181119"] = "http://58.118.225.79:44380/videosource"
+ ngxMap["DSVAD010420181119"] = "http://58.118.225.79:44480/videosource"
+
reqUrl := deviceMap[indeviceId]
- var paramMap map[string]interface{}
+ paramMap := make(map[string]interface{},0)
paramMap["imgKey"] = imgKey
paramMap["picDate"] = picDte
- paramMap["videoPath"] = cameraId
+ paramMap["videoNum"] = cameraId
- respBytes, err := doPostRequest(reqUrl, "application/x-www-form-urlencoded", paramMap, nil, nil)
+ respBytes, err := doPostRequest(reqUrl, "application/json", paramMap, nil, nil)
if err !=nil{
return ""
}
@@ -113,19 +190,24 @@
if err !=nil {
return ""
}
- return resp.VideoPath
+ filePath := resp.FilePath
+
+ if !strings.Contains(filePath, "/cut"){
+ return ""
+ } else {
+ strArr := strings.Split(filePath, "/cut")
+ ngxUrl := ngxMap[indeviceId]
+ if ngxUrl !="" && len(strArr) >0 {
+ return ngxUrl + strArr[1]
+ }
+ }
+
+ return ""
}
type RespVideo struct{
- Code int32 `json:"code"`
- ErrorStr string `json:"errorStr"`
- Msg string `json:"msg"`
- Resp interface{}
- Status string `json:"status"`
- VideoPath string `json:"videoPath"`
+ 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
@@ -175,17 +257,17 @@
return value[i-1]
}
-func PostAction(sec int, Eurl string) []byte {
+func PostAction(sec int, Eurl string, picurl string) []byte {
index := "videopersons,personaction"
url := fmt.Sprintf("%s%s%s", Eurl, index, "/_search")
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\",\"sdkType\",\"ageDescription\",\"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\",\"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)
- err, tokenRes := GetEsDataReq(url, prama, true)
if err != nil {
log.Log.Errorln(err)
return nil
--
Gitblit v1.8.0