派生自 development/c++
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, @@ -1869,6 +1873,25 @@ std::string Enabled = value["enabled"].asString(); Enabled = Enabled.empty() ? "1" : Enabled; std::string createBy = value["createBy"].asString(); string str_uuid; uuid_t t_uuid; char str[36]; uuid_generate(t_uuid); uuid_unparse(t_uuid, str); str_uuid = str; Uuid = Uuid.empty() ? str_uuid : Uuid; if (createBy == "analyDev") { Uuid = Uuid.empty() ? str_uuid : Uuid; } else if (createBy == "conCemter") { if (Uuid.empty()) { response->write(SimpleWeb::StatusCode::client_error_bad_request, "{\"error\":\"参数错误！ \"}"); return ""; } } bool ret = false; FieldValues fieldValues; fieldValues.insert(std::make_pair("uuid", Uuid)); @@ -1878,7 +1901,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", createBy)); fieldValues.insert(std::make_pair("uploadFlag", UploadFlag)); fieldValues.insert(std::make_pair("cmpThreshold", CmpThreshold)); @@ -1901,6 +1925,17 @@ } else { response->write(SimpleWeb::StatusCode::server_error_not_implemented, "{\"error\":\"类型错误，未识别！ \"}"); return ""; } // #todo 上传。仅黑名单。 // #TODO 根据createBy判断是否需要上传 if (createBy == "analyDev" && BwType == "1") { // string &Uuid, string &TableName, string &SyncType, string &StartTime,string &EndTime, // string &UploadFlag, string &CmpThreshold, string &Enabled string str_SyncType(to_string(SyncType)); UploadTaskToMonitorCenter(Uuid, TableName, str_SyncType, StartTime, EndTime, UploadFlag, CmpThreshold, Enabled); } @@ -1936,6 +1971,8 @@ std::string TableName = value["TableName"].asString(); int SyncType = atoi(value["SyncType"].asCString()); std::string createBy = value["createBy"].asString(); bool ret = false; if (TableType == "person") { if (SyncType == 1) { @@ -1957,6 +1994,10 @@ return ""; } { // #todo 上传。仅黑名单。 // #TODO 根据createBy判断是否需要上传 } erlangDbTool->sendMessage(); std::string str_result = std::string("{\"result\":").append("\"" + std::to_string(ret) + "\"}"); return str_result; @@ -1999,6 +2040,7 @@ 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); @@ -2044,6 +2086,7 @@ 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); @@ -2076,37 +2119,40 @@ 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(); // #todo std::string Enabled = value["enabled"].asString(); Enabled = Enabled.empty() ? "1" : Enabled; 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 monLevel = value["monLevel"].asString(); 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; if (img_url.size() > 0) { 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); } else { 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(); @@ -2166,47 +2212,171 @@ // std::string uuid = ""; bool ret_addPerson = false; addPersonMToDB(TableName, img_url, SyncType, feature_base64, faceResults, idcard, strUUID, monLevel, Enabled, 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(); if (createBy == "analyDev" && UploadFlag == "1") { // #todo db queue upload to server if (BwType == "0") { UploadPersonToUserCenter(img_url, idcard, strUUID, feature_base64); } else if (BwType == "1") { UploadPersonToMonitorCenter(img_url, idcard, strUUID, feature_base64, TableId, Enabled); } } else { // 不上传 } 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\":\"传输错误，请检查！\"}"; } } 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 monLevel = value["monLevel"].asString(); // std::string BwType = value["BwType"].asString(); 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 << "," << 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 (TableName.find("lt_") == 0) { 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 if (strUUID.size() <= 0) { addFaceData.feature.resize(faceResults[0].feature.size()); memcpy(addFaceData.feature.data(), faceResults[0].feature.data(), faceResults[0].feature.size()); // 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)); fieldValues.insert(make_pair("uuid", strUUID)); fieldValues.insert(make_pair("idCard", idcard)); fieldValues.insert(make_pair("enabled", Enabled)); fieldValues.insert(make_pair("monitorLevel", monLevel)); ret_addPerson = m_SqliteFaceEncap.updateFace(TableName, addFaceData, fieldValues); } } else { if (strUUID.size() <= 0) { strUUID = strUUID.size() > 0 ? strUUID : AppUtil::getPersonId(m_batch, m_SerialNumber); ret_addPerson = erlangDbTool->addPerson(strUUID, TableName, feature_base64, img_url, idcard); } else { addFaceData.uuid = strUUID; addFaceData.faceUrl = img_url; fieldValues.insert(std::make_pair("uuid", strUUID)); fieldValues.insert(std::make_pair("idCard", idcard)); // #todo update ret_addPerson = erlangDbTool->updatePerson(TableName, addFaceData, fieldValues); } fieldValues.insert(make_pair("uuid", strUUID)); fieldValues.insert(make_pair("idCard", idcard)); fieldValues.insert(make_pair("enabled", Enabled)); fieldValues.insert(make_pair("monitorLevel", monLevel)); ret_addPerson = erlangDbTool->updatePerson(strUUID, addFaceData, fieldValues); } if (ret_addPerson && strUUID.size() > 0) { @@ -2214,22 +2384,16 @@ "\"" + strUUID + "\",\"img_url\":\"" + img_url + "\"}"); // usleep(100); erlangDbTool->sendMessage(); //todo send person to backServer if (UploadFlag == "1") { if (CreateBy == "analyDev" && UploadFlag == "1") { // #todo db queue upload to server std::string str_serUrl; if (1) { str_serUrl = GET_STR_CONFIG("uploadPersonUrl"); // string sendUrl = "192.168.1.203:3697/addPerson/uploadToTemporary"; } else { str_serUrl = GET_STR_CONFIG("uploadPersonUrl"); // string sendUrl = "192.168.1.203:3697/addPerson/uploadToTemporary"; if (BwType == "0") { // UploadPersonToUserCenter(img_url, idcard, strUUID, feature_base64); } else if (BwType == "1") { UpdatePersonToMonitorCenter(img_url, idcard, strUUID, TableId, Enabled); } std::thread sendPerson(uploadPersonToServer, this, str_serUrl, strUUID, img_url, idcard, feature_base64); sendPerson.detach(); } else { // 不上传 } return str_result; @@ -2243,6 +2407,201 @@ 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, string &monLevel, string &Enabled, bool &ret_addPerson) { FieldValues fieldValues; AddFaceData addFaceData; addFaceData.uuid = strUUID; addFaceData.faceUrl = img_url; fieldValues.insert(make_pair("monitorLevel", monLevel)); fieldValues.insert(make_pair("enabled", Enabled)); fieldValues.insert(make_pair("idCard", idcard)); 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 if (strUUID.size() <= 0) { // get Person id strUUID = AppUtil::getPersonId(m_batch, m_SerialNumber); fieldValues.insert(make_pair("uuid", strUUID)); auto t_id = m_SqliteFaceEncap.addFace(TableName, addFaceData, fieldValues); ret_addPerson = t_id.size() > 0 ? true : false; } else { //#todo update table fieldValues.insert(make_pair("uuid", strUUID)); ret_addPerson = m_SqliteFaceEncap.updateFace(TableName, addFaceData, fieldValues); } } else { if (strUUID.size() <= 0) { // insert strUUID = AppUtil::getPersonId(m_batch, m_SerialNumber); // ret_addPerson = ret_addPerson = erlangDbTool->addPerson(strUUID, TableName, feature_base64, img_url, // idcard); fieldValues.insert(make_pair("uuid", strUUID)); addFaceData.feature_base64 = feature_base64; ret_addPerson = erlangDbTool->addPerson(TableName, addFaceData, fieldValues); } else { // update fieldValues.insert(make_pair("uuid", strUUID)); addFaceData.feature_base64 = feature_base64; ret_addPerson = erlangDbTool->updatePerson(strUUID, addFaceData, fieldValues); } } } 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 str_serUrl = GET_STR_CONFIG("mainServerrUrl"); // string sendUrl = "192.168.1.203:3697/addPerson/uploadToTemporary"; string sendUrl = str_serIp; sendUrl.append(":").append(str_serPort).append(str_serUrl); 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["featureBase64"] = feature_base64; perInfo["cardId"] = idcard;//图片描述 perInfos.append(perInfo); thread sendPerson(uploadServer, this, sendUrl, perInfos.toStyledString()); sendPerson.detach(); } void devHttpServer_c::UploadPersonToMonitorCenter(string &img_url, string &idcard, string &strUUID, string &feature_base64, string &strTableId, string &strControl) { // string sendUrl = "192.168.1.203:3697/addPerson/uploadToTemporary"; string sendUrl = GET_STR_CONFIG("addFromAnalyUrl"); if (sendUrl.empty()) { ERR(""); return; } Json::Value perInfos; Json::Value perInfo; // #todo get string from config.json file 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["featureBase64"] = feature_base64; perInfo["cardId"] = idcard; // 图片描述 perInfo["taskId"] = strTableId; // 底库id perInfo["isControl"] = strControl; // 布控状态（0为未布控，1为已布控） perInfos.append(perInfo); thread sendPerson(uploadServer, this, sendUrl, perInfos.toStyledString()); sendPerson.detach(); } void devHttpServer_c::UpdatePersonToMonitorCenter(string &img_url, string &idcard, string &strUUID, string &strTableId, string &strControl) { // string sendUrl = "ip:3699/data/api-c/taskUser/updateFromC"; string sendUrl = GET_STR_CONFIG("updateFromAnalyUrl"); if (sendUrl.empty()) { ERR(""); return; } Json::Value perInfos; Json::Value perInfo; // #todo get string from config.json file 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["cardId"] = idcard; // 图片描述 perInfo["taskId"] = strTableId; // 底库id perInfo["isControl"] = strControl; // 布控状态（0为未布控，1为已布控） perInfos.append(perInfo); thread sendPerson(uploadServer, this, sendUrl, perInfos.toStyledString()); sendPerson.detach(); } void devHttpServer_c::UploadTaskToMonitorCenter(string &Uuid, string &TableName, string &SyncType, string &StartTime, string &EndTime, string &UploadFlag, string &CmpThreshold, string &Enabled) { // string sendUrl = "192.168.1.184:3699/addTaskByNode"; string sendUrl = GET_STR_CONFIG("addTaskAnalyUrl"); if (sendUrl.empty()) { ERR(""); return; } // Json::Value perInfos; Json::Value perInfo; perInfo["uuid"] = Uuid; perInfo["TableName"] = TableName; perInfo["SyncType"] = SyncType; perInfo["StartTime"] = StartTime; perInfo["EndTime"] = EndTime; perInfo["IsSync"] = UploadFlag; perInfo["threshold"] = CmpThreshold; perInfo["enabled"] = Enabled; perInfo["distributionIds"] = m_cluster_id; perInfo["distributionNames"] = m_cluster_name; auto rec = db_c.searchConfigTableWithinServerInfo(); perInfo["deviceId"] = rec.dev_id.toStdString(); // perInfos.append(perInfo); thread sendPerson(uploadServer, this, sendUrl, perInfo.toStyledString()); sendPerson.detach(); } std::string devHttpServer_c::loadFaceFeaData(std::string ip, unsigned int port, std::string content, @@ -2274,6 +2633,8 @@ subJson.append("\"uuid\":\"" + item.second.uuid + "\","); subJson.append("\"tableName\":\"" + TableName + "\","); subJson.append("\"idcard\":\"" + t_faceInfoCache[item.second.uuid].idCard + "\","); subJson.append("\"enable\":\"" + t_faceInfoCache[item.second.uuid].enable + "\","); subJson.append("\"monLevel\":\"" + t_faceInfoCache[item.second.uuid].monLevel + "\","); subJson.append("\"imgUrl\":\"" + item.second.faceurl + "\""); // subJson.append("\"feature\":\"" + item.second.feature + "\","); //#todo modifysvn upda svn comm @@ -2295,6 +2656,8 @@ subJson.append("\"uuid\":\"" + item.second.id + "\","); subJson.append("\"tableName\":\"" + TableName + "\","); subJson.append("\"idcard\":\"" + item.second.idcard + "\","); subJson.append("\"enable\":\"" + item.second.enable + "\","); subJson.append("\"monLevel\":\"" + item.second.monLevel + "\","); subJson.append("\"imgUrl\":\"" + item.second.img + "\""); // subJson.append("\"feature\":\"" + item.second.feature + "\","); //#todo modifysvn upda svn comm @@ -2346,21 +2709,20 @@ std::string UploadFlag = value["IsSync"].asString(); std::string CmpThreshold = value["threshold"].asString(); std::string Enabled = value["enabled"].asString(); // Enabled = Enabled.empty() ? "1" : Enabled; std::string createBy = value["createBy"].asString(); bool ret = false; //#更新底库管理表 FieldValues fieldValues; fieldValues.insert(std::make_pair("uuid", Uuid)); if (TableName.find("lt_") != 0) { TableName.insert(0, "lt_"); } fieldValues.insert(std::make_pair("tableName", TableName)); // fieldValues.insert(std::make_pair("tableDesc", "ceshi2")); fieldValues.insert(std::make_pair("tableType", TableType)); 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", createBy)); fieldValues.insert(std::make_pair("uploadFlag", UploadFlag)); fieldValues.insert(std::make_pair("cmpThreshold", CmpThreshold)); @@ -2368,9 +2730,14 @@ if (TableType == "person") { if (SyncType == 1) { fieldValues.insert(std::make_pair("tableName", TableName)); //同步库 ret = erlangDbTool->updateDatabase("sys_o_tables", fieldValues); } else if (SyncType == 0) { if (TableName.find("lt_") != 0) { TableName.insert(0, "lt_"); } fieldValues.insert(std::make_pair("tableName", TableName)); //本地库 ret = m_SqliteFaceEncap.updateTable("sys_o_tables", fieldValues); } @@ -2381,6 +2748,15 @@ } else { response->write(SimpleWeb::StatusCode::server_error_not_implemented, "{\"error\":\"类型错误，未识别！ \"}"); return ""; } // #todo 上传。仅黑名单。 // #TODO 根据createBy判断是否需要上传 if (createBy == "analyDev" && BwType == "1") { // UploadTaskToMonitorCenter(Uuid, TableName, SyncType, StartTime, EndTime, SyncType, Enabled); string str_SyncType(to_string(SyncType)); UploadTaskToMonitorCenter(Uuid, TableName, str_SyncType, StartTime, EndTime, UploadFlag, CmpThreshold, Enabled); } @@ -2410,6 +2786,7 @@ if (reader.parse(content, value)) { std::string TableName = value["TableName"].asString(); std::string strUUID = value["uuid"].asString(); std::string createBy = value["createBy"].asString(); bool ret = false; if (TableName.find("lt_") == 0) { @@ -2417,7 +2794,10 @@ } else { ret = erlangDbTool->delPerson(strUUID, TableName); } { // #todo 上传。仅黑名单。 // #TODO 根据createBy判断是否需要上传 } erlangDbTool->sendMessage(); std::string str_result = std::string("{\"result\":").append("\"" + std::to_string(ret) + "\"}"); return str_result; @@ -3097,7 +3477,10 @@ str_imgName += "-"; str_imgName += "snapshot.jpg"; //admin:a1234567@192.168.1.201:554/h264/ch1/main/av_stream -r 1/25 -f image2 -s 1920*1080 /home/basic/work_src/a.jpg std::string cmd("ffmpeg -i " + rtsp_url + " -r 1/25 -f image2 -s 1920*1080 -y " + str_imgName); std::string cmd( "ffmpeg -i " + rtsp_url + " -vf select='eq(pict_type\\,I)',setpts='N/(25*TB)' -f image2 -s 1920*1080 -y " + str_imgName); // std::string cmd("ffmpeg -i " + rtsp_url + " -r 1/25 -f image2 -s 1920*1080 -y " + str_imgName); DBG(cmd); system(cmd.c_str()); @@ -3114,13 +3497,14 @@ CvUtil::cvMat2Buffer(img, buffer); std::string strImgUrlTmp = ""; fdfsClient.fastFds->uploadFile(buffer, strImgUrlTmp, "jpg"); strImgUrl.append(fdfsClient.fastFds->getIp() + "/" + strImgUrlTmp); // strImgUrl.append(fdfsClient.fastFds->getIp() + "/" + strImgUrlTmp); strImgUrl.clear(); strImgUrl = strImgUrlTmp; } fdfsClient.rwLock.unlock(); Json::Value result; result["imgUrl"] = strImgUrl; db_c.updateCamDevSnapshot(QString::fromStdString(ip), QString::fromStdString(strImgUrl)); return result.toStyledString(); @@ -3130,28 +3514,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); }
