From 087bf92d707de1a838451719da505f69b6934087 Mon Sep 17 00:00:00 2001
From: panlei <2799247126@qq.com>
Date: 星期五, 29 十一月 2019 18:03:27 +0800
Subject: [PATCH] 换log
---
labelFilter/readyDataForLabel.go | 57 +++++++++++++++++++++++++++++++++++++++++----------------
1 files changed, 41 insertions(+), 16 deletions(-)
diff --git a/labelFilter/readyDataForLabel.go b/labelFilter/readyDataForLabel.go
index 143302f..1024602 100644
--- a/labelFilter/readyDataForLabel.go
+++ b/labelFilter/readyDataForLabel.go
@@ -1,9 +1,10 @@
package labelFilter
import (
+ logger "github.com/jeanphorn/log4go"
"ruleprocess/cache"
- "ruleprocess/logger"
- "ruleprocess/ruleserver"
+ "ruleprocess/structure"
+ "time"
)
type Label struct {
@@ -12,21 +13,45 @@
CameraAddr string
TaskId string
Time string
- Persons []ruleserver.Arg
- DefenceLevel string
+ Persons []structure.Result
+ 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("鏌ヨ鎽勫儚鏈轰俊鎭嚭閿�")
+func (label *Label)DataFormatToLabel(result structure.ResultMsg) {
+ flag1 := false
+ for _,value := range result.RuleResult {
+ if value != nil && len(value.([]structure.Result)) > 0{
+ for _,res := range value.([]structure.Result) {
+ if res.Others.TimeLabel == "01" || res.Others.TimeLabel == "10" {
+ flag1 = true
+ }
+ }
+ }
}
- label.CameraName = camera.Name
- label.CameraAddr = camera.Addr
- label.TaskId = result.Tasklab.Taskid
- label.Persons = result.RuleResult["face"].([]ruleserver.Arg)
- //labelData.DefenceLevel = result.
-}
+ if flag1{ // 鏈夊彲鎺ㄩ�佺殑鏁版嵁
+ 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 key,value := range result.RuleResult {
+ if value != nil && len(value.([]structure.Result)) > 0{
+ for _,res := range value.([]structure.Result) {
+ if res.Others.TimeLabel == "01" || res.Others.TimeLabel == "10" {
+ label.DefenceLevel = append(label.DefenceLevel,res.AlarmLevel)
+ if key == "face" {
+ label.Persons = append(label.Persons,res)
+ }
+ }
+ }
+ }
+ }
+ logger.Info("------------鏍囩杩囨护鍣ㄨ祴鍊煎畬姣�")
+ }
+}
\ No newline at end of file
--
Gitblit v1.8.0