From d8bfb8df31a5d7fde92015ee23d1d44875737f0e Mon Sep 17 00:00:00 2001 From: pans <pansen626@sina.com> Date: 星期五, 25 一月 2019 20:57:29 +0800 Subject: [PATCH] fix bug --- QiaoJiaSystem/DataManagerServer/http_configserver.cpp | 362 +++++++++++++++++++++++++++++++-------------------- 1 files changed, 217 insertions(+), 145 deletions(-) diff --git a/QiaoJiaSystem/DataManagerServer/http_configserver.cpp b/QiaoJiaSystem/DataManagerServer/http_configserver.cpp index 9b2ad85..942b392 100644 --- a/QiaoJiaSystem/DataManagerServer/http_configserver.cpp +++ b/QiaoJiaSystem/DataManagerServer/http_configserver.cpp @@ -395,6 +395,7 @@ /*sdk login*/ ulRet = IMOS_MW_Login(username, passwd, ip, 0, szUserID); if (ERR_COMMON_SUCCEED != ulRet) { + (VOID) IMOS_MW_Cleanup(); printf("Login error ulRet[%lu]", ulRet); return false; } @@ -402,6 +403,8 @@ pstBasicInfo = (IMOS_MW_BASIC_DEVICE_INFO_S *) malloc(sizeof(IMOS_MW_BASIC_DEVICE_INFO_S)); ulRet = IMOS_MW_GetDeviceStatus(szUserID, 0, IMOS_MW_STATUS_BASIC_INFO, (void *) pstBasicInfo); if (ERR_COMMON_SUCCEED != ulRet) { + (VOID) IMOS_MW_Logout(szUserID); + (VOID) IMOS_MW_Cleanup(); printf("GetDeviceStatus Error[%lu]\n", ulRet); return false; } @@ -997,8 +1000,10 @@ std::string out = value.size() > 0 ? value.toStyledString() : "[]"; return out; } + #define ADD_CAMERA 0 #define EDIT_CAMERA 1 + //缂栬緫鎽勫儚鏈� std::string devHttpServer_c::cam_edit(std::string ip, unsigned int port, std::string content, PResponse &response) { DBG("ip:" << ip << "; port:" << port); @@ -1010,7 +1015,7 @@ Record_Cam_Dev rec; Record_Cam_Sdk rec_sdk_old; Record_Cam_Sdk rec_sdk; - int type=-1; + int type = -1; int dev_type = db_c.searchDevTypeFromConfigTable(); if (DEV_STORAGE == dev_type) { return "{\"ret_status\": \"鍐呭鏈夎锛岃妫�鏌ワ紒\"}"; @@ -1036,45 +1041,34 @@ rec.str_username = QString::fromStdString(value["str_username"].asString()); rec.str_password = QString::fromStdString(value["str_password"].asString()); rec.str_brand = QString::fromStdString(value["str_brand"].asString()); - type=value["n_type"].asInt(); + type = value["n_type"].asInt(); // rec_sdk_old = db_c.searchCamSdkTableByCamId(rec.str_cam_dev_id); // rec_sdk.str_cam_dev_id = rec.str_cam_dev_id; // rec_sdk.str_sdks = QString::fromStdString(value["str_sdks"].asString()); // rec_sdk.str_det_thr = QString::fromStdString(value["str_det_thr"].asString()); // rec_sdk.str_cmp_thr = QString::fromStdString(value["str_cmp_thr"].asString()); - bool is_exist=db_c.searchCamDevByCamId(rec.str_cam_dev_id); - if(ADD_CAMERA == type ) - { - if(is_exist) - { - return "{\"ret_status\": \"鍐呭鏈夎锛岃妫�鏌ワ紒\"}"; - } - else - { - ret =db_c.insertCamDevTable(rec); - if (!ret) { - return "err_db_content"; - } - } - } - else if(EDIT_CAMERA == type ) - { - if(is_exist) - { - ret = db_c.updateCamDevTable(rec); + bool is_exist = db_c.searchCamDevByCamId(rec.str_cam_dev_id); + if (ADD_CAMERA == type) { + if (is_exist) { + return "{\"ret_status\": \"璇峰嬁閲嶅娣诲姞!\"}"; + } else { + ret = db_c.insertCamDevTable(rec); if (!ret) { return "err_db_content"; } } - else - { - return "{\"ret_status\": \"鍐呭鏈夎锛岃妫�鏌ワ紒\"}"; + } else if (EDIT_CAMERA == type) { + if (is_exist) { + ret = db_c.updateCamDevTable(rec); + if (!ret) { + return "err_db_content"; + } + } else { + return "{\"ret_status\": \"鍐呭鏈夎锛岃妫�鏌ワ紒\"}"; } - } - else - { - return "{\"ret_status\": \"鍐呭鏈夎锛岃妫�鏌ワ紒\"}"; + } else { + return "{\"ret_status\": \"鍐呭鏈夎锛岃妫�鏌ワ紒\"}"; } @@ -1086,14 +1080,15 @@ db_c.updateConfigTableByDevType(DEV_CAMERA); runAllApp(); } - //edit camera's sdks -// else/* if ((rec_sdk_old.str_sdks != rec_sdk.str_sdks) || -// (rec_sdk_old.str_det_thr != rec_sdk.str_det_thr) || -// (rec_sdk_old.str_cmp_thr != rec_sdk.str_cmp_thr)) */{ -// killVideoAnalysFromHCApp(); -// sleep(1); -// runAllApp(); -// } + //edit camera's sdks + else/* if ((rec_sdk_old.str_sdks != rec_sdk.str_sdks) || + (rec_sdk_old.str_det_thr != rec_sdk.str_det_thr) || + (rec_sdk_old.str_cmp_thr != rec_sdk.str_cmp_thr)) */ + { + killVideoAnalysFromHCApp(); + sleep(1); + runAllApp(); + } Json::Value value_out; value_out["str_cam_dev_id"] = rec.str_cam_dev_id.toStdString(); @@ -1859,30 +1854,55 @@ // bool ret = false; if (reader.parse(content, value)) { + std::string Uuid = value["uuid"].asString(); std::string TableType = value["TableType"].asString(); std::string TableName = value["TableName"].asString(); int SyncType = atoi(value["SyncType"].asCString()); std::string BwType = value["BwType"].asString(); std::string StartTime = value["StartTime"].asString(); std::string EndTime = value["EndTime"].asString(); + + std::string UploadFlag = value["IsSync"].asString(); + UploadFlag = UploadFlag.empty() ? "0" : UploadFlag; + std::string CmpThreshold = value["threshold"].asString(); + CmpThreshold = CmpThreshold.empty() ? "60" : CmpThreshold; + std::string Enabled = value["enabled"].asString(); + Enabled = Enabled.empty() ? "1" : Enabled; + bool ret = false; - if (SyncType == 1) { - //鍚屾搴� - ret = erlangDbTool->createDatabase(TableType, TableName, SyncType, BwType, StartTime, EndTime); - } else if (SyncType == 0) { - TableName.insert(0, "lt_"); - //鏈湴搴� - FieldValues fieldValues; - fieldValues.insert(std::make_pair("uuid", GetUUId::getUUID())); - fieldValues.insert(std::make_pair("tableName", TableName)); - fieldValues.insert(std::make_pair("tableDesc", "ceshi")); - 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")); - ret = m_SqliteFaceEncap.createTable(TableName, fieldValues); + FieldValues fieldValues; + fieldValues.insert(std::make_pair("uuid", Uuid)); + fieldValues.insert(std::make_pair("tableName", TableName)); + fieldValues.insert(std::make_pair("tableDesc", "ceshi")); + 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")); + + fieldValues.insert(std::make_pair("uploadFlag", UploadFlag)); + fieldValues.insert(std::make_pair("cmpThreshold", CmpThreshold)); + fieldValues.insert(std::make_pair("enabled", Enabled)); + + + if (TableType == "person") { + if (SyncType == 1) { + //鍚屾搴� + ret = erlangDbTool->createDatabase(Uuid, fieldValues); + } else if (SyncType == 0) { + TableName.insert(0, "lt_"); + //鏈湴搴� + ret = m_SqliteFaceEncap.createTable(TableName, fieldValues); + } + } else if (TableType == "car") { + ERR(" not not_implemented"); + response->write(SimpleWeb::StatusCode::server_error_not_implemented, "{\"error\":\"绫诲瀷閿欒锛屾湭瀹炵幇锛� \"}"); + return ""; + } else { + response->write(SimpleWeb::StatusCode::server_error_not_implemented, "{\"error\":\"绫诲瀷閿欒锛屾湭璇嗗埆锛� \"}"); + return ""; } + erlangDbTool->sendMessage(); std::string str_result = std::string("{\"result\":").append("\"" + std::to_string(ret) + "\"}"); @@ -1895,6 +1915,7 @@ } } +//#todo std::string devHttpServer_c::deleteDatabase(std::string ip, unsigned int port, std::string content, PResponse &response) { DBG("ip:" << ip << "; port:" << port); @@ -1916,16 +1937,26 @@ int SyncType = atoi(value["SyncType"].asCString()); bool ret = false; - if (SyncType == 1) { - //鍚屾搴� - ret = erlangDbTool->deleteDatabase(TableType, TableName, SyncType); - } else if (SyncType == 0) { - //鏈湴搴� - if (TableName.find("lt_") != 0) { - TableName.insert(0, "lt_"); + if (TableType == "person") { + if (SyncType == 1) { + //鍚屾搴� + ret = erlangDbTool->deleteDatabase(uuid); + } else if (SyncType == 0) { + //鏈湴搴� + if (TableName.find("lt_") != 0) { + TableName.insert(0, "lt_"); + } + ret = m_SqliteFaceEncap.deleteTable(TableName); } - ret = m_SqliteFaceEncap.deleteTable(TableName); + } else if (TableType == "car") { + ERR(" not not_implemented"); + response->write(SimpleWeb::StatusCode::server_error_not_implemented, "{\"error\":\"绫诲瀷閿欒锛屾湭瀹炵幇锛� \"}"); + return ""; + } else { + response->write(SimpleWeb::StatusCode::server_error_not_implemented, "{\"error\":\"绫诲瀷閿欒锛屾湭璇嗗埆锛� \"}"); + return ""; } + erlangDbTool->sendMessage(); std::string str_result = std::string("{\"result\":").append("\"" + std::to_string(ret) + "\"}"); return str_result; @@ -1964,7 +1995,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("\"enabled\":\"" + item.second.enabled + "\""); subJson.append("},"); json.append(subJson); } @@ -2006,7 +2041,10 @@ subJson.append("\"tableType\":\"" + item.tableType + "\","); subJson.append("\"bwType\":\"" + item.bwType + "\","); subJson.append("\"start_time\":\"" + item.startTime + "\","); - subJson.append("\"end_time\":\"" + item.endTime + "\""); + subJson.append("\"end_time\":\"" + item.endTime + "\","); + subJson.append("\"IsSync\":\"" + item.uploadFlag + "\","); + subJson.append("\"threshold\":\"" + item.cmpThreshold + "\","); + subJson.append("\"enabled\":\"" + item.enabled + "\""); subJson.append("},"); json.append(subJson); } @@ -2044,34 +2082,16 @@ std::string img_base64 = value["img_base64"].asString(); std::string idcard = value["idcard"].asString(); std::string strUUID = value["uuid"].asString(); -// if (strUUID.size() > 0) { -// bool ret_addPerson = false; -// if (TableName.find("lt_") == 0) { -// FieldValues fieldValues; -// AddFaceData addFaceData; -// //#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 { -// ret_addPerson = erlangDbTool->addPerson(strUUID, TableName, feature_base64, img_url, idcard); -// } -// } + std::string UploadFlag = value["IsSync"].asString(); +// #todo cv::Mat image; if (img_url.size() > 0) { - if (img_url.find("ManCarAnaly") != string::npos && img_url.find("group") != string::npos) { - auto pos = img_url.find("group"); - auto img_tmp = img_url.substr(pos); - std::string img_str = "http://"; - if (fdfsClient.fastFds != nullptr) { - img_str.append(fdfsClient.fastFds->getIp() + "/").append(img_tmp); - img_url.swap(img_str); - } + 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())); @@ -2114,15 +2134,15 @@ } 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, 1.5, 1.5) & cv::Rect(0, 0, image.cols, image.rows)).clone(); + 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://"; @@ -2140,21 +2160,22 @@ } } 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) { - 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 + 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; @@ -2170,14 +2191,22 @@ 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 { - //#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); + + 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); + } } if (ret_addPerson && strUUID.size() > 0) { @@ -2186,37 +2215,22 @@ // usleep(100); erlangDbTool->sendMessage(); //todo send person to backServer - HttpRequestWithCrul m_requestWithCrul; - std::thread sendPerson([&](std::string parm_uuid, std::string parm_img_url, std::string parm_idcard, - std::string parm_fea) { - Json::Value perInfos; - Json::Value perInfo; -// #todo get string from config.json file -// get - perInfo["id"] = parm_uuid; - perInfo["distributionIds"] = m_cluster_id; - perInfo["distributionNames"] = m_cluster_name; - auto rec = 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); + if (UploadFlag == "1") { +// #todo db queue upload to server - std::string str_serIp = GET_STR_CONFIG("mainServerIp"); - std::string str_serPort = GET_STR_CONFIG("mainServerPort"); - + std::string str_serUrl; + if (1) { + str_serUrl = GET_STR_CONFIG("uploadPersonUrl"); // string sendUrl = "192.168.1.203:3697/addPerson/uploadToTemporary"; - string sendUrl = str_serIp; - sendUrl.append(":").append(str_serPort).append("/addPerson/uploadToTemporary"); - string postParams = perInfos.toStyledString(); - string str_addRes; - - m_requestWithCrul.curl_post_req(sendUrl, postParams, str_addRes); - }, strUUID, img_url, idcard, feature_base64); - sendPerson.detach(); + } else { + str_serUrl = GET_STR_CONFIG("uploadPersonUrl"); +// string sendUrl = "192.168.1.203:3697/addPerson/uploadToTemporary"; + } + std::thread sendPerson(uploadPersonToServer, this, str_serUrl, strUUID, img_url, idcard, + feature_base64); + sendPerson.detach(); + } return str_result; } else { @@ -2328,28 +2342,48 @@ std::string BwType = value["BwType"].asString(); std::string StartTime = value["StartTime"].asString(); std::string EndTime = value["EndTime"].asString(); +// #todo new filed + std::string UploadFlag = value["IsSync"].asString(); + std::string CmpThreshold = value["threshold"].asString(); + std::string Enabled = value["enabled"].asString(); bool ret = false; - if (SyncType == 1) { - //鍚屾搴� - ret = erlangDbTool->updateDatabase(Uuid, TableType, TableName, SyncType, BwType, StartTime, EndTime); - } else if (SyncType == 0) { - //鏈湴搴� - //#鏇存柊搴曞簱绠$悊琛� - 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 fieldValues; + fieldValues.insert(std::make_pair("uuid", Uuid)); // 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("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")); - ret = m_SqliteFaceEncap.updateTable("sys_o_tables", fieldValues); + + fieldValues.insert(std::make_pair("uploadFlag", UploadFlag)); + fieldValues.insert(std::make_pair("cmpThreshold", CmpThreshold)); + fieldValues.insert(std::make_pair("enabled", Enabled)); + + 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); + } + } else if (TableType == "car") { + ERR(" not not_implemented"); + response->write(SimpleWeb::StatusCode::server_error_not_implemented, "{\"error\":\"绫诲瀷閿欒锛屾湭瀹炵幇锛� \"}"); + return ""; + } else { + response->write(SimpleWeb::StatusCode::server_error_not_implemented, "{\"error\":\"绫诲瀷閿欒锛屾湭璇嗗埆锛� \"}"); + return ""; } + erlangDbTool->sendMessage(); std::string str_result = std::string("{\"result\":").append("\"" + std::to_string(ret) + "\"}"); @@ -3045,10 +3079,23 @@ if (rtsp_url.empty()) { return "{\"ret_status\":\"鍐呭鏈夎锛岃妫�鏌ワ紒\"}"; } +// unsigned char serialnumber[SERIALNO_LEN] = {0}; +// int ret = getDevSerialNumber(ip.c_str(), port,username.c_str(),pass.c_str(),brand.c_str(),serialnumber); + + +// if ((!ret) || (serialnumber[0] == 0)) +// { +// return "{\"ret_status\": \"鍐呭鏈夎锛岃妫�鏌ワ紒\"}"; +// } + +// std::string str_cam_dev_id = std::string((char *) serialnumber);//鎽勫儚鏈篿d cam_mac + std::string str_imgName = appConfig.getStringProperty("cutPath"); if (str_imgName.back() != '/') { str_imgName.push_back('/'); } + str_imgName += ip; + 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); @@ -3084,3 +3131,28 @@ } } +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); + + + string postParams = perInfos.toStyledString(); + string str_addRes; + + m_requestWithCrul.curl_post_req(sendUrl, postParams, str_addRes); +} + -- Gitblit v1.8.0