From 6e8ebf781ac457b7ec77f7e4c9ade4c3d36002bc Mon Sep 17 00:00:00 2001
From: panlei <2799247126@qq.com>
Date: 星期四, 07 十一月 2019 18:42:05 +0800
Subject: [PATCH] merge master

---
 insertdata/insertDataToEs.go |    5 ++---
 1 files changed, 2 insertions(+), 3 deletions(-)

diff --git a/insertdata/insertDataToEs.go b/insertdata/insertDataToEs.go
index a38b48d..fc97d18 100644
--- a/insertdata/insertDataToEs.go
+++ b/insertdata/insertDataToEs.go
@@ -1,6 +1,7 @@
 package insertdata
 
 import (
+	"basic.com/valib/logger.git"
 	"encoding/base64"
 	"encoding/json"
 	"errors"
@@ -15,7 +16,6 @@
 	"github.com/satori/go.uuid"
 	"ruleprocess/ruleserver"
 	"ruleprocess/util"
-	"ruleprocess/structure"
 )
 
 var weedfsUrl, videoPersonUrl, personAction string
@@ -162,7 +162,6 @@
 					panic("瑙e帇缂╁浘鐗囨椂鍑虹幇閿欒")
 				}
 				alarmRules := []AlarmRule{}
-				//logger.Warn("浜鸿劯id涓猴細", face.Id, "浜鸿劯鐨勮鍒欓暱搴︿负锛�", len(face.rules))
 				//os.Exit(1)
 				for _, faceResult := range face.rules {
 					alarm := ChangeToString(faceResult.DefenceState, faceResult.AlarmLevel)
@@ -204,6 +203,7 @@
 				target.TargetScore = face.Score
 				target.TargetLocation = Points{TopLeft:Point{face.Location.X,face.Location.Y},BottomRight:Point{face.Location.X+face.Location.Width,face.Location.Y+face.Location.Height}}
 				//logger.Info("浜鸿劯鐨刬d:",strconv.FormatUint(face.Id, 10))
+
 				pervideo := PerVideoPicture{
 					msg.Push.PushId,
 					msg.Cid,
@@ -357,7 +357,6 @@
 					// 瑁呴厤鐩爣淇℃伅鏁版嵁
 					for _,target := range yoloResult.Location  {
 						// 鍘婚噸娣诲姞
-						//logger.Info("瑁呴厤鍓嶇殑鍘熷鏁版嵁鏄細",target)
 						var flag = true
 						for _,selectTarget := range targetInfos  {
 							if strconv.FormatUint(target.TargetId, 10) == selectTarget.TargetId {

--
Gitblit v1.8.0