From 7c2fd421ce84a7ef8b9d611b84fa9e2f4ba3efaf Mon Sep 17 00:00:00 2001
From: panlei <2799247126@qq.com>
Date: 星期四, 08 八月 2019 19:42:56 +0800
Subject: [PATCH] 测试比对进程
---
ruleserver/readyDataForRule.go | 15 ++++++++-------
1 files changed, 8 insertions(+), 7 deletions(-)
diff --git a/ruleserver/readyDataForRule.go b/ruleserver/readyDataForRule.go
index 28c2fd4..4ef37a0 100644
--- a/ruleserver/readyDataForRule.go
+++ b/ruleserver/readyDataForRule.go
@@ -167,22 +167,23 @@
// 缁欑洰鏍囧～鍏卨iker
func (arg *Arg) fillLiker(tableId []string, compareThreshold float32) {
- // bytes := bigCache.GetComparePersonBaseInfo(tableId, arg.Feature, compareThreshold)
+ //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.182:40010",comArg,sock)
- var m map[string]float32
- err1 := json.Unmarshal(bytes, &m)
+ var scResult protomsg.SdkCompareResult
+ err1 := proto.Unmarshal(bytes, &scResult)
if err1 != nil {
logger.Error("getBaseInfo瑙ｅ帇閿欒", err1)
}
//logger.Info("----------------------------------------map鏄�", m)
ids := []string{}
- for key, _ := range m {
- ids = append(ids, key)
+ for _,key := range scResult.CompareResult {
+ ids = append(ids, key.Id)
}
logger.Info("------------------------------------------------------------------------------------------------------------------------")
//logger.Info("=====================浜哄憳id鐨勯泦鍚堜负锛�",ids)
@@ -301,7 +302,7 @@
a.filterData = append(a.filterData, &arg1)
}
}
- logger.Info("鍖哄煙鏄細",areaPoints,"鍖哄煙鍐呯洰鏍囨暟閲忎负锛�",a.targetNum,"---",len(a.filterData))
+ //logger.Info("鍖哄煙鏄細",areaPoints,"鍖哄煙鍐呯洰鏍囨暟閲忎负锛�",a.targetNum,"---",len(a.filterData))
a.time = time.Unix(time.Now().Unix(), 0).String()[11:16]
a.keepRight = arg.KeepRight
a.isStatic = arg.IsStatic
@@ -357,6 +358,6 @@
logger.Error("鎺ユ敹鍝嶅簲澶辫触: %s", err.Error())
os.Exit(1)
}
- logger.Debug("鏁版嵁鎺ㄩ�佹垚鍔燂紒鏀跺埌鍝嶅簲",string(msg))
+ logger.Debug("鏁版嵁鎺ㄩ�佹垚鍔燂紒鏀跺埌鍝嶅簲,鏁版嵁闀垮害涓猴細",len(msg))
return msg
}
--
Gitblit v1.8.0