From 6351ababead17e120b146a4b3f37c4e49ca64268 Mon Sep 17 00:00:00 2001
From: panlei <2799247126@qq.com>
Date: 星期二, 17 九月 2019 10:53:29 +0800
Subject: [PATCH] 给定时器加锁
---
labelFilter/readyDataForLabel.go | 17 ++++++++++++-----
1 files changed, 12 insertions(+), 5 deletions(-)
diff --git a/labelFilter/readyDataForLabel.go b/labelFilter/readyDataForLabel.go
index 5fe348c..2650c4e 100644
--- a/labelFilter/readyDataForLabel.go
+++ b/labelFilter/readyDataForLabel.go
@@ -18,6 +18,8 @@
}
// 鎶婃暟鎹閰嶅埌label
func (label *Label)DataFormatToLabel(result ruleserver.ResultMsg) {
+ logger.Debug("face缁撴灉锛�",result.RuleResult["face"] != nil && len(result.RuleResult["face"].([]ruleserver.FaceResult)) > 0)
+ logger.Debug("yolo缁撴灉锛�",result.RuleResult["yolo"] != nil && len(result.RuleResult["yolo"].([]ruleserver.Result)) > 0)
if (result.RuleResult["face"] != nil && len(result.RuleResult["face"].([]ruleserver.FaceResult)) > 0) || (result.RuleResult["yolo"] != nil && len(result.RuleResult["yolo"].([]ruleserver.Result)) > 0) {
logger.Info("---------------鏍囩杩囨护鍣ㄨ祴鍊�")
label.CameraId = result.Cid
@@ -29,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