From a89689b92b07cf1830ad8b46521eda92e7f927c0 Mon Sep 17 00:00:00 2001
From: pansen <pansen626@sina.com>
Date: 星期三, 30 一月 2019 16:37:45 +0800
Subject: [PATCH] 修改bug
---
QiaoJiaSystem/FaceSearchServer/FaceFeatureSearchServerI.cpp | 15 ++++++++++++---
1 files changed, 12 insertions(+), 3 deletions(-)
diff --git a/QiaoJiaSystem/FaceSearchServer/FaceFeatureSearchServerI.cpp b/QiaoJiaSystem/FaceSearchServer/FaceFeatureSearchServerI.cpp
index c8e3613..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();
@@ -107,8 +107,13 @@
//#todo 闈炲悓姝ュ簱鏄惁闇�瑕佹瘮杈冿紵
DBG("m_faceFCMAP compare start " << it.first);
+// 瀵规瘮鍒嗘暟,鎽勫儚鏈哄垎鏁板拰甯冩帶搴撳垎鏁帮紝璋佷綆鎸夎皝?鏆傛椂涓嶅仛
+// if(){
+// }
+// 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);
@@ -202,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 濡傛灉鍚敤鍒欐甯稿垽鏂�,鏈竷鎺у垯璁や负鏄湭鐭ワ紵
@@ -247,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();
@@ -266,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