From de5c02a1437ab0032912270674ef079486537323 Mon Sep 17 00:00:00 2001
From: panlei <2799247126@qq.com>
Date: 星期五, 01 十一月 2019 18:12:18 +0800
Subject: [PATCH] ---
---
labelFilter/readyDataForLabel.go | 23 ++++++++++++-----------
1 files changed, 12 insertions(+), 11 deletions(-)
diff --git a/labelFilter/readyDataForLabel.go b/labelFilter/readyDataForLabel.go
index 67888f0..6d94756 100644
--- a/labelFilter/readyDataForLabel.go
+++ b/labelFilter/readyDataForLabel.go
@@ -1,9 +1,9 @@
package labelFilter
import (
- "ruleprocess/cache"
"basic.com/valib/logger.git"
- "ruleprocess/ruleserver"
+ "ruleprocess/cache"
+ "ruleprocess/structure"
"time"
)
@@ -13,14 +13,14 @@
CameraAddr string
TaskId string
Time string
- Persons []ruleserver.FaceResult
+ Persons []structure.FaceResult
DefenceLevel []int32
}
// 鎶婃暟鎹閰嶅埌label
-func (label *Label)DataFormatToLabel(result ruleserver.ResultMsg) {
- 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) {
+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) {
logger.Info("---------------鏍囩杩囨护鍣ㄨ祴鍊�")
label.CameraId = result.Cid
camera, err := cache.GetCameraById(result.Cid)
@@ -31,14 +31,15 @@
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"].([]ruleserver.FaceResult)) > 0 {
- for _,faceGroup := range result.RuleResult["face"].([]ruleserver.FaceResult) {
+ 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"].([]ruleserver.Result)) > 0 {
- for _,yoloGroup := range result.RuleResult["yolo"].([]ruleserver.Result) {
+ 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)
}
}
--
Gitblit v1.8.0