From 0d08415bcbc5d1b260861365f26b0532771da2c5 Mon Sep 17 00:00:00 2001
From: panlei <2799247126@qq.com>
Date: 星期日, 29 九月 2019 14:10:41 +0800
Subject: [PATCH] 人脸也画规则框

---
 labelFilter/readyDataForLabel.go |   17 +++++++++++------
 1 files changed, 11 insertions(+), 6 deletions(-)

diff --git a/labelFilter/readyDataForLabel.go b/labelFilter/readyDataForLabel.go
index 1e04cb7..67888f0 100644
--- a/labelFilter/readyDataForLabel.go
+++ b/labelFilter/readyDataForLabel.go
@@ -2,7 +2,7 @@
 
 import (
 	"ruleprocess/cache"
-	"ruleprocess/logger"
+	"basic.com/valib/logger.git"
 	"ruleprocess/ruleserver"
 	"time"
 )
@@ -31,13 +31,18 @@
 		label.CameraAddr = camera.Addr
 		label.TaskId = result.Tasklab.Taskid
 		label.Time = time.Now().Format("2006-01-02 15:04:05")
-		for _,faceGroup := range result.RuleResult["face"].([]ruleserver.FaceResult) {
-			label.Persons = append(label.Persons,faceGroup)
-			label.DefenceLevel = append(label.DefenceLevel,faceGroup.AlarmLevel)
+		if result.RuleResult["face"] != nil && len(result.RuleResult["face"].([]ruleserver.FaceResult)) > 0 {
+			for _,faceGroup := range result.RuleResult["face"].([]ruleserver.FaceResult) {
+				label.Persons = append(label.Persons,faceGroup)
+				label.DefenceLevel = append(label.DefenceLevel,faceGroup.AlarmLevel)
+			}
 		}
-		for _,yoloGroup := range result.RuleResult["yolo"].([]ruleserver.Result) {
-			label.DefenceLevel = append(label.DefenceLevel,yoloGroup.AlarmLevel)
+		if result.RuleResult["yolo"] != nil && len(result.RuleResult["yolo"].([]ruleserver.Result)) > 0 {
+			for _,yoloGroup := range result.RuleResult["yolo"].([]ruleserver.Result) {
+				label.DefenceLevel = append(label.DefenceLevel,yoloGroup.AlarmLevel)
+			}
 		}
+		logger.Info("------------鏍囩杩囨护鍣ㄨ祴鍊煎畬姣�")
 	}
 }
 

--
Gitblit v1.8.0