From c115b3c406d105fb234e40a0caf419e27ded23cb Mon Sep 17 00:00:00 2001
From: panlei <2799247126@qq.com>
Date: 星期五, 01 十一月 2019 17:33:59 +0800
Subject: [PATCH] ---

---
 insertdata/insertDataToEs.go |   19 ++++---------------
 1 files changed, 4 insertions(+), 15 deletions(-)

diff --git a/insertdata/insertDataToEs.go b/insertdata/insertDataToEs.go
index 57f4e07..6f42c9a 100644
--- a/insertdata/insertDataToEs.go
+++ b/insertdata/insertDataToEs.go
@@ -165,20 +165,7 @@
 	videoPersonUrl = "http://" + localConfig1.AlarmIp + ":" + strconv.Itoa(int(localConfig1.AlarmPort)) + "/" + EsInfo.EsIndex.VideoPersons.IndexName + "/" + EsInfo.EsIndex.VideoPersons.IndexType
 	personAction = "http://" + localConfig1.AlarmIp + ":" + strconv.Itoa(int(localConfig1.AlarmPort)) + "/" + EsInfo.EsIndex.Personaction.IndexName + "/" + EsInfo.EsIndex.Personaction.IndexType
 	InsertFace(msg, "")
-	// 濡傛灉鏍囩涓惈鏈夋寔缁椂闂撮娆℃姤璀︾殑timeLabel鐨勮瘽鍒欎笉闇�瑕佽繃浜轰綋杩借釜锛屼笉鐒跺氨娌$殑鎻掑叆浜�
-	fk := ruleserver.TrackOrNot(msg.RuleResult)
-	if fk {
-		InsertYolo(msg, "")
-		//if msg.Cid == "61de081a-7ed9-4970-8432-41d642c35456" {
-		//	logger.Warn("鎹曟崏188鎽勫儚鏈虹殑鎸佺画鏃堕棿浠诲姟.....")
-		//	os.Exit(1)
-		//}
-	} else {
-		flag := ruleserver.BodyIsSame(msg.SdkMessage)
-		if !flag {
-			InsertYolo(msg, "")
-		}
-	}
+	InsertYolo(msg, "")
 }
 
 // 寰�es涓彃鍏ヤ汉鑴告暟鎹�
@@ -405,6 +392,7 @@
 					// 瑁呴厤鐩爣淇℃伅鏁版嵁
 					for _,target := range yoloResult.Location  {
 						// 鍘婚噸娣诲姞
+						logger.Info("瑁呴厤鍓嶇殑鍘熷鏁版嵁鏄細",target)
 						var flag = true
 						for _,selectTarget := range targetInfos  {
 							if strconv.FormatUint(target.TargetId, 10) == selectTarget.TargetId {
@@ -475,8 +463,9 @@
 			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()

--
Gitblit v1.8.0