From 0eb4d66555bcd02fbe566d136b904f904dd2a45b Mon Sep 17 00:00:00 2001
From: panlei <2799247126@qq.com>
Date: 星期一, 19 八月 2019 18:35:26 +0800
Subject: [PATCH] 提交中间件
---
labelFilter/readyDataForLabel.go | 20 ++++++++++----------
1 files changed, 10 insertions(+), 10 deletions(-)
diff --git a/labelFilter/readyDataForLabel.go b/labelFilter/readyDataForLabel.go
index 2650c4e..ff4fef3 100644
--- a/labelFilter/readyDataForLabel.go
+++ b/labelFilter/readyDataForLabel.go
@@ -3,7 +3,7 @@
import (
"ruleprocess/cache"
"ruleprocess/logger"
- "ruleprocess/ruleserver"
+ "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,14 @@
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