From cd60b7e3a0bbc09f4501f66260b5d961d58aaf49 Mon Sep 17 00:00:00 2001
From: panlei <2799247126@qq.com>
Date: 星期二, 17 十二月 2019 13:38:07 +0800
Subject: [PATCH] ---

---
 labelFilter/readyDataForLabel.go |   18 +++++++++---------
 1 files changed, 9 insertions(+), 9 deletions(-)

diff --git a/labelFilter/readyDataForLabel.go b/labelFilter/readyDataForLabel.go
index 6262f51..045f0d8 100644
--- a/labelFilter/readyDataForLabel.go
+++ b/labelFilter/readyDataForLabel.go
@@ -28,8 +28,8 @@
 			}
 		}
 	}
-	if flag1{
-		logger.Info("---------------鏍囩杩囨护鍣ㄨ祴鍊�")
+	if flag1{ // 鏈夊彲鎺ㄩ�佺殑鏁版嵁
+		//logger.Info("---------------鏍囩杩囨护鍣ㄨ祴鍊�")
 		label.CameraId = result.Cid
 		camera, err := cache.GetCameraById(result.Cid)
 		if err != nil {
@@ -43,15 +43,15 @@
 		for key,value := range result.RuleResult {
 			if value != nil && len(value.([]structure.Result)) > 0{
 				for _,res := range value.([]structure.Result) {
-					label.DefenceLevel = append(label.DefenceLevel,res.AlarmLevel)
-					if key == "face" {
-						label.Persons = append(label.Persons,res)
+					if res.Others.TimeLabel == "01" || res.Others.TimeLabel == "10" {
+						label.DefenceLevel = append(label.DefenceLevel,res.AlarmLevel)
+						if key == "face" {
+							label.Persons = append(label.Persons,res)
+						}
 					}
 				}
 			}
 		}
-		logger.Info("------------鏍囩杩囨护鍣ㄨ祴鍊煎畬姣�")
+		//logger.Info("------------鏍囩杩囨护鍣ㄨ祴鍊煎畬姣�")
 	}
-}
-
-// 浠庣紦瀛樹腑鏌ュ嚭鎵�鏈夌殑瑙勫垯鏁版嵁
+}
\ No newline at end of file

--
Gitblit v1.8.0