From de102062b29cff395b1abe1605198bf8bfdc0cea Mon Sep 17 00:00:00 2001
From: panlei <2799247126@qq.com>
Date: 星期二, 06 八月 2019 19:32:10 +0800
Subject: [PATCH] ---
---
main.go | 9 +++++----
1 files changed, 5 insertions(+), 4 deletions(-)
diff --git a/main.go b/main.go
index 1277c84..cf13082 100644
--- a/main.go
+++ b/main.go
@@ -5,6 +5,7 @@
"basic.com/pubsub/protomsg.git"
"basic.com/valib/deliver.git"
"ruleprocess/insertdata"
+ "ruleprocess/labelFilter"
"ruleprocess/util"
//"bufio"
@@ -71,14 +72,14 @@
arg := ruleserver.SdkDatas{}
//paramFormat(msg, &arg)
m := paramFormat(msg, &arg)
- logger.Info("瑙ｆ瀽鍑烘潵鐨勬暟鎹細", arg)
+ // 杩涜瑙勫垯澶勭悊鍒ゆ柇(鎵撲笂瑙勫垯鐨勬爣绛�)
ruleserver.Judge(&arg,&m) // 鎶妔dkMessage浼犺繘鍘伙紝鏂逛究缂撳瓨鏁版嵁鏃舵嫾鍑轰竴涓猺esultMag
// 鎶奱rg閲岀殑鎵撶殑鏍囩鎷垮嚭鏉ョ粰m鍐嶅皝瑁呬竴灞�
resultMsg := ruleserver.ResultMsg{SdkMessage: &m, RuleResult: arg.RuleResult}
// 灏嗘墦瀹屾爣绛剧殑鏁版嵁鎻掑叆鍒癊S
insertdata.InsertToEs(resultMsg)
//浜嬩欢鎺ㄩ��
-
+ labelFilter.Judge(resultMsg)
}
}
}
@@ -111,7 +112,7 @@
}
// 鍏堣繘琛屼竴涓嬭拷韪�
- ruleserver.FaceIsSame(&m)
+ //ruleserver.FaceIsSame(&m)
args.CameraId = m.Cid
args.TaskId = m.Tasklab.Taskid
// 鎶婂浘鐗囩殑浜岃繘鍒惰В鍘嬬缉杩涜鐢绘鍦ㄥ帇缂╁洖鍘�
@@ -187,7 +188,7 @@
logger.Info("瑙ｆ瀽FACE sdk鏁版嵁鏃跺嚭鐜伴敊璇�", err)
continue
}
- logger.Info("--------------杩借釜涔嬪悗yolo鐨勪釜鏁帮細",len(faceParam.Faces))
+ logger.Info("--------------杩借釜涔嬪悗浜鸿劯鐨勪釜鏁帮細",len(faceParam.Faces))
for _, info := range faceParam.Faces {
//logger.Info("_______________________________________________绗竴娆＄湅鐩镐技鍊硷細",info.Pos.FAngle.Confidence*100)
photoMap := ruleserver.PhotoMap{Id:info.Pos.FaceID,Rects: rectFormat(info.Pos.RcFace), Score: float64(info.Pos.FAngle.Confidence*100), IsYolo:false,ThftRes:*(info.Result),Feature:info.Feats}
--
Gitblit v1.8.0