From 0d72f83126cef0e93bf7147698c7a85a2c0c1b41 Mon Sep 17 00:00:00 2001
From: panlei <2799247126@qq.com>
Date: 星期四, 21 十一月 2019 15:30:10 +0800
Subject: [PATCH] ---
---
labelFilter/readyDataForLabel.go | 39 +++++++++++++++++++++++----------------
1 files changed, 23 insertions(+), 16 deletions(-)
diff --git a/labelFilter/readyDataForLabel.go b/labelFilter/readyDataForLabel.go
index 6d94756..2ebad26 100644
--- a/labelFilter/readyDataForLabel.go
+++ b/labelFilter/readyDataForLabel.go
@@ -13,14 +13,22 @@
CameraAddr string
TaskId string
Time string
- Persons []structure.FaceResult
+ Persons []structure.Result
DefenceLevel []int32
}
// 鎶婃暟鎹閰嶅埌label
func (label *Label)DataFormatToLabel(result structure.ResultMsg) {
- logger.Debug("face缁撴灉锛�",result.RuleResult["face"] != nil && len(result.RuleResult["face"].([]structure.FaceResult)) > 0)
- logger.Debug("yolo缁撴灉锛�",result.RuleResult["yolo"] != nil && len(result.RuleResult["yolo"].([]structure.Result)) > 0)
- if (result.RuleResult["face"] != nil && len(result.RuleResult["face"].([]structure.FaceResult)) > 0) || (result.RuleResult["yolo"] != nil && len(result.RuleResult["yolo"].([]structure.Result)) > 0) {
+ flag1 := false
+ for _,value := range result.RuleResult {
+ if value != nil && len(value.([]structure.Result)) > 0{
+ for _,res := range value.([]structure.Result) {
+ if res.Others.TimeLabel == "01" || res.Others.TimeLabel == "10" {
+ flag1 = true
+ }
+ }
+ }
+ }
+ if flag1{ // 鏈夊彲鎺ㄩ�佺殑鏁版嵁
logger.Info("---------------鏍囩杩囨护鍣ㄨ祴鍊�")
label.CameraId = result.Cid
camera, err := cache.GetCameraById(result.Cid)
@@ -31,20 +39,19 @@
label.CameraAddr = camera.Addr
label.TaskId = result.Tasklab.Taskid
label.Time = time.Now().Format("2006-01-02 15:04:05")
- if result.RuleResult["face"] != nil && len(result.RuleResult["face"].([]structure.FaceResult)) > 0 {
- for _,faceGroup := range result.RuleResult["face"].([]structure.FaceResult) {
- label.Persons = append(label.Persons,faceGroup)
- label.DefenceLevel = append(label.DefenceLevel,faceGroup.AlarmLevel)
- }
- }
- if result.RuleResult["yolo"] != nil && len(result.RuleResult["yolo"].([]structure.Result)) > 0 {
- for _,yoloGroup := range result.RuleResult["yolo"].([]structure.Result) {
- label.DefenceLevel = append(label.DefenceLevel,yoloGroup.AlarmLevel)
+ for key,value := range result.RuleResult {
+ if value != nil && len(value.([]structure.Result)) > 0{
+ for _,res := range value.([]structure.Result) {
+ 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("------------鏍囩杩囨护鍣ㄨ祴鍊煎畬姣�")
}
-}
-
-// 浠庣紦瀛樹腑鏌ュ嚭鎵�鏈夌殑瑙勫垯鏁版嵁
+}
\ No newline at end of file
--
Gitblit v1.8.0