From ee4eeaa38e11d3cef51c9bb093da69547bd18c4d Mon Sep 17 00:00:00 2001
From: panlei <2799247126@qq.com>
Date: 星期四, 08 八月 2019 10:33:18 +0800
Subject: [PATCH] result结果+=
---
labelFilter/readyDataForLabel.go | 20 +++++++++++++++-----
1 files changed, 15 insertions(+), 5 deletions(-)
diff --git a/labelFilter/readyDataForLabel.go b/labelFilter/readyDataForLabel.go
index b0b7143..2650c4e 100644
--- a/labelFilter/readyDataForLabel.go
+++ b/labelFilter/readyDataForLabel.go
@@ -4,6 +4,7 @@
"ruleprocess/cache"
"ruleprocess/logger"
"ruleprocess/ruleserver"
+ "time"
)
type Label struct {
@@ -17,7 +18,10 @@
}
// 鎶婃暟鎹閰嶅埌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) {
+ logger.Info("---------------鏍囩杩囨护鍣ㄨ祴鍊�")
label.CameraId = result.Cid
camera, err := cache.GetCameraById(result.Cid)
if err != nil {
@@ -26,13 +30,19 @@
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)
+ 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) {
+ 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 result.RuleResult["yolo"] != nil && len(result.RuleResult["yolo"].([]ruleserver.Result)) > 0 {
+ for _,yoloGroup := range result.RuleResult["yolo"].([]ruleserver.Result) {
+ label.DefenceLevel = append(label.DefenceLevel,yoloGroup.AlarmLevel)
+ }
}
+ logger.Info("------------鏍囩杩囨护鍣ㄨ祴鍊煎畬姣�")
}
}
--
Gitblit v1.8.0