From 67c46dd4aa3741fae854bc8eddf1111b90fbd091 Mon Sep 17 00:00:00 2001
From: panlei <2799247126@qq.com>
Date: 星期四, 08 八月 2019 19:56:33 +0800
Subject: [PATCH] 测试比对进程
---
ruleserver/readyDataForRule.go | 14 ++++++++------
1 files changed, 8 insertions(+), 6 deletions(-)
diff --git a/ruleserver/readyDataForRule.go b/ruleserver/readyDataForRule.go
index 9a1cb7c..2d6ac4b 100644
--- a/ruleserver/readyDataForRule.go
+++ b/ruleserver/readyDataForRule.go
@@ -175,15 +175,17 @@
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)
+ 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)
@@ -201,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)
}
--
Gitblit v1.8.0