From 44d5e620bf62e4b1c70f16af980738d5c4c7d517 Mon Sep 17 00:00:00 2001
From: panlei <2799247126@qq.com>
Date: 星期一, 16 十二月 2019 18:33:19 +0800
Subject: [PATCH] ---
---
algorithm/middleware/insertDataToEs.go | 107 +++++++++++++++++++++++++++++++++++------------------
1 files changed, 71 insertions(+), 36 deletions(-)
diff --git a/algorithm/middleware/insertDataToEs.go b/algorithm/middleware/insertDataToEs.go
index 0ff5d3b..67cb823 100644
--- a/algorithm/middleware/insertDataToEs.go
+++ b/algorithm/middleware/insertDataToEs.go
@@ -133,7 +133,7 @@
faces = PutFace(faces, results.([]structure.Result))
//logger.Info("鏁寸悊鍚庣殑鏁版嵁锛�",faces)
if faces != nil {
- logger.Warn("face涓嶄负nil")
+ logger.Warn("鐩爣涓嶄负nil")
var imgMaxUrl []string = []string{}
var picTime string = ""
for _, face := range faces {
@@ -193,44 +193,43 @@
}
//logger.Info("浜鸿劯鐩爣target:",targetInfos)
- pervideo := PerVideoPicture{LinkInfo{
- id,
- msg.Cid,
- msg.Push.Cam.Addr,
- msg.Push.Cam.Name,
- picTime,
- imgMaxUrl,
- msg.Tasklab.Taskid,
- msg.Tasklab.Taskname,
- sdkname,
- "",
- alarmRules,
- time.Now().Format("2006-01-02 15:04:05"), // 鍙娴嬶紝娌℃湁姣斿鏃堕棿
- lable,
- lableAttach,
- "",
- msg.Push.ServerId,
- msg.Push.ServerName,
- msg.Push.LocalIp,
- "",
- true,
- false,
- false,
- false,
- face.Liker,
- targetInfos,
- },
- "",
- []*LinkInfo{},
- }
- requstbody, err := json.Marshal(pervideo)
- if err != nil {
- logger.Info("json parse error ", err)
- return
- }
if key == "track" && len(face.Liker) == 1{
+ pervideo1 := LinkInfo{
+ id,
+ msg.Cid,
+ msg.Push.Cam.Addr,
+ msg.Push.Cam.Name,
+ picTime,
+ imgMaxUrl,
+ msg.Tasklab.Taskid,
+ msg.Tasklab.Taskname,
+ sdkname,
+ "",
+ alarmRules,
+ time.Now().Format("2006-01-02 15:04:05"), // 鍙娴嬶紝娌℃湁姣斿鏃堕棿
+ lable,
+ lableAttach,
+ "",
+ msg.Push.ServerId,
+ msg.Push.ServerName,
+ msg.Push.LocalIp,
+ "",
+ true,
+ false,
+ false,
+ false,
+ face.Liker,
+ targetInfos,
+ }
+ requstbody, err := json.Marshal(pervideo1)
+
+ if err != nil {
+ logger.Info("json parse error ", err)
+ return
+ }
esid := face.Liker[0].TargetId
+ logger.Info("liker淇℃伅锛�",*face.Liker[0])
returnMsg, err1 := esutil.AppendTargetInfo(esid, string(requstbody),structure.EsInfo.EsIndex.AIOcean.IndexName,serverIp,serverPort)
if err1 != nil {
logger.Error("杩藉姞鏁版嵁鍑洪敊锛�---", err1)
@@ -240,6 +239,42 @@
ruleserver.AddLxMessage(&protomsg.VideotapeInfo{EsDataId: face.Uuid, CameraId: msg.Cid, TaskId: msg.Tasklab.Taskid, VideoUrl: msg.Push.VideoUrl, ImgId: i.Id, SdkIds: []string{"-1"}, Type: 1})
}
} else {
+ pervideo := PerVideoPicture{LinkInfo{
+ id,
+ msg.Cid,
+ msg.Push.Cam.Addr,
+ msg.Push.Cam.Name,
+ picTime,
+ imgMaxUrl,
+ msg.Tasklab.Taskid,
+ msg.Tasklab.Taskname,
+ sdkname,
+ "",
+ alarmRules,
+ time.Now().Format("2006-01-02 15:04:05"), // 鍙娴嬶紝娌℃湁姣斿鏃堕棿
+ lable,
+ lableAttach,
+ "",
+ msg.Push.ServerId,
+ msg.Push.ServerName,
+ msg.Push.LocalIp,
+ "",
+ true,
+ false,
+ false,
+ false,
+ face.Liker,
+ targetInfos,
+ },
+ "",
+ []*LinkInfo{},
+ }
+ requstbody, err := json.Marshal(pervideo)
+
+ if err != nil {
+ logger.Info("json parse error ", err)
+ return
+ }
resp1, err1 := insertdata.EsReq("POST", videoPersonUrl, requstbody)
if err1 != nil {
logger.Error("涓婁紶ES鍑洪敊锛�---", err1)
--
Gitblit v1.8.0