From 59dcc2bba3b294b2679beb4f177b835552798ed5 Mon Sep 17 00:00:00 2001
From: panlei <2799247126@qq.com>
Date: 星期四, 07 十一月 2019 16:28:53 +0800
Subject: [PATCH] 持续时间第一张画框完成
---
insertdata/insertDataToEs.go | 72 ++++++++++++------------------------
1 files changed, 24 insertions(+), 48 deletions(-)
diff --git a/insertdata/insertDataToEs.go b/insertdata/insertDataToEs.go
index 6f42c9a..ba89ac2 100644
--- a/insertdata/insertDataToEs.go
+++ b/insertdata/insertDataToEs.go
@@ -194,6 +194,13 @@
}
i := protomsg.Image{}
err = proto.Unmarshal(bdata, &i)
+ // 鍏堜紶灏忓浘锛屽啀浼犲ぇ鍥撅紝闃叉鑴镐笂鏈夌嚎
+ bytes := util.SubImg(i, int(face.Location.X), int(face.Location.Y), int(face.Location.X+face.Location.Width), int(face.Location.Y+face.Location.Height))
+ resp, err := util.PostFormBufferData1(weedfsUrl, bytes, uuid.NewV4().String())
+ if err != nil {
+ logger.Error("涓婁紶灏忓浘鍑洪敊")
+ }
+ // 涓婁紶澶у浘
if imgMaxUrl == "" {
bigPhotoUrl := make(map[string]interface{})
bigPhotoUrl, err = util.DrawPolygonOnImageForFace(msg.Cid, i, msg.RuleResult["face"].([]structure.FaceResult), weedfsUrl)
@@ -201,23 +208,6 @@
imgMaxUrl = bigPhotoUrl["fileUrl"].(string)
picTime = i.Timestamp
}
- // 浜鸿劯妫�娴嬶紝娌℃湁鐩镐技鐨勫簳搴撲汉鍛�
- localConfig, err := cache.GetServerInfo()
- if err != nil {
- logger.Error("鏌ヨ鏈満淇℃伅澶辫触锛�")
- }
- serverIp, err := GetLocalIP()
- // 鏌ヨcameraName
- camera, err := cache.GetCameraById(msg.Cid)
- if err != nil {
- logger.Error("鏌ヨ鎽勫儚鏈轰俊鎭け璐�")
- }
- bytes := util.SubImg(i, int(face.Location.X), int(face.Location.Y), int(face.Location.X+face.Location.Width), int(face.Location.Y+face.Location.Height))
- resp, err := util.PostFormBufferData1(weedfsUrl, bytes, uuid.NewV4().String())
- if err != nil {
- logger.Error("涓婁紶灏忓浘鍑洪敊")
- }
- //logger.Info("================灏忓浘鍦板潃:", resp["fileUrl"].(string))
sex := ""
logger.Info(sex)
if face.ThftRes.Gender == 1 {
@@ -228,7 +218,7 @@
race := getRaceString(face.ThftRes.Race)
ageDescription := getDescription(face.ThftRes.Age)
logger.Info(ageDescription)
- esDataId := uuid.NewV4().String()
+ //esDataId := uuid.NewV4().String()
linksId := ""
if linkId != "" {
linksId = linkId
@@ -240,9 +230,9 @@
//logger.Info("浜鸿劯鐨刬d:",strconv.FormatUint(face.Id, 10))
logger.Info("%%%%%%%%%%%%%%%%%%%%%鐩爣淇℃伅锛�",*target)
pervideo := PerVideoPicture{
- esDataId,
+ msg.Push.PushId,
msg.Cid,
- camera.Addr,
+ msg.Push.Cam.Addr,
picTime,
imgMaxUrl,
msg.Tasklab.Taskid,
@@ -259,10 +249,10 @@
face.ThftRes.Beauty,
base64.StdEncoding.EncodeToString(face.Feature),
[]string{resp["fileUrl"].(string)},
- "鏆傛棤闆嗙兢",
- localConfig.ServerId,
- localConfig.ServerName,
- serverIp,
+ "",
+ msg.Push.ServerId,
+ msg.Push.ServerName,
+ msg.Push.LocalIp,
"",
linksId,
face.Score,
@@ -285,7 +275,7 @@
} else {
logger.Info("鎻掑叆es杩斿洖鐨勪俊鎭細", resp1)
// 鍙戝嚭褰曞儚淇″彿
- ruleserver.AddLxMessage(&protomsg.VideotapeInfo{EsDataId: esDataId, CameraId: msg.Cid, TaskId: msg.Tasklab.Taskid, ImgId: i.Id, SdkIds: []string{}, Type: 1})
+ ruleserver.AddLxMessage(&protomsg.VideotapeInfo{EsDataId: msg.Push.PushId, CameraId: msg.Cid, TaskId: msg.Tasklab.Taskid, VideoUrl:msg.Push.VideoUrl,ImgId: i.Id, SdkIds: []string{}, Type: 1})
}
}
}
@@ -452,40 +442,27 @@
// 涓嶆槸鎶ヨ鏁版嵁涓嶅瓨
return
}
- // logger.Println("鍥剧墖涓婁紶杩斿洖鍊硷細", resp)
- // 鏌ヨ鏈満淇℃伅
- localConfig, err := cache.GetServerInfo()
- if err != nil {
- logger.Error("鏌ヨ鏈満淇℃伅澶辫触锛�")
- }
- // 鏌ヨcameraName
- camera, err := cache.GetCameraById(msg.Cid)
- if err != nil {
- logger.Error("鏌ヨ鎽勫儚鏈轰俊鎭け璐�")
- }
- logger.Info("鎽勫儚鏈轰俊鎭細",camera)
- serverIp, err := GetLocalIP()
- logger.Info("%%%%%%%%%%%%%%%%%yolo鐨則arget淇℃伅锛�",targetInfos)
+
if resp["fileUrl"] != nil {
url = append(url, resp["fileUrl"].(string))
- esDataId := uuid.NewV4().String()
+ //esDataId := uuid.NewV4().String()
linksId := ""
if linkId != "" {
linksId = linkId
}
peraction := Personaction{
- esDataId,
+ msg.Push.PushId,
msg.Cid,
- camera.Name,
- camera.Addr,
+ msg.Push.Cam.Name,
+ msg.Push.Cam.Addr,
msg.Tasklab.Taskid,
msg.Tasklab.Taskname,
sdkNames,
"",
alarmRules,
- localConfig.ServerId,
- localConfig.ServerName,
- serverIp,
+ msg.Push.ServerId,
+ msg.Push.ServerName,
+ msg.Push.LocalIp,
"",
url,
i.Timestamp,
@@ -502,7 +479,6 @@
if err != nil {
logger.Info("json parse error ", err)
return
-
}
resp1, err2 := EsReq("POST", personAction, requstbody)
if err2 != nil {
@@ -510,7 +486,7 @@
} else {
logger.Debug("鎻掑叆es杩斿洖鐨勬暟鎹俊鎭槸锛�", resp1)
// 鍙戝嚭褰曞儚淇″彿
- ruleserver.AddLxMessage(&protomsg.VideotapeInfo{EsDataId: esDataId, CameraId: msg.Cid, TaskId: msg.Tasklab.Taskid, ImgId: i.Id, SdkIds: []string{}, Type: 2})
+ ruleserver.AddLxMessage(&protomsg.VideotapeInfo{EsDataId: msg.Push.PushId, CameraId: msg.Cid, TaskId: msg.Tasklab.Taskid,VideoUrl:msg.Push.VideoUrl, ImgId: i.Id, SdkIds: []string{}, Type: 2})
logger.Warn("__________________________________________寰�ES鎻掑叆yolo鏁版嵁鎴愬姛")
//os.Exit(1)
}
--
Gitblit v1.8.0