From 07fb2c16c75734d8c127585353249f529ea1262c Mon Sep 17 00:00:00 2001
From: pans <pansen626@sina.com>
Date: 星期四, 14 三月 2019 17:39:25 +0800
Subject: [PATCH] Merge branch 'yw.1.2.fixbug' of ssh://192.168.1.226:29418/development/c++ into yw.1.2.fixbug
---
/dev/null | 4 ----
QiaoJiaSystem/FaceSearchServer/main.cpp | 5 ++++-
QiaoJiaSystem/DataManagerServer/http_configserver.cpp | 4 +++-
QiaoJiaSystem/FaceSearchServer/CMakeLists.txt | 1 -
QiaoJiaSystem/FaceSearchServer/AlarmServer.hpp | 23 +++++++++++++++++++++++
QiaoJiaSystem/FaceSearchServer/FaceDBCompareServer.h | 3 +--
6 files changed, 31 insertions(+), 9 deletions(-)
diff --git a/QiaoJiaSystem/DataManagerServer/http_configserver.cpp b/QiaoJiaSystem/DataManagerServer/http_configserver.cpp
index 7c46296..5193036 100644
--- a/QiaoJiaSystem/DataManagerServer/http_configserver.cpp
+++ b/QiaoJiaSystem/DataManagerServer/http_configserver.cpp
@@ -1015,7 +1015,9 @@
if (count > 0) {
for (auto rule:ruleMap) {
- elem["nSdkTypes"].append(rule.second.nSdkType);
+ if (rule.second.nIsRun == 1) {
+ elem["nSdkTypes"].append(rule.second.nSdkType);
+ }
}
}
// Record_Cam_Sdk rec_sdk = db_c.searchCamSdkTableByCamId(iter->str_cam_dev_id);
diff --git a/QiaoJiaSystem/FaceSearchServer/AlarmServer.hpp b/QiaoJiaSystem/FaceSearchServer/AlarmServer.hpp
index 1fe1b9c..811f78a 100644
--- a/QiaoJiaSystem/FaceSearchServer/AlarmServer.hpp
+++ b/QiaoJiaSystem/FaceSearchServer/AlarmServer.hpp
@@ -1,4 +1,5 @@
//
+// 瀵规瘮鎶ヨ鐨勫熀绫�
// Created by ps on 2/26/18.
//
@@ -13,6 +14,9 @@
#include <basic/util/thread/MultiThread.h>
#include <basic/util/BASE64/Base64.h>
+/***
+ * 闇�瑕佸姣旂殑涓�鏉¤褰�
+ */
struct AlarmData {
int num;
std::string tableName;
@@ -20,6 +24,9 @@
float threshold;
};
+/***
+ * 鏁版嵁搴撲腑鏌ヨ鐨勪竴鏉¤褰�
+ */
struct FeatureData {
long face_id;
std::string uuid;
@@ -29,6 +36,11 @@
std::string idcard;
};
+/***
+ * 瀛楃涓叉牴鎹鍙峰垎鍓插苟杩斿洖鏁版嵁
+ * @param str_list
+ * @return
+ */
static std::vector<std::string> AlarmServerPropertyAnalyseByComma(std::string str_list) {
std::vector<std::string> result;
char *property_list = const_cast<char *>(str_list.c_str());
@@ -60,6 +72,9 @@
CPU_Number = 1
};
+/***
+ * 鎶ヨ鏈嶅姟鍩虹被
+ */
class AlarmServer {
public:
@@ -77,11 +92,19 @@
dataRemoveBuffer.clear();
}
+ /***
+ * 鍒濆鍖栨椂浣跨敤绾跨▼鍔犺浇鏁版嵁搴�
+ * @param str_config
+ */
void initDB(std::string str_config) {
std::thread thd(loadDBCahce, this, str_config);
thd.detach();
}
+ /***
+ * 绉婚櫎鏁版嵁
+ * @param key
+ */
void removeData(std::string key) {
std::lock_guard<std::mutex> guard(dataRemoveBufferMtx);
dataRemoveBuffer.insert(key);
diff --git a/QiaoJiaSystem/FaceSearchServer/CMakeLists.txt b/QiaoJiaSystem/FaceSearchServer/CMakeLists.txt
index 26f313c..5860601 100644
--- a/QiaoJiaSystem/FaceSearchServer/CMakeLists.txt
+++ b/QiaoJiaSystem/FaceSearchServer/CMakeLists.txt
@@ -89,7 +89,6 @@
add_executable(${PROJECT_NAME}
main.cpp
rpc/FaceSearchServer.cpp
- FaceSearchServerResources.cpp
FaceFeatureSearchServerI.cpp
FaceFeatureSearchServerI.h
CasiaFaceWrapper/CasiaFaceWrapperN.cpp
diff --git a/QiaoJiaSystem/FaceSearchServer/FaceDBCompareServer.h b/QiaoJiaSystem/FaceSearchServer/FaceDBCompareServer.h
index 7940970..da4bb96 100644
--- a/QiaoJiaSystem/FaceSearchServer/FaceDBCompareServer.h
+++ b/QiaoJiaSystem/FaceSearchServer/FaceDBCompareServer.h
@@ -54,11 +54,10 @@
static bool getRet(std::string startTime, std::string endTime) {
auto crrentTime = AppUtil::getTimeSecString();
- if (crrentTime.compare(startTime) > 0 && crrentTime.compare(endTime) < 0) {
+ if (crrentTime.compare(startTime) > 0 && (crrentTime.compare(endTime) < 0 || endTime == "0000-00-00 00:00:00")) {
return true;
}
return false;
-
}
#endif //COMPARETEST_FACEDBCOMPARESERVER_H
diff --git a/QiaoJiaSystem/FaceSearchServer/FaceSearchServerResources.cpp b/QiaoJiaSystem/FaceSearchServer/FaceSearchServerResources.cpp
deleted file mode 100644
index b82cdeb..0000000
--- a/QiaoJiaSystem/FaceSearchServer/FaceSearchServerResources.cpp
+++ /dev/null
@@ -1,4 +0,0 @@
-//
-// Created by pans on 4/27/18.
-//
-
diff --git a/QiaoJiaSystem/FaceSearchServer/main.cpp b/QiaoJiaSystem/FaceSearchServer/main.cpp
index fa14be5..08ca7be 100644
--- a/QiaoJiaSystem/FaceSearchServer/main.cpp
+++ b/QiaoJiaSystem/FaceSearchServer/main.cpp
@@ -1,4 +1,5 @@
//
+// 浜鸿劯瀵规瘮涓昏繘绋嬪叆鍙�
// Created by pans on 4/27/18.
//
#include <iostream>
@@ -14,7 +15,7 @@
using namespace std;
int main(int argc, char **argv) {
- std::cout<<__DATE__<<" "<<__TIME__<<std::endl;
+ std::cout << __DATE__ << " " << __TIME__ << std::endl;
SAVE_APP_ARGS;
ENABLEGLOG(GET_STR_CONFIG("logPath").c_str());
auto ich = Ice::initialize(argc, argv);
@@ -26,6 +27,8 @@
// appPref.setStringData("ipAdd", "192.168.1.185");
// appPref.setIntData("ipPort", 9200);
+
+ //璁剧疆es涓婁紶ip鍜岀鍙�
appPref.setStringData("ipAdd", appConfig.getStringProperty("ES_IP"));
appPref.setIntData("ipPort", appConfig.getIntProperty("ES_PORT"));
--
Gitblit v1.8.0