From bcf4b98ea7f6a37a0664ff1fe3c97fd8cdc0e699 Mon Sep 17 00:00:00 2001
From: panlei <2799247126@qq.com>
Date: 星期四, 05 十二月 2019 17:31:48 +0800
Subject: [PATCH] 缩短睡眠时间
---
labelFilter/readyDataForLabel.go | 61 ++++++++++++++++++++----------
1 files changed, 40 insertions(+), 21 deletions(-)
diff --git a/labelFilter/readyDataForLabel.go b/labelFilter/readyDataForLabel.go
index 613f407..e102273 100644
--- a/labelFilter/readyDataForLabel.go
+++ b/labelFilter/readyDataForLabel.go
@@ -1,9 +1,10 @@
package labelFilter
import (
+ logger "github.com/alecthomas/log4go"
"ruleprocess/cache"
- "ruleprocess/logger"
- "ruleprocess/ruleserver"
+ "ruleprocess/structure"
+ "time"
)
type Label struct {
@@ -12,27 +13,45 @@
CameraAddr string
TaskId string
Time string
- Persons []ruleserver.FaceResult
+ 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
- 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)
-}
+ 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