From 61a8166ed71b881863de8c62e45ae3e7803a455e Mon Sep 17 00:00:00 2001
From: pansen <pansen626@sina.com>
Date: 星期一, 28 一月 2019 20:21:20 +0800
Subject: [PATCH] 添加布控等级。对比暂未添加本字段。
---
QiaoJiaSystem/FaceSearchServer/FaceFeatureSearchServerI.cpp | 11 ++++++++---
1 files changed, 8 insertions(+), 3 deletions(-)
diff --git a/QiaoJiaSystem/FaceSearchServer/FaceFeatureSearchServerI.cpp b/QiaoJiaSystem/FaceSearchServer/FaceFeatureSearchServerI.cpp
index ddcd788..b1f942d 100644
--- a/QiaoJiaSystem/FaceSearchServer/FaceFeatureSearchServerI.cpp
+++ b/QiaoJiaSystem/FaceSearchServer/FaceFeatureSearchServerI.cpp
@@ -68,7 +68,7 @@
::FaceSearch::FaceResults
FaceFeatureSearchServerI::faceSearchTopN(const ::FaceSearch::Data &feature, const ::std::string &info_json,
::Ice::Int topN, ::Ice::Float score, const ::Ice::Current &) {
- ClockTimer clockTimer("faceSearchTopN " + to_string(score) + " :");
+ ClockTimer clockTimer("faceSearchTopN ");
INFO("faceSearchTopN start");
// #鑾峰彇绾跨▼id鍘绘壘璧勬簮鍙ユ焺
thread::id key = std::this_thread::get_id();
@@ -112,7 +112,8 @@
// }
// score
// 瀵规瘮鍑芥暟
- t_FaceFC->compare(key, &featureData, topN,);
+ float t_score = atoi(t_tableInfo.cmpThreshold.c_str()) / 100;
+ t_FaceFC->compare(key, &featureData, topN, t_score);
DBG("m_faceFCMAP compare end " << it.first);
// 鑾峰彇瀵规瘮缁撴灉
auto t_results = t_FaceFC->getTopResult(key);
@@ -206,6 +207,8 @@
value["likePer"] = item.confidence > 0 ? item.confidence : 0.0;
value["personPicUrl"] = item.imgUrl.size() > 0 ? item.imgUrl : "";//diku tupian
+
+// string strC = item.idcard+ item.
value["idcard"] = item.idcard.size() > 0 ? item.idcard : "";//diku tupian
//濡傛灉 alarmRet 涓嶄负绌烘妸 浠栫殑鍊� 鏀惧叆 personIsHub,鍚﹀垯涓�4
// #TODO 濡傛灉鍚敤鍒欐甯稿垽鏂�,鏈竷鎺у垯璁や负鏄湭鐭ワ紵
@@ -251,7 +254,7 @@
std::thread thd(dataUpdate, faceFea);
thd.detach();
}
- auto typeInfoCache = faceFea->m_erlangDbTool.findAllTypeInfo();
+// auto typeInfoCache = faceFea->m_erlangDbTool.findAllTypeInfo();
faceFea->m_tableType.clear();
string str_config = faceFea->m_erlangDbTool.getConfigJsonString();
@@ -270,6 +273,8 @@
// tabInfo.bwType = item.second.bwType = typeInfoCache.find(item.first)->second.bwType;
tabInfo.bwType = item.second.bwType;//= typeInfoCache.find(item.first)->second.bwType;
tabInfo.createBy = item.second.create_by;
+ tabInfo.enabled = item.second.enabled;
+ tabInfo.cmpThreshold = item.second.cmpThreshold;
if ((tabInfo.tableName.find("lt_") == 0) && (tabInfo.createBy != appConfig.getStringProperty("erlNode"))) {
continue;
--
Gitblit v1.8.0