From d5ae54ceb9770963fbe88aa0170c08d0ae648b05 Mon Sep 17 00:00:00 2001
From: chenshijun <csj_sky@126.com>
Date: 星期一, 22 四月 2019 16:21:56 +0800
Subject: [PATCH] 删除一些不必要的代码，添加一些注释
---
QiaoJiaSystem/FaceSearchServer/FaceDBCompareServer.h | 25 +++++++++++++++++++++++--
1 files changed, 23 insertions(+), 2 deletions(-)
diff --git a/QiaoJiaSystem/FaceSearchServer/FaceDBCompareServer.h b/QiaoJiaSystem/FaceSearchServer/FaceDBCompareServer.h
index 0667bbf..6ec4fae 100644
--- a/QiaoJiaSystem/FaceSearchServer/FaceDBCompareServer.h
+++ b/QiaoJiaSystem/FaceSearchServer/FaceDBCompareServer.h
@@ -21,19 +21,35 @@
public:
FaceDBCompareServer();
+ /**
+ * 鏈湴搴撴瀯閫�
+ */
FaceDBCompareServer(SqliteFaceEncap *);
+ /***
+ * 鍚屾搴撴瀯閫�
+ */
FaceDBCompareServer(ErlangTool::ErlangDbTool *);
~FaceDBCompareServer();
virtual bool compare(std::thread::id key, AlarmData *alarmData, int topN);
+ /***
+ * @deprecated
+ * @param key
+ * @param alarmData
+ * @return
+ */
bool compare(std::thread::id key, AlarmData *alarmData);
FaceResults getTopResult(std::thread::id key);
private:
+ /**
+ * 鍔犺浇鐗瑰緛
+ * @param str_config
+ */
virtual void loadDBData(std::string str_config);
protected:
@@ -41,10 +57,14 @@
std::string m_tableName;
int fea_size;
+ // 淇濇姢鐖剁被鐨刣ataMap
RWLock m_rwLock;
std::mutex topResultMtx;
std::map<std::thread::id, FaceResults> topResult;
+
+ // 淇濇姢m_dbRWLocks
RWLock m_dbRWLocks_Lock;
+ // 淇濇姢 topResult
std::map<std::thread::id, RWLock> m_dbRWLocks;
ErlangTool::ErlangDbTool *m_erlangDbTool;
@@ -54,8 +74,9 @@
static bool getRet(std::string startTime, std::string endTime) {
auto crrentTime = AppUtil::getTimeSecString();
-
- if (crrentTime.compare(startTime) > 0 && (crrentTime.compare(endTime) < 0 || endTime == "0000-00-00 00:00:00")) {
+ // 鏍规嵁褰撳墠鏃堕棿鏄惁鍦ㄨ缃殑鏃堕棿鍐呮垨姘镐箙鐢熸晥
+ if (crrentTime.compare(startTime) > 0 && (crrentTime.compare(endTime) < 0
+ || endTime == "0000-00-00 00:00:00")) {
return true;
}
return false;
--
Gitblit v1.8.0