From 50817c434e2a713cc045d0066d81fb421467651f Mon Sep 17 00:00:00 2001
From: panlei <2799247126@qq.com>
Date: 星期二, 06 八月 2019 20:03:09 +0800
Subject: [PATCH] ---
---
main.go | 26 +++++++++-----------------
1 files changed, 9 insertions(+), 17 deletions(-)
diff --git a/main.go b/main.go
index b1dc371..48edb76 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,13 +72,14 @@
arg := ruleserver.SdkDatas{}
//paramFormat(msg, &arg)
m := paramFormat(msg, &arg)
- logger.Info("瑙ｆ瀽鍑烘潵鐨勬暟鎹細", arg)
+ // 杩涜瑙勫垯澶勭悊鍒ゆ柇(鎵撲笂瑙勫垯鐨勬爣绛�)
ruleserver.Judge(&arg,&m) // 鎶妔dkMessage浼犺繘鍘伙紝鏂逛究缂撳瓨鏁版嵁鏃舵嫾鍑轰竴涓猺esultMag
// 鎶奱rg閲岀殑鎵撶殑鏍囩鎷垮嚭鏉ョ粰m鍐嶅皝瑁呬竴灞�
- resultMag := ruleserver.ResultMsg{SdkMessage: &m, RuleResult: arg.RuleResult}
- //logger.Info("鎵撳畬鏍囩鍚庣殑缁撴灉锛�",resultMag)
+ resultMsg := ruleserver.ResultMsg{SdkMessage: &m, RuleResult: arg.RuleResult}
// 灏嗘墦瀹屾爣绛剧殑鏁版嵁鎻掑叆鍒癊S
- insertdata.InsertToEs(resultMag)
+ insertdata.InsertToEs(resultMsg)
+ //浜嬩欢鎺ㄩ��
+ labelFilter.Judge(resultMsg)
}
}
}
@@ -109,17 +111,7 @@
panic("瑙ｆ瀽msg鏃跺嚭鐜伴敊璇�")
}
- // 鎵�201鐨勪汉鑴告暟鎹�
- //for _, sdkinfo := range m.Tasklab.Sdkinfos {
- // if sdkinfo.Sdktype == "FaceDetect" && m.Cid == "e7e3f5b0-d0ef-40af-a9c9-eefd736937bf"{ // 浜鸿劯妫�娴�
- // if len(sdkinfo.Sdkdata) > 1 {
- // logger.Debug("鏈�201鐨勪汉鑴告暟鎹簡")
- // } else {
- // logger.Debug("娌℃湁201鐨勪汉鑴告暟鎹�")
- // }
- // }
- //}
-
+ logger.Info("鎺ュ埌鏁版嵁锛屾憚鍍忔満涓猴細",m.Cid)
// 鍏堣繘琛屼竴涓嬭拷韪�
//ruleserver.FaceIsSame(&m)
args.CameraId = m.Cid
@@ -197,10 +189,10 @@
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{Rects: rectFormat(info.Pos.RcFace), Score: float64(info.Pos.FAngle.Confidence*100), IsYolo:false,ThftRes:*(info.Result),Feature:info.Feats}
+ 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}
arg.Photo = append(arg.Photo, photoMap)
}
args.Sdkdata = append(args.Sdkdata,&arg)
--
Gitblit v1.8.0