From 2b2576642ae036b1930c1abbb628626e7fc500f5 Mon Sep 17 00:00:00 2001
From: panlei <2799247126@qq.com>
Date: 星期四, 07 十一月 2019 17:57:37 +0800
Subject: [PATCH] ---
---
labelFilter/readyDataForLabel.go | 58 ++++++++++++++++++++++++++++++++++++++++------------------
1 files changed, 40 insertions(+), 18 deletions(-)
diff --git a/labelFilter/readyDataForLabel.go b/labelFilter/readyDataForLabel.go
index b0b7143..28b5233 100644
--- a/labelFilter/readyDataForLabel.go
+++ b/labelFilter/readyDataForLabel.go
@@ -1,9 +1,10 @@
package labelFilter
import (
- "ruleprocess/cache"
"ruleprocess/logger"
- "ruleprocess/ruleserver"
+ "ruleprocess/cache"
+ "ruleprocess/structure"
+ "time"
)
type Label struct {
@@ -12,26 +13,47 @@
CameraAddr string
TaskId string
Time string
- Persons []ruleserver.FaceResult
+ Persons []structure.FaceResult
DefenceLevel []int32
}
// 鎶婃暟鎹閰嶅埌label
-func (label *Label)DataFormatToLabel(result ruleserver.ResultMsg) {
- 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("鏌ヨ鎽勫儚鏈轰俊鎭嚭閿�")
+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) { // 寰楁湁浜鸿劯鎴栬�厃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
+ }
}
- 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 flag || (result.RuleResult["face"] != nil && len(result.RuleResult["face"].([]structure.FaceResult)) > 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.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)
+ }
+ }
+ logger.Info("------------鏍囩杩囨护鍣ㄨ祴鍊煎畬姣�")
}
}
}
--
Gitblit v1.8.0