From 8dfeb7278fe9de02f1086da8a3c31922b03421f5 Mon Sep 17 00:00:00 2001 From: panlei <2799247126@qq.com> Date: 星期五, 16 八月 2019 14:20:03 +0800 Subject: [PATCH] 比对182切66 --- ruleserver/readyDataForRule.go | 41 ++++++++++++++++++++++------------------- 1 files changed, 22 insertions(+), 19 deletions(-) diff --git a/ruleserver/readyDataForRule.go b/ruleserver/readyDataForRule.go index cdeeb8b..c21e0df 100644 --- a/ruleserver/readyDataForRule.go +++ b/ruleserver/readyDataForRule.go @@ -50,10 +50,10 @@ } logger.Debug("鏈満淇℃伅鍜宻erver淇℃伅锛�", localConfig, serverIp, serverPort) bigCache.Init(dbTablePersons, serverIp, serverPort, localConfig.ServerId) - //sock, err = req.NewSocket(); - //if err != nil { - // logger.Error("鍒涘缓璇锋眰socket澶辫触: %s", err.Error()) - //} + sock, err = req.NewSocket(); + if err != nil { + logger.Error("鍒涘缓璇锋眰socket澶辫触: %s", err.Error()) + } } type BaseInfo struct { @@ -81,7 +81,7 @@ taskGroup = task } } - logger.Debug("褰撳墠鏁版嵁甯ц鍖归厤鐨勮鍒欑粍锛�-------------------------") + logger.Debug("褰撳墠鏁版嵁甯ц鍖归厤鐨勮鍒欑粍锛�-------------------------","鎽勫儚鏈篿d:",cameraId,"浠诲姟id",taskId) for _,ruleGroup := range taskGroup.GroupRules{ logger.Info(ruleGroup.GroupText) } @@ -167,22 +167,25 @@ // 缁欑洰鏍囧~鍏卨iker func (arg *Arg) fillLiker(tableId []string, compareThreshold float32) { - bytes := bigCache.GetComparePersonBaseInfo(tableId, arg.Feature, compareThreshold) - //comArg := &protomsg.CompareArgs{ - // TableIds:tableId, - // FaceFeature:arg.Feature, - // CompareThreshold:compareThreshold, - //} - //bytes := Push("tcp://192.168.1.182:40010",comArg,sock) - var m map[string]float32 - err1 := json.Unmarshal(bytes, &m) + //bytes := bigCache.GetComparePersonBaseInfo(tableId, arg.Feature, compareThreshold) + comArg := &protomsg.CompareArgs{ + TableIds:tableId, + FaceFeature:arg.Feature, + CompareThreshold:compareThreshold, + Source:false, + } + bytes := Push("tcp://192.168.1.66:40010",comArg,sock) + var scResult protomsg.SdkCompareResult + err1 := proto.Unmarshal(bytes, &scResult) if err1 != nil { logger.Error("getBaseInfo瑙e帇閿欒", err1) } //logger.Info("----------------------------------------map鏄�", m) ids := []string{} - for key, _ := range m { - ids = append(ids, key) + m := make(map[string]*protomsg.SdkCompareEach) + for _,key := range scResult.CompareResult { + ids = append(ids, key.Id) + m[key.Id] = key } logger.Info("------------------------------------------------------------------------------------------------------------------------") //logger.Info("=====================浜哄憳id鐨勯泦鍚堜负锛�",ids) @@ -200,8 +203,8 @@ if err != nil || len(table) == 0 { logger.Error("鏍规嵁id鏌ヨ搴曞簱淇℃伅鍑洪敊锛�", err, "--杩斿洖鍊奸暱搴︿负锛�", len(table)) } - logger.Debug("鐪嬬湅杩欎釜base鐨勫姣斿�兼槸澶氬皯锛�", Decimal(m[baseinfo.Id] * 100)) - base := BaseInfo{TableId: baseinfo.TableId, TableName: table[0].TableName, BwType: table[0].BwType, CompareScore: Decimal(m[baseinfo.Id] * 100), PersonId: baseinfo.Id, PersonName: baseinfo.PersonName, PersonPicUrl: baseinfo.PersonPicUrl, PhoneNum: baseinfo.PhoneNum, Sex: baseinfo.Sex, IdCard: baseinfo.IdCard, MonitorLevel: baseinfo.MonitorLevel, Content: baseinfo.Reserved} + logger.Debug("鐪嬬湅杩欎釜base鐨勫姣斿�兼槸澶氬皯锛�", Decimal(m[baseinfo.Id].CompareScore)) + base := BaseInfo{TableId: baseinfo.TableId, TableName: table[0].TableName, BwType: table[0].BwType, CompareScore: Decimal(m[baseinfo.Id].CompareScore), PersonId: baseinfo.Id, PersonName: baseinfo.PersonName, PersonPicUrl: baseinfo.PersonPicUrl, PhoneNum: baseinfo.PhoneNum, Sex: baseinfo.Sex, IdCard: baseinfo.IdCard, MonitorLevel: baseinfo.MonitorLevel, Content: baseinfo.Reserved} //os.Exit(1) arg.Liker = append(arg.Liker, &base) } @@ -213,7 +216,7 @@ func Compare(args *SdkDatas, groupRule *protomsg.GroupRule) { compareFlag := 0 var tableIds []string - var threshold float32 = 0.5 // 榛樿闃堝�间负0.5 + var threshold float32 = 50 // 榛樿闃堝�间负50 // 鐪嬬湅鏄惁鏈夊彧閰嶄汉鑴告瘮瀵圭畻娉曚絾娌℃湁閰嶅姣斿簱鐨勮鍒欙紝濡傛灉鏈夛紝鍒欐瘮瀵瑰璞′负鍏ㄩ儴搴曞簱 for j := 0; j < len(groupRule.Rules); j++ { if groupRule.Rules[j].SdkId == "812b674b-2375-4589-919a-5c1c3278a972" { // 閰嶄簡浜鸿劯姣斿 -- Gitblit v1.8.0