From fe090f3f0d4d135622d631f1798b9414d6bd81cf Mon Sep 17 00:00:00 2001
From: panlei <2799247126@qq.com>
Date: 星期三, 20 十一月 2019 16:35:50 +0800
Subject: [PATCH] 事件推送改造
---
labelFilter/readyDataForLabel.go | 58 +++++++++++++++++++++++++++-------------------------------
1 files changed, 27 insertions(+), 31 deletions(-)
diff --git a/labelFilter/readyDataForLabel.go b/labelFilter/readyDataForLabel.go
index 6dd9034..6262f51 100644
--- a/labelFilter/readyDataForLabel.go
+++ b/labelFilter/readyDataForLabel.go
@@ -18,43 +18,39 @@
}
// 鎶婃暟鎹閰嶅埌label
func (label *Label)DataFormatToLabel(result structure.ResultMsg) {
- if (result.RuleResult["face"] != nil && len(result.RuleResult["face"].([]structure.Result)) > 0) ||
- (result.RuleResult["yolo"] != nil && len(result.RuleResult["yolo"].([]structure.Result)) > 0) ||
- (result.RuleResult["target"] != nil && len(result.RuleResult["target"].([]structure.Result)) > 0){ // 寰楁湁浜鸿劯鎴栬�厃olo瑙勫垯鎵嶅彲浠�
-
- // 鍏堝垽鏂竴涓嬫暟鎹甫鐨勮鍒欐爣绛炬槸鍚︽湁鎶ヨ鐨勫彲浠ユ帹閫佺殑
- flag := false
- for _, res := range result.RuleResult["yolo"].([]structure.Result) {
- //logger.Info("瀹氭椂鍣ㄦ墦鐨勬暟瀛楁爣绛撅細",res.Others.TimeLabel)
- if res.Others.TimeLabel == "01" || res.Others.TimeLabel == "10" {
- flag = true
- }
- }
- if flag || (result.RuleResult["face"] != nil && len(result.RuleResult["face"].([]structure.Result)) > 0){
- logger.Info("---------------鏍囩杩囨护鍣ㄨ祴鍊�")
- 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
- label.Time = time.Now().Format("2006-01-02 15:04:05")
- if result.RuleResult["face"] != nil && len(result.RuleResult["face"].([]structure.Result)) > 0 {
- for _,faceGroup := range result.RuleResult["face"].([]structure.Result) {
- label.Persons = append(label.Persons,faceGroup)
- label.DefenceLevel = append(label.DefenceLevel,faceGroup.AlarmLevel)
+ 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 result.RuleResult["yolo"] != nil && len(result.RuleResult["yolo"].([]structure.Result)) > 0 {
+ }
+ }
+ if flag1{
+ logger.Info("---------------鏍囩杩囨护鍣ㄨ祴鍊�")
+ 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
+ label.Time = time.Now().Format("2006-01-02 15:04:05")
- 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) {
+ label.DefenceLevel = append(label.DefenceLevel,res.AlarmLevel)
+ if key == "face" {
+ label.Persons = append(label.Persons,res)
+ }
}
}
- logger.Info("------------鏍囩杩囨护鍣ㄨ祴鍊煎畬姣�")
}
+ logger.Info("------------鏍囩杩囨护鍣ㄨ祴鍊煎畬姣�")
}
}
--
Gitblit v1.8.0