From 9bbbe29c81aa9cd183e840232f2bd973937d1ef4 Mon Sep 17 00:00:00 2001 From: pansen <pansen626@sina.com> Date: 星期二, 15 一月 2019 17:17:37 +0800 Subject: [PATCH] Merge remote-tracking branch 'origin/ywv1.2' into ywv1.2 --- QiaoJiaSystem/DataManagerServer/http_configserver.cpp | 116 ++++++++++++++++++++++++++++++++++++++++++++------------- 1 files changed, 89 insertions(+), 27 deletions(-) diff --git a/QiaoJiaSystem/DataManagerServer/http_configserver.cpp b/QiaoJiaSystem/DataManagerServer/http_configserver.cpp index c857f11..9b2ad85 100644 --- a/QiaoJiaSystem/DataManagerServer/http_configserver.cpp +++ b/QiaoJiaSystem/DataManagerServer/http_configserver.cpp @@ -997,7 +997,8 @@ 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); @@ -1009,13 +1010,14 @@ Record_Cam_Dev rec; Record_Cam_Sdk rec_sdk_old; Record_Cam_Sdk rec_sdk; - + int type=-1; int dev_type = db_c.searchDevTypeFromConfigTable(); if (DEV_STORAGE == dev_type) { return "{\"ret_status\": \"鍐呭鏈夎锛岃妫�鏌ワ紒\"}"; } if (reader.parse(content, value)) { + unsigned char serialnumber[SERIALNO_LEN] = {0}; ret = getDevSerialNumber(value["str_ip"].asCString(), value["n_port"].asInt(), value["str_username"].asCString(), \ @@ -1034,18 +1036,48 @@ 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(); // 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()); - - ret = db_c.updateCamAndSdkTable(rec, rec_sdk); - if (!ret) { - return "err_db_content"; + 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); + if (!ret) { + return "err_db_content"; + } + } + else + { + return "{\"ret_status\": \"鍐呭鏈夎锛岃妫�鏌ワ紒\"}"; + } + } + else + { + return "{\"ret_status\": \"鍐呭鏈夎锛岃妫�鏌ワ紒\"}"; + } + + } else { return "{\"ret_status\": \"浼犺緭閿欒锛岃妫�鏌ワ紒\"}"; } @@ -1673,6 +1705,7 @@ appConfig.setStringProperty("erlCookie", cookie); appConfig.setStringProperty("erlPath", path); appConfig.setStringProperty("erlFatherNode", FatherNodeName); + appConfig.setStringProperty("clusterID", clusterID); appConfig.save(); // erlangDbTool->findAllNode(); //face search server reboot @@ -1684,6 +1717,7 @@ appConfig.setStringProperty("erlCookie", ""); appConfig.setStringProperty("erlPath", ""); appConfig.setStringProperty("erlFatherNode", ""); + appConfig.setStringProperty("clusterID", ""); appConfig.save(); delete erlangDbTool; erlangDbTool = nullptr; @@ -2010,10 +2044,38 @@ 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); +// } +// } 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); + } + } + 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()); @@ -2040,9 +2102,10 @@ if (faceResults.size() <= 0) { response->write(SimpleWeb::StatusCode::server_error_not_implemented, "{\"error\":\"not found face\"}"); -// string str_path = "./img/"; -// str_path.append(AppUtil::getTimeString() + ".jpg"); -// cv::imwrite(str_path, image); + 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) { @@ -2077,7 +2140,6 @@ } } fdfsClient.rwLock.unlock(); - } auto size = feature_base64.size(); // std::string uuid = ""; @@ -2387,26 +2449,26 @@ std::string str_tmpTime = AppUtil::getCmdResult(cmd_getVideoFileTime); - if (str_time > str_tmpTime) { //str_time = str_tmpTime.size() > 0 ? str_tmpTime : str_time; - qint64 v_time=getVideoTime(str_tmpTime)-1000; - int haomiao = (v_time % 1000) > 50 ? ((v_time % 1000) - 50) : 0; - v_time /= 1000; - int m = v_time; - int shi, fen, miao; - char ch_time[128]; - if (m / 3600 < 24) { - shi = m / 3600; - fen = m / 60 % 60; - miao = m % 60; - sprintf(ch_time, "%02d:%02d:%02d.%02d", shi, fen, miao, haomiao / 10); + qint64 v_time = getVideoTime(str_tmpTime) - 1000; + int haomiao = (v_time % 1000) > 50 ? ((v_time % 1000) - 50) : 0; + v_time /= 1000; + int m = v_time; + int shi, fen, miao; + char ch_time[128]; + if (m / 3600 < 24) { + shi = m / 3600; + fen = m / 60 % 60; + miao = m % 60; + sprintf(ch_time, "%02d:%02d:%02d.%02d", shi, fen, miao, haomiao / 10); - } else printf("杈撳叆鏁板�煎お澶�"); + } else printf("杈撳叆鏁板�煎お澶�"); - str_time=ch_time; - ERR("{\"error\":\"Time error\"}" << str_time << " str_tmpTime " << str_tmpTime<<" ch_time="<<ch_time); + str_time = ch_time; + ERR("{\"error\":\"Time error\"}" << str_time << " str_tmpTime " << str_tmpTime << " ch_time=" + << ch_time); // return "{\"error\":\"Time error\"}"; } @@ -2614,7 +2676,7 @@ } -qint64 devHttpServer_c::getVideoTime(/*const std::string &videoPath,*/std::string& str_tmpTime) { +qint64 devHttpServer_c::getVideoTime(/*const std::string &videoPath,*/std::string &str_tmpTime) { // std::string cmd_getVideoFileTime( // " ffmpeg -i '" + videoPath + "' 2>&1 | grep 'Duration' | cut -d ' ' -f 4 | sed s/,//"); -- Gitblit v1.8.0