From 3e253c674f3ebe0da414d34751c5c259a378375a Mon Sep 17 00:00:00 2001
From: pansen <pansen626@sina.com>
Date: 星期五, 25 一月 2019 20:58:55 +0800
Subject: [PATCH] 添加布控模块功能
---
QiaoJiaSystem/build/DataWebServer | 0
QiaoJiaSystem/DataManagerServer/http_configserver.cpp | 382 +++++++++++++++++++++++++++++++++++------------
syncDBTool/ErlangDbTool.h | 2
QiaoJiaSystem/LocalDBTool/SqliteFaceEncap.cpp | 8 +
QiaoJiaSystem/DataManagerServer/http_configserver.h | 18 +
QiaoJiaSystem/DataManagerServer/.http_configserver.cpp.swp | 0
QiaoJiaSystem/LocalDBTool/SqliteToolkit.hpp | 5
QiaoJiaSystem/build/config.json | 48 +++---
syncDBTool/ErlangDbTool.cpp | 8
QiaoJiaSystem/DataManagerServer/main.cpp | 1
10 files changed, 346 insertions(+), 126 deletions(-)
diff --git a/QiaoJiaSystem/DataManagerServer/.http_configserver.cpp.swp b/QiaoJiaSystem/DataManagerServer/.http_configserver.cpp.swp
new file mode 100644
index 0000000..390c8ba
--- /dev/null
+++ b/QiaoJiaSystem/DataManagerServer/.http_configserver.cpp.swp
Binary files differ
diff --git a/QiaoJiaSystem/DataManagerServer/http_configserver.cpp b/QiaoJiaSystem/DataManagerServer/http_configserver.cpp
index c2021bc..7adc23f 100644
--- a/QiaoJiaSystem/DataManagerServer/http_configserver.cpp
+++ b/QiaoJiaSystem/DataManagerServer/http_configserver.cpp
@@ -51,6 +51,7 @@
if (erlangDbTool->initErlang() == 1) {
erlangDbTool->startNodeDb(erlFatherNode);
} else {
+ erlangDbTool->startNodeDb(erlFatherNode);
DBG("not is startNodeDb");
}
}
@@ -175,6 +176,9 @@
_HttpSrvRetRecieve.setInfo("^/addPerson$", "POST", std::bind(&devHttpServer_c::addPerson, this,
std::placeholders::_1, std::placeholders::_2,
std::placeholders::_3, std::placeholders::_4));
+ _HttpSrvRetRecieve.setInfo("^/updatePerson$", "POST", std::bind(&devHttpServer_c::updatePerson, this,
+ std::placeholders::_1, std::placeholders::_2,
+ std::placeholders::_3, std::placeholders::_4));
_HttpSrvRetRecieve.setInfo("^/addPersons$", "POST", std::bind(&devHttpServer_c::addPersons, this,
std::placeholders::_1, std::placeholders::_2,
@@ -1874,6 +1878,7 @@
fieldValues.insert(std::make_pair("bwType", BwType));
fieldValues.insert(std::make_pair("startTime", StartTime));
fieldValues.insert(std::make_pair("endTime", EndTime));
+// #todo
fieldValues.insert(std::make_pair("create_by", "who"));
fieldValues.insert(std::make_pair("uploadFlag", UploadFlag));
@@ -1991,10 +1996,11 @@
subJson.append("\"bwType\":\"" + item.second.bwType + "\",");
//#todo modify
subJson.append("\"start_time\":\"" + item.second.startTime + "\",");
- subJson.append("\"end_time\":\"" + item.second.endTime + "\"");
+ subJson.append("\"end_time\":\"" + item.second.endTime + "\",");
- subJson.append("\"IsSync\":\"" + item.second.uploadFlag + "\"");
- subJson.append("\"threshold\":\"" + item.second.cmpThreshold + "\"");
+ subJson.append("\"IsSync\":\"" + item.second.uploadFlag + "\",");
+ subJson.append("\"threshold\":\"" + item.second.cmpThreshold + "\",");
+ subJson.append("\"create_by\":\"" + item.second.create_by + "\",");
subJson.append("\"enabled\":\"" + item.second.enabled + "\"");
subJson.append("},");
json.append(subJson);
@@ -2037,10 +2043,11 @@
subJson.append("\"tableType\":\"" + item.tableType + "\",");
subJson.append("\"bwType\":\"" + item.bwType + "\",");
subJson.append("\"start_time\":\"" + item.startTime + "\",");
- subJson.append("\"end_time\":\"" + item.endTime + "\"");
- subJson.append("\"IsSync\":\"" + item.uploadFlag + "\"");
- subJson.append("\"threshold\":\"" + item.cmpThreshold + "\"");
- subJson.append("\"enabled\":\"" + item.enabled + "\"");
+ subJson.append("\"end_time\":\"" + item.endTime + "\",");
+ subJson.append("\"IsSync\":\"" + item.uploadFlag + "\",");
+ subJson.append("\"threshold\":\"" + item.cmpThreshold + "\",");
+ subJson.append("\"create_by\":\"" + item.createBy + "\",");
+ subJson.append("\"enabled\":\"" + item.enabled + "\",");
subJson.append("},");
json.append(subJson);
}
@@ -2072,33 +2079,34 @@
if (reader.parse(content, value)) {
std::string TableName = value["TableName"].asString();
std::string img_url = value["img_url"].asString();
- auto tests = value["img_base64"].size();
- auto ret = value["img_base64"].isString();
-
std::string img_base64 = value["img_base64"].asString();
std::string idcard = value["idcard"].asString();
std::string strUUID = value["uuid"].asString();
- std::string UploadFlag = value["IsSync"].asString();
- cv::Mat image;
- if (img_url.size() > 0) {
+ std::string Enabled = value["enabled"].asString();
+ std::string TableType = value["TableType"].asString();
+ std::string SyncType = value["SyncType"].asString();
+ std::string TableId = value["TableId"].asString();
+ std::string BwType = value["BwType"].asString();
- std::string img_str = "http://";
- if (fdfsClient.fastFds != nullptr) {
- img_str.append(fdfsClient.fastFds->getIp() + "/").append(img_url);
- img_url.swap(img_str);
- }
-
- auto t_results = m_curlDownloadImg.download_jpeg(const_cast<char *>(img_url.c_str()));
- DBG(img_url << "t_results size is " << t_results.all << " : " << t_results.buffer.size());
- cvutil.buffer2CvMat(t_results.buffer, image);
- } else if (img_base64.size() > 0) {
- auto str_img = base64.Decode(img_base64.c_str(), img_base64.size());
- std::vector<unsigned char> buffer(str_img.size());
- memcpy(buffer.data(), str_img.data(), str_img.size());
- cvutil.buffer2CvMat(buffer, image);
-
+ std::string UploadFlag = "-1";
+ if (SyncType == "1") {
+ UploadFlag = erlangDbTool->findAllDatabase()[TableId].uploadFlag;
} else {
+ auto its = m_SqliteFaceEncap.getTableInfos();
+ for (auto &item : its) {
+ if (item.uuid == TableId) {
+ UploadFlag = item.uploadFlag;
+ break;
+ }
+ }
+ }
+
+ DBG("content: " << TableName << "," << img_url << "," << idcard << "," << strUUID << "," << UploadFlag << ","
+ << Enabled << "," << TableType << "," << SyncType << "," << TableId);
+ cv::Mat image;
+ getMat(img_url, img_base64, image);
+ if (image.empty()) {
response->write(SimpleWeb::StatusCode::server_error_not_implemented, "{\"error\":\"not found img\"}");
return "";
// return "{\"error\":\"not found img\"}";
@@ -2161,62 +2169,24 @@
// std::string uuid = "";
bool ret_addPerson = false;
- if (TableName.find("lt_") == 0) {
- FieldValues fieldValues;
- AddFaceData addFaceData;
- addFaceData.feature.resize(faceResults[0].feature.size());
- memcpy(addFaceData.feature.data(), faceResults[0].feature.data(), faceResults[0].feature.size());
-
- //#todo uuid have value is update
- if (strUUID.size() <= 0) {
- // get Person id
-
- strUUID = AppUtil::getPersonId(m_batch, m_SerialNumber);
- addFaceData.uuid = strUUID;
- addFaceData.faceUrl = img_url;
-
- fieldValues.insert(std::make_pair("uuid", strUUID));
- fieldValues.insert(std::make_pair("idCard", idcard));
- auto t_id = m_SqliteFaceEncap.addFace(TableName, addFaceData, fieldValues);
- ret_addPerson = t_id.size() > 0 ? true : false;
- } else {
- //#todo update table
- addFaceData.uuid = strUUID;
- addFaceData.faceUrl = img_url;
-
- fieldValues.insert(std::make_pair("uuid", strUUID));
- fieldValues.insert(std::make_pair("idCard", idcard));
- m_SqliteFaceEncap.updateFace(TableName, addFaceData, fieldValues);
- }
-
- } else {
- //#todo update data
- // get Person id
- strUUID = strUUID.size() > 0 ? strUUID : AppUtil::getPersonId(m_batch, m_SerialNumber);
- ret_addPerson = erlangDbTool->addPerson(strUUID, TableName, feature_base64, img_url, idcard);
- }
+ addPersonMToDB(TableName, img_url, SyncType, feature_base64, faceResults, idcard, strUUID, ret_addPerson);
if (ret_addPerson && strUUID.size() > 0) {
std::string str_result = std::string("{\"uuid\":").append(
"\"" + strUUID + "\",\"img_url\":\"" + img_url + "\"}");
// usleep(100);
erlangDbTool->sendMessage();
- //todo send person to backServer
if (UploadFlag == "1") {
// #todo db queue upload to server
+ if (BwType == "0") {
+ UploadPersonToUserCenter(img_url, idcard, strUUID, feature_base64);
+ } else {
+ //todo send person to backServer
+//#TODO 榛戝悕鍗曚笂浼�
+ }
- std::string str_serIp = GET_STR_CONFIG("mainServerIp");
- std::string str_serPort = GET_STR_CONFIG("mainServerPort");
-
-// string sendUrl = "192.168.1.203:3697/addPerson/uploadToTemporary";
- string sendUrl = str_serIp;
- sendUrl.append(":").append(str_serPort).append("/addPerson/uploadToTemporary");
-
- std::thread sendPerson(uploadPersonToServer, this, sendUrl, strUUID, img_url, idcard, feature_base64);
- sendPerson.detach();
}
-
return str_result;
} else {
std::string str_result = std::string("{\"error\":\"addPerson error\"}");
@@ -2228,6 +2198,244 @@
return "";
// return "{\"error\":\"浼犺緭閿欒锛岃妫�鏌ワ紒\"}";
}
+}
+
+std::string devHttpServer_c::updatePerson(std::string ip, unsigned int port, std::string content,
+ PResponse &response) {
+ DBG("ip:" << ip << "; port:" << port);
+// DBG("content: " << content);
+ if (erlangDbTool == nullptr) {
+ response->write(SimpleWeb::StatusCode::server_error_not_implemented, "{\"error\":\"鑺傜偣涓嶅瓨鍦╘"}");
+ return "";
+// return "{\"error\":\"erlang is null\"}";
+ }
+
+ Json::Reader reader;
+ Json::Value value;
+
+ if (reader.parse(content, value)) {
+ std::string TableName = value["TableName"].asString();
+ std::string img_url = value["img_url"].asString();
+ std::string img_base64 = value["img_base64"].asString();
+ std::string idcard = value["idcard"].asString();
+ std::string strUUID = value["uuid"].asString();
+
+ std::string Enabled = value["enabled"].asString();
+ std::string TableType = value["TableType"].asString();
+ std::string SyncType = value["SyncType"].asString();
+ std::string TableId = value["TableId"].asString();
+ std::string BwType = value["BwType"].asString();
+ std::string CreateBy = value["createBy"].asString();
+// std::string BwType = value["BwType"].asString();
+
+ DBG("content: " << TableName << "," << img_url << "," << idcard << "," << strUUID << ","
+ << Enabled << "," << TableType << "," << SyncType << "," << TableId);
+// cv::Mat image;
+// getMat(img_url, img_base64, image);
+// if (image.empty()) {
+// response->write(SimpleWeb::StatusCode::server_error_not_implemented, "{\"error\":\"not found img\"}");
+// return "";
+//// return "{\"error\":\"not found img\"}";
+// }
+//
+// thread::id pid = std::this_thread::get_id();
+// if (m_handleMap[pid] == nullptr) {
+// DBG("pid is " << pid);
+// m_handleMap[pid] = new CasiaFaceWrapperN;
+// }
+// CasiaFaceWrapperN *t_CasiaFaceWapper = m_handleMap[pid];
+//
+// std::string feature_base64;
+// FaceImageN faceImage{image.cols, image.rows, image.step, image.data};
+// auto faceResults = t_CasiaFaceWapper->extractFace(faceImage);
+//
+// if (faceResults.size() <= 0) {
+// response->write(SimpleWeb::StatusCode::server_error_not_implemented, "{\"error\":\"not found face\"}");
+// system("mkdir -p img");
+// string str_path = "./img/";
+// str_path.append(AppUtil::getTimeString() + ".jpg");
+// cv::imwrite(str_path, image);
+// return "";
+//// return "{\"error\":\"not found face\"}";
+// } else if (faceResults.size() > 1) {
+// response->write(SimpleWeb::StatusCode::server_error_not_implemented, "{\"error\":\" 浠呮敮鎸佸崟浜鸿劯鍥剧墖 \"}");
+// return "";
+// }
+//
+// for (auto &item : faceResults) {
+// //#todo 鍘婚噸
+//
+// feature_base64 = base64.Encode(item.feature.data(), item.feature.size());
+// int x = item.left;
+// int y = item.top;
+// int w = item.width;
+// int h = item.height;
+// cv::Rect t_rect = {x, y, w, h};
+// auto t_image = image(CvUtil::zoomRect(t_rect, 2, 2) & cv::Rect(0, 0, image.cols, image.rows)).clone();
+// std::vector<uchar> buffer;
+// cvutil.cvMat2Buffer(t_image, buffer);
+// img_url = "http://";
+// fdfsClient.rwLock.rdlock();
+// if (fdfsClient.fastFds != nullptr) {
+// img_url.append(fdfsClient.fastFds->getIp() + "/");
+// std::string t_strImg = "";
+// if (!fdfsClient.fastFds->uploadFile(buffer, t_strImg, "jpg")) {
+// img_url = "upload image fail";
+// } else {
+// img_url.append(t_strImg);
+// img_url.clear();
+// img_url = t_strImg;
+//// img_url.append("/").append(t_strImg);
+// }
+// }
+// fdfsClient.rwLock.unlock();
+// break;
+// }
+// auto size = feature_base64.size();
+// std::string uuid = "";
+ bool ret_addPerson = false;
+
+ FieldValues fieldValues;
+ AddFaceData addFaceData;
+ if (SyncType == "0") {
+// addFaceData.feature.resize(faceResults[0].feature.size());
+// memcpy(addFaceData.feature.data(), faceResults[0].feature.data(), faceResults[0].feature.size());
+
+ //#todo uuid have value is update
+ {
+ //#todo update table
+ addFaceData.uuid = strUUID;
+ addFaceData.faceUrl = img_url;
+
+ fieldValues.insert(make_pair("uuid", strUUID));
+ fieldValues.insert(make_pair("idCard", idcard));
+ fieldValues.insert(make_pair("enabled", Enabled));
+ ret_addPerson = m_SqliteFaceEncap.updateFace(TableName, addFaceData, fieldValues);
+ }
+ } else {
+ fieldValues.insert(make_pair("uuid", strUUID));
+ fieldValues.insert(make_pair("idCard", idcard));
+ fieldValues.insert(make_pair("enabled", Enabled));
+ ret_addPerson = erlangDbTool->updatePerson(strUUID, addFaceData, fieldValues);
+ }
+
+ if (ret_addPerson && strUUID.size() > 0) {
+ std::string str_result = std::string("{\"uuid\":").append(
+ "\"" + strUUID + "\",\"img_url\":\"" + img_url + "\"}");
+// usleep(100);
+ erlangDbTool->sendMessage();
+
+// #todo CreateBy == ""???
+// #TODO榛戝悕鍗曟洿鏂伴渶瑕佷笂浼�
+// if (UploadFlag == "1") {
+//// #todo db queue upload to server
+// if (BwType == "0") {
+// UploadPersonToUserCenter(img_url, idcard, strUUID, feature_base64);
+// } else {
+// //todo send person to backServer
+////#TODO 榛戝悕鍗曚笂浼�
+// }
+// }
+ return str_result;
+ } else {
+ std::string str_result = std::string("{\"error\":\"addPerson error\"}");
+ return str_result;
+ }
+
+ } else {
+ response->write(SimpleWeb::StatusCode::server_error_not_implemented, "{\"error\":\"浼犺緭閿欒锛岃妫�鏌ワ紒\"}");
+ return "";
+// return "{\"error\":\"浼犺緭閿欒锛岃妫�鏌ワ紒\"}";
+ }
+}
+
+void devHttpServer_c::getMat(string &img_url, const string &img_base64, cv::Mat &image) const {
+ if (img_url.size() > 0) {
+
+ string img_str = "http://";
+ if (fdfsClient.fastFds != nullptr) {
+ img_str.append(fdfsClient.fastFds->getIp() + "/").append(img_url);
+ img_url.swap(img_str);
+ }
+
+ auto t_results = m_curlDownloadImg.download_jpeg(const_cast<char *>(img_url.c_str()));
+ DBG(img_url << "t_results size is " << t_results.all << " : " << t_results.buffer.size());
+ cvutil.buffer2CvMat(t_results.buffer, image);
+ } else if (img_base64.size() > 0) {
+ auto str_img = base64.Decode(img_base64.c_str(), img_base64.size());
+ vector<unsigned char> buffer(str_img.size());
+ memcpy(buffer.data(), str_img.data(), str_img.size());
+ cvutil.buffer2CvMat(buffer, image);
+ }
+}
+
+void devHttpServer_c::addPersonMToDB(const string &TableName, const string &img_url, const string &SyncType,
+ const string &feature_base64, const Features &faceResults, string &idcard,
+ string &strUUID, bool &ret_addPerson) const {
+ if (SyncType == "0") {
+ FieldValues fieldValues;
+ AddFaceData addFaceData;
+ addFaceData.feature.resize(faceResults[0].feature.size());
+ memcpy(addFaceData.feature.data(), faceResults[0].feature.data(), faceResults[0].feature.size());
+
+ //#todo uuid have value is update
+ if (strUUID.size() <= 0) {
+ // get Person id
+
+ strUUID = AppUtil::getPersonId(m_batch, m_SerialNumber);
+ addFaceData.uuid = strUUID;
+ addFaceData.faceUrl = img_url;
+
+ fieldValues.insert(make_pair("uuid", strUUID));
+ fieldValues.insert(make_pair("idCard", idcard));
+ auto t_id = m_SqliteFaceEncap.addFace(TableName, addFaceData, fieldValues);
+ ret_addPerson = t_id.size() > 0 ? true : false;
+ } else {
+ //#todo update table
+ addFaceData.uuid = strUUID;
+ addFaceData.faceUrl = img_url;
+
+ fieldValues.insert(make_pair("uuid", strUUID));
+ fieldValues.insert(make_pair("idCard", idcard));
+ ret_addPerson = m_SqliteFaceEncap.updateFace(TableName, addFaceData, fieldValues);
+ }
+
+ } else {
+ //#todo update data
+ // get Person id
+ strUUID = strUUID.size() > 0 ? strUUID : AppUtil::getPersonId(m_batch, m_SerialNumber);
+ ret_addPerson = ret_addPerson = erlangDbTool->addPerson(strUUID, TableName, feature_base64, img_url,
+ idcard);
+ }
+}
+
+void
+devHttpServer_c::UploadPersonToUserCenter(string &img_url, string &idcard, string &strUUID, string &feature_base64) {
+ string str_serIp = GET_STR_CONFIG("mainServerIp");
+ string str_serPort = GET_STR_CONFIG("mainServerPort");
+
+// string sendUrl = "192.168.1.203:3697/addPerson/uploadToTemporary";
+ string sendUrl = str_serIp;
+ sendUrl.append(":").append(str_serPort).append("/addPerson/uploadToTemporary");
+
+
+ Json::Value perInfos;
+ Json::Value perInfo;
+// #todo get string from config.json file
+// get
+ perInfo["id"] = strUUID;
+ perInfo["distributionIds"] = m_cluster_id;
+ perInfo["distributionNames"] = m_cluster_name;
+ auto rec = db_c.searchConfigTableWithinServerInfo();
+ perInfo["deviceId"] = rec.dev_id.toStdString();
+ perInfo["photos"] = img_url;
+// perInfo["featureBase"] = feature_base64;
+ perInfo["featureBase64"] = feature_base64;
+ perInfo["cardId"] = idcard;//鍥剧墖鎻忚堪
+ perInfos.append(perInfo);
+
+ thread sendPerson(uploadServer, this, sendUrl, perInfos.toStyledString());
+ sendPerson.detach();
}
std::string devHttpServer_c::loadFaceFeaData(std::string ip, unsigned int port, std::string content,
@@ -2345,7 +2553,8 @@
fieldValues.insert(std::make_pair("bwType", BwType));
fieldValues.insert(std::make_pair("startTime", StartTime));
fieldValues.insert(std::make_pair("endTime", EndTime));
-// fieldValues.insert(std::make_pair("create_by", "who"));
+// #todo
+ fieldValues.insert(std::make_pair("create_by", "who"));
fieldValues.insert(std::make_pair("uploadFlag", UploadFlag));
fieldValues.insert(std::make_pair("cmpThreshold", CmpThreshold));
@@ -3115,28 +3324,9 @@
}
}
-void devHttpServer_c::uploadPersonToServer(devHttpServer_c *t_ptrThis, std::string sendUrl, std::string parm_uuid,
- std::string parm_img_url, std::string parm_idcard, std::string parm_fea) {
- HttpRequestWithCrul m_requestWithCrul;
- Json::Value perInfos;
- Json::Value perInfo;
-// #todo get string from config.json file
-// get
- perInfo["id"] = parm_uuid;
- perInfo["distributionIds"] = t_ptrThis->m_cluster_id;
- perInfo["distributionNames"] = t_ptrThis->m_cluster_name;
- auto rec = t_ptrThis->db_c.searchConfigTableWithinServerInfo();
- perInfo["deviceId"] = rec.dev_id.toStdString();
- perInfo["photos"] = parm_img_url;
-// perInfo["featureBase"] = feature_base64;
- perInfo["featureBase64"] = parm_fea;
- perInfo["cardId"] = parm_idcard;//鍥剧墖鎻忚堪
- perInfos.append(perInfo);
+void devHttpServer_c::uploadServer(devHttpServer_c *t_ptrThis, std::string sendUrl, std::string param) {
-
- string postParams = perInfos.toStyledString();
- string str_addRes;
-
- m_requestWithCrul.curl_post_req(sendUrl, postParams, str_addRes);
+ std::string str_addRes;
+ t_ptrThis->m_requestWithCrul.curl_post_req(sendUrl, param, str_addRes);
}
diff --git a/QiaoJiaSystem/DataManagerServer/http_configserver.h b/QiaoJiaSystem/DataManagerServer/http_configserver.h
index b525670..b25f94a 100644
--- a/QiaoJiaSystem/DataManagerServer/http_configserver.h
+++ b/QiaoJiaSystem/DataManagerServer/http_configserver.h
@@ -17,6 +17,7 @@
#include <CurlDownloadImg.hpp>
#include <basic/util/fastdfs/FastFds.hpp>
#include <atomic>
+#include <basic/util/curl/HttpRequestWithCrul.hpp>
#include "../FaceSearchServer/CasiaFaceWrapper/CasiaFaceWrapperN.h"
#include "AppPipeController.h"
@@ -96,6 +97,8 @@
std::string addPerson(std::string ip, unsigned int port, std::string content, PResponse &response);
+ std::string updatePerson(std::string ip, unsigned int port, std::string content, PResponse &response);
+
std::string addPersons(std::string ip, unsigned int port, std::string content, PResponse &response);
std::string personIsExists(std::string ip, unsigned int port, std::string content, PResponse &response);
@@ -133,7 +136,7 @@
std::string m_cluster_id;
std::string m_cluster_name;
std::map<std::string, srsPipeController_s> m_rtmp;
-
+ HttpRequestWithCrul m_requestWithCrul;
ErlangTool::ErlangDbTool *erlangDbTool;
SqliteFaceEncap m_SqliteFaceEncap;
@@ -183,8 +186,17 @@
qint64 getVideoTime(/*const std::string& videoPath*/std::string &str_tmpTime);
- static void uploadPersonToServer(devHttpServer_c *t_ptrThis, std::string sendUrl, std::string parm_uuid,
- std::string parm_img_url, std::string parm_idcard, std::string parm_fea);
+
+ static void uploadServer(devHttpServer_c *t_ptrThis, std::string sendUrl, std::string param);
+
+ void devHttpServer_c::UploadPersonToUserCenter(string &img_url, string &idcard, string &strUUID,
+ string &feature_base64);
+
+ void
+ addPersonMToDB(const string &TableName, const string &img_url, const string &SyncType, const string &feature_base64,
+ const Features &faceResults, string &idcard, string &strUUID, bool &ret_addPerson) const;
+
+ void getMat(string &img_url, const string &img_base64, cv::Mat &image) const;
};
#endif
diff --git a/QiaoJiaSystem/DataManagerServer/main.cpp b/QiaoJiaSystem/DataManagerServer/main.cpp
index 62ffa51..93a7d75 100644
--- a/QiaoJiaSystem/DataManagerServer/main.cpp
+++ b/QiaoJiaSystem/DataManagerServer/main.cpp
@@ -17,6 +17,7 @@
// GetGateWay("enp1s0", gateway_addr);
// SetGateWay("enp1s0", (char *)gateway_addr, "192.168.1.1");
+
appPref.setLongData("gpu.index", 0);//gpu
appPref.setLongData("thread.max", 20);//sdk
int port = appConfig.getIntProperty("webPort");
diff --git a/QiaoJiaSystem/LocalDBTool/SqliteFaceEncap.cpp b/QiaoJiaSystem/LocalDBTool/SqliteFaceEncap.cpp
index f931369..a3d7d54 100644
--- a/QiaoJiaSystem/LocalDBTool/SqliteFaceEncap.cpp
+++ b/QiaoJiaSystem/LocalDBTool/SqliteFaceEncap.cpp
@@ -179,6 +179,9 @@
if (faceData.faceUrl.size() > 0) {
strSql.append(" faceUrl = :faceUrl ,");
}
+// if (faceData.enabled.size() > 0) {
+// strSql.append(" enabled = :enabled ,");
+// }
//#todo
strSql.append(" update_time = '2010-01-03 01:01:00' ");
@@ -192,6 +195,9 @@
if (faceData.faceUrl.size() > 0) {
query.addBindValue(QString::fromStdString(faceData.faceUrl));
}
+// if (faceData.enabled.size() > 0) {
+// query.addBindValue(QString::fromStdString(faceData.enabled));
+// }
if (!query.exec()) {
ERR("updateFaceData fail");
@@ -373,6 +379,8 @@
tableInfo.uploadFlag = query.value(6).toString().toStdString();
tableInfo.cmpThreshold = query.value(7).toString().toStdString();
tableInfo.enabled = query.value(8).toString().toStdString();
+ tableInfo.createBy = query.value(9).toString().toStdString();
+
tableInfos.push_back(tableInfo);
}
}
diff --git a/QiaoJiaSystem/LocalDBTool/SqliteToolkit.hpp b/QiaoJiaSystem/LocalDBTool/SqliteToolkit.hpp
index 14a18d1..f72924a 100644
--- a/QiaoJiaSystem/LocalDBTool/SqliteToolkit.hpp
+++ b/QiaoJiaSystem/LocalDBTool/SqliteToolkit.hpp
@@ -108,7 +108,7 @@
std::string getTableInfosSql() {
//uuid,tableName,tableDesc,tableType,bwType,startTime,endTime
std::string sql =
- "select uuid,tableName,tableType,bwType,startTime,endTime,uploadFlag,cmpThreshold,enabled from " +
+ "select uuid,tableName,tableType,bwType,startTime,endTime,uploadFlag,cmpThreshold,enabled,create_by from " +
g_tableName + " where del_flag = 0";
return sql;
}
@@ -241,7 +241,8 @@
sql.append("create_time BLOB DEFAULT (datetime('now', 'localtime')),");
sql.append("update_time DATETIME DEFAULT NULL,");
sql.append("create_by varchar(255) DEFAULT NULL,");
- sql.append("del_flag INTEGER DEFAULT 0");
+ sql.append("del_flag INTEGER DEFAULT 0,");
+ sql.append(" enabled varchar(255) DEFAULT 1");
sql.append(");");
// 浜鸿劯鐗瑰緛琛�
sql.append("CREATE TABLE " + g_dbName + ".");
diff --git a/QiaoJiaSystem/build/DataWebServer b/QiaoJiaSystem/build/DataWebServer
index 772dd3e..1b62fa9 100755
--- a/QiaoJiaSystem/build/DataWebServer
+++ b/QiaoJiaSystem/build/DataWebServer
Binary files differ
diff --git a/QiaoJiaSystem/build/config.json b/QiaoJiaSystem/build/config.json
index 887f935..b0d85af 100755
--- a/QiaoJiaSystem/build/config.json
+++ b/QiaoJiaSystem/build/config.json
@@ -1,26 +1,26 @@
{
- "mainServerIp": "192.168.1.182",
- "mainServerPort": "3697",
- "logPath": "/home/basic/work/log/",
- "DEV_ID": "DSVAD010120181119",
- "ES_IP": "192.168.1.122",
- "ES_PORT": 9200,
- "FaceSeachSleepTime": 60,
- "TotalLoadSize": "500",
- "buildAddr": "/home/basic/Apps/QiaoJiaSystem/build/",
- "cutPath": "/home/basic/work/qiaojia/cut",
- "erlCookie": "",
- "erlFatherNode": "",
- "erlNode": "",
- "erlPath": "",
- "loadPath": "/home/basic/work/qiaojia/load",
- "localPasswd": "123456",
- "netIfName": "enp3s0",
- "srsAddr": "rtmp://192.168.1.122:1934/live/",
- "webPort": 11111,
- "redis_ip": "127.0.0.1",
- "redis_buf_len": 750,
- "encode_thread_num": 3,
- "FaceDetectionSampleSize": 720,
- "clusterID" : "sssss"
+ "DEV_ID" : "DSVAD010120181119",
+ "ES_IP" : "192.168.1.122",
+ "ES_PORT" : 9200,
+ "FaceDetectionSampleSize" : 720,
+ "FaceSeachSleepTime" : 60,
+ "TotalLoadSize" : "500",
+ "buildAddr" : "/home/bsk/Apps/QiaoJiaSystem/build/",
+ "clusterID" : "",
+ "cutPath" : "/home/bsk/work/qiaojia/cut",
+ "encode_thread_num" : 3,
+ "erlCookie" : "123",
+ "erlFatherNode" : " ",
+ "erlNode" : "f6d7d984-858e-4235-a657-644927b3a628@192.168.1.148",
+ "erlPath" : "/opt/erlang/f6d7d984-858e-4235-a657-644927b3a628",
+ "loadPath" : "/home/bsk/work/qiaojia/load",
+ "localPasswd" : "123456",
+ "logPath" : "/home/bsk/work/log/",
+ "mainServerIp" : "192.168.1.182",
+ "mainServerPort" : "3697",
+ "netIfName" : "enp3s0",
+ "redis_buf_len" : 750,
+ "redis_ip" : "127.0.0.1",
+ "srsAddr" : "rtmp://192.168.1.122:1934/live/",
+ "webPort" : 11111
}
diff --git a/syncDBTool/ErlangDbTool.cpp b/syncDBTool/ErlangDbTool.cpp
index 75280bc..0beefca 100755
--- a/syncDBTool/ErlangDbTool.cpp
+++ b/syncDBTool/ErlangDbTool.cpp
@@ -995,7 +995,7 @@
map_TabDataCache tabDataCache;
QString sql = QString::fromStdString(
- "SELECT uuid,tableName,tableType,bwType,startTime,endTime,uploadFlag,cmpThreshold,enabled FROM sys_o_tables where del_flag=0;");
+ "SELECT uuid,tableName,tableType,bwType,startTime,endTime,uploadFlag,cmpThreshold,enabled,create_by FROM sys_o_tables where del_flag=0;");
QSqlQuery query(g_syncDbFile);
query.prepare(sql);
if (!query.exec()) {
@@ -1012,6 +1012,7 @@
t_table_info.uploadFlag = query.value(6).toString().toStdString();
t_table_info.cmpThreshold = query.value(7).toString().toStdString();
t_table_info.enabled = query.value(8).toString().toStdString();
+ t_table_info.create_by = query.value(9).toString().toStdString();
tabDataCache.insert(std::make_pair(t_table_info.uuid, t_table_info));
}
@@ -1184,6 +1185,11 @@
return false;
}
+bool ErlangTool::ErlangDbTool::updatePerson(std::string t_tableName, AddFaceData &faceData, FieldValues &fieldValues) {
+// #todo 璁板緱娴嬭瘯涓枃
+ std::string strSql = getUpdateFaceTableSql(t_tableName, fieldValues);
+ return getExecSqlResult(strSql);
+}
ErlangTool::vec_AddDataCache
ErlangTool::ErlangDbTool::addPersons(std::string TableUuid, std::vector<SyncDB::AddPersonInfo> &tmpPer) {
diff --git a/syncDBTool/ErlangDbTool.h b/syncDBTool/ErlangDbTool.h
index e7a9803..347fabd 100755
--- a/syncDBTool/ErlangDbTool.h
+++ b/syncDBTool/ErlangDbTool.h
@@ -266,6 +266,8 @@
std::string IdCard = " ", std::string PersonName = " ", std::string Age = " ",
std::string Sex = " ", std::string PhoneNum = " ");
+ bool updatePerson(std::string t_tableName, AddFaceData &faceData, FieldValues &fieldValues);
+
vec_AddDataCache addPersons(std::string TableUuid, std::vector<SyncDB::AddPersonInfo> &tmpPer);
/***
--
Gitblit v1.8.0