From 7cb7884e4bd7f27d811474d4e95f29eebac845cd Mon Sep 17 00:00:00 2001 From: panlei <2799247126@qq.com> Date: 星期二, 12 十一月 2019 17:56:54 +0800 Subject: [PATCH] 保存一下个体静止算法 --- labelFilter/readyDataForLabel.go | 12 ++++++------ 1 files changed, 6 insertions(+), 6 deletions(-) diff --git a/labelFilter/readyDataForLabel.go b/labelFilter/readyDataForLabel.go index 5c792e1..8aa4406 100644 --- a/labelFilter/readyDataForLabel.go +++ b/labelFilter/readyDataForLabel.go @@ -13,14 +13,14 @@ CameraAddr string TaskId string Time string - Persons []structure.FaceResult + Persons []structure.TargetResult DefenceLevel []int32 } // 鎶婃暟鎹閰嶅埌label func (label *Label)DataFormatToLabel(result structure.ResultMsg) { - logger.Debug("face缁撴灉锛�",result.RuleResult["face"] != nil && len(result.RuleResult["face"].([]structure.FaceResult)) > 0) + logger.Debug("face缁撴灉锛�",result.RuleResult["face"] != nil && len(result.RuleResult["face"].([]structure.TargetResult)) > 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) { // 寰楁湁浜鸿劯鎴栬�厃olo瑙勫垯鎵嶅彲浠� + if (result.RuleResult["face"] != nil && len(result.RuleResult["face"].([]structure.TargetResult)) > 0) || (result.RuleResult["yolo"] != nil && len(result.RuleResult["yolo"].([]structure.Result)) > 0) { // 寰楁湁浜鸿劯鎴栬�厃olo瑙勫垯鎵嶅彲浠� // 鍏堝垽鏂竴涓嬫暟鎹甫鐨勮鍒欐爣绛炬槸鍚︽湁鎶ヨ鐨勫彲浠ユ帹閫佺殑 flag := false @@ -30,7 +30,7 @@ flag = true } } - if flag || (result.RuleResult["face"] != nil && len(result.RuleResult["face"].([]structure.FaceResult)) > 0){ + if flag || (result.RuleResult["face"] != nil && len(result.RuleResult["face"].([]structure.TargetResult)) > 0){ logger.Info("---------------鏍囩杩囨护鍣ㄨ祴鍊�") label.CameraId = result.Cid camera, err := cache.GetCameraById(result.Cid) @@ -41,8 +41,8 @@ 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"].([]structure.FaceResult)) > 0 { - for _,faceGroup := range result.RuleResult["face"].([]structure.FaceResult) { + if result.RuleResult["face"] != nil && len(result.RuleResult["face"].([]structure.TargetResult)) > 0 { + for _,faceGroup := range result.RuleResult["face"].([]structure.TargetResult) { label.Persons = append(label.Persons,faceGroup) label.DefenceLevel = append(label.DefenceLevel,faceGroup.AlarmLevel) } -- Gitblit v1.8.0