From 9c1dbad3fcf04c4c797437531031cfaefe28bfcf Mon Sep 17 00:00:00 2001
From: chenshijun <chenshijun@aiotlink.com>
Date: 星期二, 19 三月 2019 18:05:57 +0800
Subject: [PATCH] Merge branch 'yw.1.2.fixbug' of ssh://192.168.1.226:29418/development/c++ into yw.1.2.fixbug
---
QiaoJiaSystem/DataManagerServer/http_configserver.cpp | 5 +-
QiaoJiaSystem/FaceSearchServer/FaceDBCompareServer.cpp | 64 ++++++++++++++++++++-----------
QiaoJiaSystem/LocalDBTool/SqliteToolkit.hpp | 2
QiaoJiaSystem/FaceSearchServer/AlarmServer.hpp | 2 +
4 files changed, 46 insertions(+), 27 deletions(-)
diff --git a/QiaoJiaSystem/DataManagerServer/http_configserver.cpp b/QiaoJiaSystem/DataManagerServer/http_configserver.cpp
index 68b7b32..3e580ce 100644
--- a/QiaoJiaSystem/DataManagerServer/http_configserver.cpp
+++ b/QiaoJiaSystem/DataManagerServer/http_configserver.cpp
@@ -2273,7 +2273,7 @@
fieldValues.insert(std::make_pair("uuid", strUUID));
fieldValues.insert(std::make_pair("idCard", idcard));
- m_SqliteFaceEncap.updateFace(TableName, addFaceData, fieldValues);
+ ret_addPerson = m_SqliteFaceEncap.updateFace(TableName, addFaceData, fieldValues);
}
} else {
@@ -3410,8 +3410,7 @@
result["imgUrl"] = strImgUrl;
if (value.isMember("id")) {
db_c.updateCamDevSnapshotbyID(value["id"].asString().c_str(), QString::fromStdString(strImgUrl));
- }
- else{
+ } else {
db_c.updateCamDevSnapshot(QString::fromStdString(rtsp_ip), QString::fromStdString(strImgUrl));
}
diff --git a/QiaoJiaSystem/FaceSearchServer/AlarmServer.hpp b/QiaoJiaSystem/FaceSearchServer/AlarmServer.hpp
index 811f78a..f0ebed9 100644
--- a/QiaoJiaSystem/FaceSearchServer/AlarmServer.hpp
+++ b/QiaoJiaSystem/FaceSearchServer/AlarmServer.hpp
@@ -34,6 +34,8 @@
std::vector<std::vector<unsigned char>> features;
std::string faceUrl;
std::string idcard;
+ std::string enabled;
+ std::string monLevel;
};
/***
diff --git a/QiaoJiaSystem/FaceSearchServer/FaceDBCompareServer.cpp b/QiaoJiaSystem/FaceSearchServer/FaceDBCompareServer.cpp
index 4cab786..368c9c2 100644
--- a/QiaoJiaSystem/FaceSearchServer/FaceDBCompareServer.cpp
+++ b/QiaoJiaSystem/FaceSearchServer/FaceDBCompareServer.cpp
@@ -191,44 +191,62 @@
m_rwLock.wrlock();
if (t_json["\"syncTpye\""].type() == Json::nullValue) {
+ // 鍚屾搴�/鐗瑰緛鏄痓ase64
+// #todo sqlite search data from file
auto str_tab = t_json["\"tableName\""].asString();
m_tableName = str_tab.substr(1, str_tab.length() - 2);//.append("_fea");
- string tet = "./syncDBClient ";
- string str_json = writer.write(t_json);
- tet.append("\"" + str_json.substr(0, str_json.length() - 1) + "\" ");
- INFO(tet);
- system(tet.c_str());
+
+
+// string tet = "./syncDBClient ";
+// string str_json = writer.write(t_json);
+// tet.append("\"" + str_json.substr(0, str_json.length() - 1) + "\" ");
+// INFO(tet);
+// system(tet.c_str());
dataMap.clear();
try {
// init
- BISTL::BiMapFeaData biMapFeaData(m_tableName);
- auto mymap = biMapFeaData.getMap();
- auto size = mymap->size();
- //#todo
- for (auto it = mymap->begin(); it != mymap->end(); it++) {
- string str_uuid(it->second.m_id.data());
- string ft(it->second.m_feature.data());
- string imgUrl(it->second.m_imgUrl.data());
- string strIdCard(it->second.m_idcard.data());
+// BISTL::BiMapFeaData biMapFeaData(m_tableName);
+// auto mymap = biMapFeaData.getMap();
+
+ auto mymap = m_erlangDbTool->loadFaceFeaData(m_tableName);
+ for (auto &item : mymap) {
+ auto &it = item.second;
string str2;
- str2 = base64.Decode(ft.data(), ft.length());
+ str2 = base64.Decode(it.feature.data(), it.feature.size());
std::vector<unsigned char> t_fea;
t_fea.resize(str2.size());
memcpy(t_fea.data(), str2.data(), str2.size());
- auto &test = dataMap[str_uuid];
- test.uuid = str_uuid;
+ auto &test = dataMap[it.id];
+ test.uuid = it.id;
test.features.push_back(t_fea);
- test.faceUrl = imgUrl;
- test.idcard = strIdCard;
+ test.faceUrl = it.img;
+ test.idcard = it.idcard;
+ test.enabled = it.enable;
+ test.monLevel = it.monLevel;
}
+// //#todo
+// for (auto it = mymap->begin(); it != mymap->end(); it++) {
+// string str_uuid(it->second.m_id.data());
+// string ft(it->second.m_feature.data());
+// string imgUrl(it->second.m_imgUrl.data());
+// string strIdCard(it->second.m_idcard.data());
+// string str2;
+// str2 = base64.Decode(ft.data(), ft.length());
+// std::vector<unsigned char> t_fea;
+// t_fea.resize(str2.size());
+// memcpy(t_fea.data(), str2.data(), str2.size());
+// auto &test = dataMap[str_uuid];
+// test.uuid = str_uuid;
+// test.features.push_back(t_fea);
+// test.faceUrl = imgUrl;
+// test.idcard = strIdCard;
+// }
} catch (const std::exception &e) {
printf("Exception:%s\n", e.what());
- BISTL::shared_memory_object::remove(m_tableName.c_str());
+// BISTL::shared_memory_object::remove(m_tableName.c_str());
}
- BISTL::shared_memory_object::remove(m_tableName.c_str());
- appPref.setIntData(m_tableName, 1);
- DBG(m_tableName << " size is " << dataMap.size());
+// BISTL::shared_memory_object::remove(m_tableName.c_str());
} else {
//#todo get sqlite3 data
m_tableName = t_json["tableName"].asCString();
diff --git a/QiaoJiaSystem/LocalDBTool/SqliteToolkit.hpp b/QiaoJiaSystem/LocalDBTool/SqliteToolkit.hpp
index ff1bb42..9c893a7 100644
--- a/QiaoJiaSystem/LocalDBTool/SqliteToolkit.hpp
+++ b/QiaoJiaSystem/LocalDBTool/SqliteToolkit.hpp
@@ -286,7 +286,7 @@
sql.append("create_by varchar(255) DEFAULT NULL,");
sql.append("del_flag INTEGER DEFAULT 0,");
sql.append("monitorLevel varchar(255) DEFAULT 0,");
- sql.append(" enabled varchar(255) DEFAULT 1");
+ sql.append("enabled varchar(255) DEFAULT 1");
sql.append(");");
// 浜鸿劯鐗瑰緛琛�
sql.append("CREATE TABLE " + g_dbName + ".'");
--
Gitblit v1.8.0