From aba6f4d4c086e2978757e62eb9e7db8889afc835 Mon Sep 17 00:00:00 2001
From: panlei <2799247126@qq.com>
Date: 星期一, 29 七月 2019 17:16:30 +0800
Subject: [PATCH] 测试比对分值返回
---
labelFilter/readyDataForLabel.go | 22 +++++++++++++++-------
1 files changed, 15 insertions(+), 7 deletions(-)
diff --git a/labelFilter/readyDataForLabel.go b/labelFilter/readyDataForLabel.go
index a645b5b..613f407 100644
--- a/labelFilter/readyDataForLabel.go
+++ b/labelFilter/readyDataForLabel.go
@@ -11,11 +11,12 @@
CameraName string
CameraAddr string
TaskId string
- Persons []ruleserver.Arg
- DefenceLevel string
+ Time string
+ Persons []ruleserver.FaceResult
+ DefenceLevel []int32
}
-
-func (label *Label)DataFormatToLabel(result ruleserver.ResultMsg) Label {
+// 鎶婃暟鎹閰嶅埌label
+func (label *Label)DataFormatToLabel(result ruleserver.ResultMsg) {
label.CameraId = result.Cid
camera, err := cache.GetCameraById(result.Cid)
if err != nil {
@@ -24,7 +25,14 @@
label.CameraName = camera.Name
label.CameraAddr = camera.Addr
label.TaskId = result.Tasklab.Taskid
- label.Persons = result.RuleResult["face"].([]ruleserver.Arg)
- //labelData.DefenceLevel = result.
- return Label{}
+ 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.FaceResult) {
+ label.DefenceLevel = append(label.DefenceLevel,yoloGroup.AlarmLevel)
+ }
+ Judge(label,result)
}
+
+// 浠庣紦瀛樹腑鏌ュ嚭鎵�鏈夌殑瑙勫垯鏁版嵁
--
Gitblit v1.8.0