From 333a9c6a715acae04f3d0dcb06d7d711df68ba7f Mon Sep 17 00:00:00 2001
From: panlei <2799247126@qq.com>
Date: 星期三, 03 七月 2019 10:03:26 +0800
Subject: [PATCH] 人脸加上摄像机地址

---
 insertdata/insertDataToEs.go |    7 ++++++-
 1 files changed, 6 insertions(+), 1 deletions(-)

diff --git a/insertdata/insertDataToEs.go b/insertdata/insertDataToEs.go
index 2474033..c16d36b 100644
--- a/insertdata/insertDataToEs.go
+++ b/insertdata/insertDataToEs.go
@@ -124,6 +124,11 @@
 				if err != nil {
 					panic("瑙e帇缂╁浘鐗囨椂鍑虹幇閿欒")
 				}
+				// 鏌ヨcameraName
+				camera, err := cache.GetCameraById(msg.Cid)
+				if err != nil {
+					log.Println("鏌ヨ鎽勫儚鏈轰俊鎭け璐�")
+				}
 				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))
@@ -134,7 +139,7 @@
 				pervideo := PerVideoPicture{
 					uuid.NewV4().String(),
 					msg.Cid,
-					msg.Caddr,
+					camera.Addr,
 					time.Now().Format("2006-01-02 15:04:05"),
 					strings.Split(bigPhotoUrl["fileUrl"].(string), "/")[1],
 					msg.Tasklab.Taskid,

--
Gitblit v1.8.0