From 122f28e8be52678a2d3c6cc2d8d545a33cbf1957 Mon Sep 17 00:00:00 2001
From: panlei <2799247126@qq.com>
Date: 星期一, 05 八月 2019 14:36:54 +0800
Subject: [PATCH] ---
---
labelFilter/readyDataForLabel.go | 30 ++++++++++++++++--------------
labelFilter/ruleForLabel.go | 5 +++++
2 files changed, 21 insertions(+), 14 deletions(-)
diff --git a/labelFilter/readyDataForLabel.go b/labelFilter/readyDataForLabel.go
index 2ba5e07..b0b7143 100644
--- a/labelFilter/readyDataForLabel.go
+++ b/labelFilter/readyDataForLabel.go
@@ -17,20 +17,22 @@
}
// 鎶婃暟鎹閰嶅埌label
func (label *Label)DataFormatToLabel(result ruleserver.ResultMsg) {
- label.CameraId = result.Cid
- camera, err := cache.GetCameraById(result.Cid)
- if err != nil {
- logger.Error("鏌ヨ鎽勫儚鏈轰俊鎭嚭閿�")
- }
- label.CameraName = camera.Name
- label.CameraAddr = camera.Addr
- label.TaskId = result.Tasklab.Taskid
- 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["face"] != nil && len(result.RuleResult["face"].([]ruleserver.FaceResult)) > 0) || (result.RuleResult["yolo"] != nil && len(result.RuleResult["yolo"].([]ruleserver.Result)) > 0) {
+ label.CameraId = result.Cid
+ camera, err := cache.GetCameraById(result.Cid)
+ if err != nil {
+ logger.Error("鏌ヨ鎽勫儚鏈轰俊鎭嚭閿�")
+ }
+ label.CameraName = camera.Name
+ label.CameraAddr = camera.Addr
+ label.TaskId = result.Tasklab.Taskid
+ 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)
+ }
}
}
diff --git a/labelFilter/ruleForLabel.go b/labelFilter/ruleForLabel.go
index 1f25cb7..e4146a5 100644
--- a/labelFilter/ruleForLabel.go
+++ b/labelFilter/ruleForLabel.go
@@ -15,6 +15,11 @@
// 瑁呴厤鎴愯嚜宸卞彲浠ヨ瘑鍒殑鏁版嵁
label := new(Label)
label.DataFormatToLabel(result)
+ logger.Info("label鐨勪俊鎭細",label.CameraName,label.DefenceLevel,label.Time)
+ if label.CameraName == "" {
+ logger.Error("鏃犳晥鏁版嵁锛岀洿鎺ヨ繑鍥�")
+ return
+ }
//鎷垮埌鎵�鏈夎鍒欑粍
var api dbapi.EventPushApi
b,allRules := api.FindAllDetails()
--
Gitblit v1.8.0