From c5c07245f834b813913ec45cf24f40e48acfd25c Mon Sep 17 00:00:00 2001
From: panlei <2799247126@qq.com>
Date: 星期二, 06 八月 2019 19:53:31 +0800
Subject: [PATCH] ---
---
labelFilter/readyDataForLabel.go | 34 +++++++++++++++++++++++-----------
1 files changed, 23 insertions(+), 11 deletions(-)
diff --git a/labelFilter/readyDataForLabel.go b/labelFilter/readyDataForLabel.go
index 143302f..1e04cb7 100644
--- a/labelFilter/readyDataForLabel.go
+++ b/labelFilter/readyDataForLabel.go
@@ -4,6 +4,7 @@
"ruleprocess/cache"
"ruleprocess/logger"
"ruleprocess/ruleserver"
+ "time"
)
type Label struct {
@@ -12,21 +13,32 @@
CameraAddr string
TaskId string
Time string
- Persons []ruleserver.Arg
- DefenceLevel string
+ Persons []ruleserver.FaceResult
+ DefenceLevel []int32
}
// 鎶婃暟鎹閰嶅埌label
func (label *Label)DataFormatToLabel(result ruleserver.ResultMsg) {
- label.CameraId = result.Cid
- camera, err := cache.GetCameraById(result.Cid)
- if err != nil {
- logger.Error("鏌ヨ鎽勫儚鏈轰俊鎭嚭閿�")
+ 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
+ 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 _,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)
+ }
}
- label.CameraName = camera.Name
- label.CameraAddr = camera.Addr
- label.TaskId = result.Tasklab.Taskid
- label.Persons = result.RuleResult["face"].([]ruleserver.Arg)
- //labelData.DefenceLevel = result.
}
// 浠庣紦瀛樹腑鏌ュ嚭鎵�鏈夌殑瑙勫垯鏁版嵁
--
Gitblit v1.8.0