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 | 653 +++++++++++++++++++++++++++++++++++++++++++++++------------
1 files changed, 517 insertions(+), 136 deletions(-)
diff --git a/QiaoJiaSystem/DataManagerServer/http_configserver.cpp b/QiaoJiaSystem/DataManagerServer/http_configserver.cpp
index eee56d7..942b392 100644
--- a/QiaoJiaSystem/DataManagerServer/http_configserver.cpp
+++ b/QiaoJiaSystem/DataManagerServer/http_configserver.cpp
@@ -226,6 +226,20 @@
std::bind(&devHttpServer_c::editDevId, this,
std::placeholders::_1, std::placeholders::_2,
std::placeholders::_3, std::placeholders::_4));
+ _HttpSrvRetRecieve.setInfo("^/findSdkRule$", "POST",
+ std::bind(&devHttpServer_c::findSdkRule, this,
+ std::placeholders::_1, std::placeholders::_2,
+ std::placeholders::_3, std::placeholders::_4));
+ _HttpSrvRetRecieve.setInfo("^/editSdkRule$", "POST",
+ std::bind(&devHttpServer_c::editSdkRule, this,
+ std::placeholders::_1, std::placeholders::_2,
+ std::placeholders::_3, std::placeholders::_4));
+ _HttpSrvRetRecieve.setInfo("^/getSnapshot$", "POST",
+ std::bind(&devHttpServer_c::getSnapshot, this,
+ std::placeholders::_1, std::placeholders::_2,
+ std::placeholders::_3, std::placeholders::_4));
+
+
_HttpSrvRetRecieve.start();
_HttpSrvRetRecieve.waitForShutDown();
}
@@ -381,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;
}
@@ -388,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;
}
@@ -969,10 +986,10 @@
elem["str_brand"] = iter->str_brand.toStdString();
elem["str_reserved"] = iter->str_reserved.toStdString();
- Record_Cam_Sdk rec_sdk = db_c.searchCamSdkTableByCamId(iter->str_cam_dev_id);
- elem["str_sdks"] = rec_sdk.str_sdks.toStdString();
- elem["str_det_thr"] = rec_sdk.str_det_thr.toStdString();
- elem["str_cmp_thr"] = rec_sdk.str_cmp_thr.toStdString();
+// Record_Cam_Sdk rec_sdk = db_c.searchCamSdkTableByCamId(iter->str_cam_dev_id);
+// elem["str_sdks"] = rec_sdk.str_sdks.toStdString();
+// elem["str_det_thr"] = rec_sdk.str_det_thr.toStdString();
+// elem["str_cmp_thr"] = rec_sdk.str_cmp_thr.toStdString();
cout << elem.toStyledString() << endl;
@@ -983,6 +1000,9 @@
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) {
@@ -995,13 +1015,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(), \
@@ -1020,18 +1041,37 @@
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_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";
+// 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);
+ if (!ret) {
+ return "err_db_content";
+ }
+ } else {
+ return "{\"ret_status\": \"鍐呭鏈夎锛岃妫�鏌ワ紒\"}";
+ }
+ } else {
+ return "{\"ret_status\": \"鍐呭鏈夎锛岃妫�鏌ワ紒\"}";
}
+
+
} else {
return "{\"ret_status\": \"浼犺緭閿欒锛岃妫�鏌ワ紒\"}";
}
@@ -1043,7 +1083,8 @@
//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)) */{
+ (rec_sdk_old.str_cmp_thr != rec_sdk.str_cmp_thr)) */
+ {
killVideoAnalysFromHCApp();
sleep(1);
runAllApp();
@@ -1435,8 +1476,8 @@
if (reader.parse(content, value)) {
int cut_max_duration = value["cut_max_duration"].asInt();
-
- ret = db_c.updateConfigTableByCutDuration(cut_max_duration);
+ int cut_min_duration = value["cut_min_duration"].asInt();
+ ret = db_c.updateConfigTableByCutDuration(cut_max_duration, cut_min_duration);
} else {
return "{\"ret_status\": \"浼犺緭閿欒锛岃妫�鏌ワ紒\"}";
@@ -1460,10 +1501,11 @@
Json::Value value;
- int cut_max_duration = db_c.searchConfigTableWithinCutDuration();
- value["cut_max_duration"] = cut_max_duration;
+ Record_Config rec = db_c.searchConfigTableWithinServerInfo();
+ value["cut_max_duration"] = rec.n_cut_max_duration;
+ value["cut_min_duration"] = rec.n_cut_min_duration;
std::string out = value.toStyledString();
return out;
@@ -1658,6 +1700,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
@@ -1669,6 +1712,7 @@
appConfig.setStringProperty("erlCookie", "");
appConfig.setStringProperty("erlPath", "");
appConfig.setStringProperty("erlFatherNode", "");
+ appConfig.setStringProperty("clusterID", "");
appConfig.save();
delete erlangDbTool;
erlangDbTool = nullptr;
@@ -1810,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) + "\"}");
@@ -1846,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);
@@ -1867,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;
@@ -1915,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);
}
@@ -1957,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);
}
@@ -1995,33 +2082,27 @@
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
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) {
- img_url = "http://";
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);
-
- 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();
} else {
response->write(SimpleWeb::StatusCode::server_error_not_implemented, "{\"error\":\"not found img\"}");
return "";
@@ -2041,30 +2122,60 @@
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) {
+ 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) {
- 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;
@@ -2080,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) {
@@ -2096,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 {
@@ -2238,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) + "\"}");
@@ -2336,7 +2460,7 @@
// sub = sub > 3000 ? sub - 3000 : 0000;
//shijian yuejie buchang
// sub = sub < 0 ? 0000 : sub;
- int haomiao = sub % 1000;
+ int haomiao = (sub % 1000) > 50 ? ((sub % 1000) - 50) : 0;
sub /= 1000;
int m = sub;
int shi, fen, miao;
@@ -2345,10 +2469,10 @@
shi = m / 3600;
fen = m / 60 % 60;
miao = m % 60;
- sprintf(ch_time, "%02d:%02d:%02d.%03d", shi, fen, miao, haomiao);
- cout << ch_time << endl;
- } else printf("杈撳叆鏁板�煎お澶�");
+ sprintf(ch_time, "%02d:%02d:%02d.%02d", shi, fen, miao, haomiao / 10);
+ } else printf("杈撳叆鏁板�煎お澶�");
+ DBG("ch_time" << ch_time);
std::string str_time(ch_time);
//#todo 鎸夌収鏃堕棿鍛藉悕
std::string str_imgName(AppUtil::getTimeString() + ".jpg");// = "test.jpg";
@@ -2358,9 +2482,27 @@
std::string str_tmpTime = AppUtil::getCmdResult(cmd_getVideoFileTime);
+
if (str_time > str_tmpTime) {
- ERR("{\"error\":\"Time error\"}" << str_time << " str_tmpTime " << str_tmpTime);
- str_time = str_tmpTime.size() > 0 ? str_tmpTime.substr(0, str_tmpTime.rfind(".")) : str_time;
+
+ //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);
+
+ } else printf("杈撳叆鏁板�煎お澶�");
+
+ str_time = ch_time;
+ ERR("{\"error\":\"Time error\"}" << str_time << " str_tmpTime " << str_tmpTime << " ch_time="
+ << ch_time);
// return "{\"error\":\"Time error\"}";
}
@@ -2511,7 +2653,7 @@
std::string devHttpServer_c::getVideoPathByTime(const std::string &time, const std::string &camId, qint64 &sub) {
std::string t_FilePath = appConfig.getStringProperty("cutPath");
- bool find = false;;
+ bool find = false;
if (t_FilePath.back() != '/') {
t_FilePath.push_back('/');
}
@@ -2528,8 +2670,8 @@
qint64 t = dt.toMSecsSinceEpoch();
std::vector<std::string> vec = forEachFile(t_FilePath);
std::sort(vec.begin(), vec.end());
- DBG("t_FilePath" << t_FilePath);
- DBG("vec.size()" << vec.size());
+// DBG("t_FilePath" << t_FilePath);
+// DBG("vec.size()" << vec.size());
int size = vec.size();
for (int i = 0; i < size; ++i) {
qint64 t1 = QDateTime::fromString(QString::fromStdString(vec[i]),
@@ -2541,16 +2683,19 @@
DBG("path=" << vec[i]);
t_FilePath += vec[i] + ".mp4";
sub = t - t1;
- find = true;
+// find = sub < getVideoTime(t_FilePath);
break;
}
} else {
sub = t - t1;
- if (t >= t1 && sub <= 3000) {
+ if (t >= t1) {
DBG("path=" << vec[i]);
t_FilePath += vec[i] + ".mp4";
- find = true;
+
+// find = sub < getVideoTime(t_FilePath);
+
+ DBG("find:" << find);
break;
}
}
@@ -2558,11 +2703,35 @@
}
DBG("sub=" << sub);
- if (!find) {
- t_FilePath = "";
- }
+// if (!find) {
+// t_FilePath = "";
+// }
return t_FilePath;
+}
+
+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/,//");
+
+// str_tmpTime = AppUtil::getCmdResult(cmd_getVideoFileTime);
+ DBG("str_tmpTime:" << str_tmpTime);//00:00:06.89
+ qint64 len_ms = 0;
+
+ QStringList list = QString::fromStdString(str_tmpTime).split(":");
+ if (list.size() == 3) {
+ len_ms = list[0].toInt() * 60 * 60 * 1000;
+ len_ms += list[1].toInt() * 60 * 1000;
+
+ QStringList s = list[2].split(".");
+ if (s.size() == 2) {
+ len_ms += s[0].toInt() * 1000;
+ len_ms += s[1].toInt() * 10;
+ }
+
+ }
+ DBG("len_ms:" << len_ms);
+ return len_ms;
}
std::vector<std::string> devHttpServer_c::forEachFile(const std::string &dir_name) {
@@ -2774,4 +2943,216 @@
return "";
// return "{\"error\":\"浼犺緭閿欒锛岃妫�鏌ワ紒\"}";
}
-}
\ No newline at end of file
+}
+
+std::string devHttpServer_c::editSdkRule(std::string ip, unsigned int port, std::string content, PResponse &response) {
+ Json::Reader reader;
+ Json::Value value;
+ Json::FastWriter writer;
+ if (reader.parse(content, value)) {
+ SdkRule rule;
+ rule.nSdkType = value["nSdkType"].asInt();
+ rule.nAlarmNumLowerLimit = value["nAlarmNumLowerLimit"].asInt();
+ rule.nAlarmNumUpperLimit = value["nAlarmNumUpperLimit"].asInt();
+ rule.nTriggerDelay = value["nTriggerDelay"].asInt();
+ rule.nTriggerTolerance = value["nTriggerTolerance"].asInt();
+ rule.nThreshold = value["nThreshold"].asInt();
+ rule.nQuality = value["nQuality"].asInt();
+ rule.nIsRun = value["nIsRun"].asInt();
+ rule.strBroadcast = value["nIsBroadcast"].asCString();
+ rule.strAreas = value["strAreas"].asCString();
+ rule.strCamId = value["strCamId"].asCString();
+ rule.strExAreas = value["strExAreas"].asCString();
+ rule.strLine = value["strLine"].asCString();
+ rule.strExLine = value["strExLine"].asCString();
+ if (rule.strCamId.isEmpty()) {
+ return "{\"ret_status\":\"鍐呭鏈夎锛岃妫�鏌ワ紒\"}";
+ }
+ if (rule.nSdkType <= SdkTypeStart || rule.nSdkType >= SdkTypeEnd) {
+ return "{\"ret_status\":\"鍐呭鏈夎锛岃妫�鏌ワ紒\"}";
+ }
+
+ for (int i = 0; i < value["weekRuleArray"].size(); ++i) {
+ Json::Value item = value["weekRuleArray"][i];
+ LActRuleWeekRecord weekRule;
+ weekRule.m_nSdkType = rule.nSdkType;
+ weekRule.m_nType = item["nType"].asInt();
+ weekRule.m_strCamId = rule.strCamId;
+ weekRule.m_strBegin = item["strBegin"].asCString();
+ weekRule.m_strEnd = item["strEnd"].asCString();
+ //rule.weekRuleVec.push_back(weekRule);
+ db_c.updateCameraWeekRule(weekRule);
+ }
+
+
+ if (db_c.updateSdkRule(rule)) {
+// if(rule.nIsRun==1)
+
+ killVideoAnalysFromHCApp();
+ sleep(1);
+ runAllApp();
+
+
+ return "{\"ret_status\": \"ok_ack\"}";
+ } else {
+ return "{\"ret_status\":\"鍐呭鏈夎锛岃妫�鏌ワ紒\"}";
+ }
+ } else {
+ return "{\"error\":\"浼犺緭閿欒锛岃妫�鏌ワ紒\"}";
+ }
+}
+
+std::string devHttpServer_c::findSdkRule(std::string ip, unsigned int port, std::string content, PResponse &response) {
+ Json::Reader reader;
+ Json::Value value;
+
+ if (reader.parse(content, value)) {
+
+ QString strCamId = value["strCamId"].asCString();
+
+ SdkRuleMap ruleMap = db_c.searchSdkRuleByCamId(strCamId);
+
+ int count = ruleMap.size();
+
+ if (count > 0) {
+ Json::Value objs;
+ Json::Value obj;
+
+ for (auto rule:ruleMap) {
+ obj["nSdkType"] = rule.second.nSdkType;
+ obj["nAlarmNumLowerLimit"] = rule.second.nAlarmNumLowerLimit;
+ obj["nAlarmNumUpperLimit"] = rule.second.nAlarmNumUpperLimit;
+ obj["nTriggerDelay"] = rule.second.nTriggerDelay;
+ obj["nTriggerTolerance"] = rule.second.nTriggerTolerance;
+ obj["nThreshold"] = rule.second.nThreshold;
+ obj["nQuality"] = rule.second.nQuality;
+ obj["nIsRun"] = rule.second.nIsRun;
+ obj["nIsBroadcast"] = rule.second.strBroadcast.toStdString();
+ obj["strAreas"] = rule.second.strAreas.toStdString();
+ obj["strCamId"] = rule.second.strCamId.toStdString();
+ obj["strExAreas"] = rule.second.strExAreas.toStdString();
+ obj["strLine"] = rule.second.strLine.toStdString();
+ obj["strExLine"] = rule.second.strExLine.toStdString();
+ Json::Value weekRuleArray;
+
+
+ Json::Value weekRule;
+ std::vector<LActRuleWeekRecord> weekRuleVec = db_c.searchCameraWeekRuleByCamId(strCamId, rule.first);
+ for (int k = 0; k < weekRuleVec.size(); ++k) {
+ Json::Value weekRuleObj;
+ weekRuleObj["nSdkType"] = weekRuleVec[k].m_nSdkType;
+ weekRuleObj["strCamId"] = weekRuleVec[k].m_strCamId.toStdString();
+ weekRuleObj["strBegin"] = weekRuleVec[k].m_strBegin.toStdString();
+ weekRuleObj["strEnd"] = weekRuleVec[k].m_strEnd.toStdString();
+ weekRuleObj["nType"] = weekRuleVec[k].m_nType;
+ weekRule.append(weekRuleObj);
+ }
+ //weekRuleArray[j]=weekRule;
+
+
+ obj["weekRuleArray"] = weekRule;
+ objs.append(obj);
+ }
+ return objs.toStyledString();
+ } else {
+// return "{\"ret_status\":\"鍐呭鏈夎锛岃妫�鏌ワ紒\"}";
+ return "[]";
+ }
+ } else {
+ return "{\"error\":\"浼犺緭閿欒锛岃妫�鏌ワ紒\"}";
+ }
+}
+
+std::string devHttpServer_c::getSnapshot(std::string ip, unsigned int port, std::string content, PResponse &response) {
+ Json::Reader reader;
+ Json::Value value;
+
+ if (reader.parse(content, value)) {
+
+ std::string ip = value["str_ip"].asString();
+// int port= value["n_port"].asInt();
+ int port = 554;
+ std::string username = value["str_username"].asString();
+ std::string pass = value["str_password"].asString();
+ std::string brand = value["str_brand"].asString();
+ std::string rtsp_url = rtspAddrBuild(ip, port, username, pass, brand);
+ 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);
+ DBG(cmd);
+ system(cmd.c_str());
+
+ cv::Mat img = cv::imread(str_imgName);
+
+ if (img.empty()) {
+
+ return "{\"ret_status\":\"鍐呭鏈夎锛岃妫�鏌ワ紒\"}";
+ }
+ fdfsClient.rwLock.rdlock();
+ std::string strImgUrl = "http://";
+ if (fdfsClient.fastFds != nullptr) {
+ std::vector<unsigned char> buffer;
+ CvUtil::cvMat2Buffer(img, buffer);
+ std::string strImgUrlTmp = "";
+ fdfsClient.fastFds->uploadFile(buffer, strImgUrlTmp, "jpg");
+ strImgUrl.append(fdfsClient.fastFds->getIp() + "/" + strImgUrlTmp);
+ strImgUrl.clear();
+ strImgUrl = strImgUrlTmp;
+ }
+ fdfsClient.rwLock.unlock();
+ Json::Value result;
+ result["imgUrl"] = strImgUrl;
+
+ return result.toStyledString();
+
+
+ } else {
+ return "{\"error\":\"浼犺緭閿欒锛岃妫�鏌ワ紒\"}";
+ }
+}
+
+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