From 118d5304c8744a3cb533164af6fbdc91229d6f3d Mon Sep 17 00:00:00 2001
From: xuxiuxi <554325746@qq.com>
Date: 星期五, 08 三月 2019 16:25:06 +0800
Subject: [PATCH] cam_dev add type code
---
QiaoJiaSystem/DataManagerServer/http_configserver.cpp | 456 +++++++++++++++++++++++++++++++++++++++++++++++---------
1 files changed, 378 insertions(+), 78 deletions(-)
diff --git a/QiaoJiaSystem/DataManagerServer/http_configserver.cpp b/QiaoJiaSystem/DataManagerServer/http_configserver.cpp
index bc399be..35bb566 100644
--- a/QiaoJiaSystem/DataManagerServer/http_configserver.cpp
+++ b/QiaoJiaSystem/DataManagerServer/http_configserver.cpp
@@ -21,6 +21,14 @@
//#include "HcRecord.h"
#include <time.h>
#include <dirent.h>
+#include "basic/pipe_element/ffmpeg/basic_struct_for_video_image.h"
+
+#include "vss/controller/VssDevTblController.h"
+#include "vss/controller/VssChannelTblController.h"
+#include "vss/controller/VssDomainUnitTblController.h"
+#include "vss/controller/VssLocalSettingTblController.h"
+#include "vss/controller/VssUpperSvrTblController.h"
+#include "vss/controller/CamDevController.h"
using namespace std;
@@ -65,10 +73,12 @@
void devHttpServer_c::init(void) {
std::string strDevId = appConfig.getStringProperty("DEV_ID");
+
// DSVAD010120181119
m_batch = strDevId.substr(5, 2);
m_SerialNumber = strDevId.substr(7, 2);
+ DBG("DevID: " << strDevId << " Batch: " << m_batch << " SerNum: " << m_SerialNumber);
fdfsClient.rwLock.wrlock();
fdfsClient.fastFds = new FastFds("WebFDSClient.conf");
@@ -240,6 +250,16 @@
std::placeholders::_3, std::placeholders::_4));
+ BaseDao::initConnection();
+ BaseSqliteDao::setLDBTool(&db_c);
+ VssDevTblController::instance()->registerHttpServices(_HttpSrvRetRecieve);
+ VssChannelTblController::instance()->registerHttpServices(_HttpSrvRetRecieve);
+ VssDomainUnitTblController::instance()->registerHttpServices(_HttpSrvRetRecieve);
+ VssLocalSettingTblController::instance()->registerHttpServices(_HttpSrvRetRecieve);
+ CamDevController::instance()->registerHttpServices(_HttpSrvRetRecieve);
+ VssUpperSvrTblController::instance()->registerHttpServices(_HttpSrvRetRecieve);
+
+
_HttpSrvRetRecieve.start();
_HttpSrvRetRecieve.waitForShutDown();
}
@@ -395,6 +415,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 +423,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;
}
@@ -946,8 +969,10 @@
void devHttpServer_c::killVideoAnalysFromHCApp() const {
string local_passwd = appConfig.getStringProperty("localPasswd");
- string cmd_kill = "echo \"" + local_passwd + "\" | sudo -S pkill -9 VideoAnalysFrom";
- system(cmd_kill.c_str());
+ string cmd_kill_VideoAnalys = "echo \"" + local_passwd + "\" | sudo -S pkill -9 VideoAnalys";
+ system(cmd_kill_VideoAnalys.c_str());
+ string cmd_kill_VideoToIma = "echo \"" + local_passwd + "\" | sudo -S pkill -9 VideoToIma";
+ system(cmd_kill_VideoToIma.c_str());
DBG("system(\"sudo -S pkill -9 VideoAnalysFromHC\");");
}
@@ -997,8 +1022,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 +1037,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\": \"鍐呭鏈夎锛岃妫�鏌ワ紒\"}";
@@ -1025,7 +1052,7 @@
if ((!ret) || (serialnumber[0] == 0)) {
return "{\"ret_status\": \"鍐呭鏈夎锛岃妫�鏌ワ紒\"}";
}
-
+ rec.type = 0;
rec.str_cam_dev_id = QString::fromLatin1((const char *) serialnumber);//鎽勫儚鏈篿d cam_mac
rec.str_name = QString::fromStdString(value["str_name"].asString());
rec.str_addr = QString::fromStdString(value["str_addr"].asString());
@@ -1036,45 +1063,35 @@
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.str_reserved = QString::fromStdString(value["str_reserved"].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());
- 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,7 +1103,7 @@
db_c.updateConfigTableByDevType(DEV_CAMERA);
runAllApp();
}
- //edit camera's sdks
+ //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)) */
@@ -1430,12 +1447,12 @@
fdfsClient.rwLock.unlock();
}
- //# http client 127.0.0.1:9999/resetFdfs
- std::string http_cmd = "http://127.0.0.1:9999/resetFdfs";
- HttpRequestWithCrul httpRequestWithCrul;
- std::string response_bak = "";
- std::string postParams_bak = "";
- httpRequestWithCrul.curl_post_req("http://127.0.0.1:9999/resetFdfs", postParams_bak, response_bak);
+// //# http client 127.0.0.1:9999/resetFdfs
+// std::string http_cmd = "http://127.0.0.1:9999/resetFdfs";
+// HttpRequestWithCrul httpRequestWithCrul;
+// std::string response_bak = "";
+// std::string postParams_bak = "";
+// httpRequestWithCrul.curl_post_req("http://127.0.0.1:9999/resetFdfs", postParams_bak, response_bak);
}
} else {
return "{\"ret_status\": \"浼犺緭閿欒锛岃妫�鏌ワ紒\"}";
@@ -1860,30 +1877,86 @@
// 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;
+
+ 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;
- 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));
+// #todo
+ fieldValues.insert(std::make_pair("create_by", createBy));
+
+ 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 "";
}
+
+
+//// #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);
+// }
+
erlangDbTool->sendMessage();
std::string str_result = std::string("{\"result\":").append("\"" + std::to_string(ret) + "\"}");
@@ -2071,6 +2144,12 @@
std::string img_str = "http://";
if (fdfsClient.fastFds != nullptr) {
img_str.append(fdfsClient.fastFds->getIp() + "/").append(img_tmp);
+ img_url.swap(img_str);
+ }
+ } else {
+ std::string img_str = "http://";
+ if (fdfsClient.fastFds != nullptr) {
+ img_str.append(fdfsClient.fastFds->getIp() + "/").append(img_url);
img_url.swap(img_str);
}
}
@@ -2396,21 +2475,14 @@
}
}
-std::string devHttpServer_c::getAlarmImageFromVideoFile(std::string ip, unsigned int port, std::string content,
- PResponse &response) {
- DBG("ip:" << ip << "; port:" << port);
- DBG("content: " << content);
- Json::Reader reader;
- Json::Value value;
- try {
- if (reader.parse(content, value)) {
- std::string videoPath;
- std::string devId = value["videoNum"].asString();
- std::string picDate = value["picDate"].asString();
- //std::string path_uuid = videoPath;//value["path_uuid"].asString();
+std::string devHttpServer_c::getAlarmImageByPicDateAndDevId(const std::string &picDate, const std::string &devId,
+ PResponse &response) {
+ try {
+ if (!devId.empty() && !picDate.empty()) {
+ std::string videoPath;
qint64 sub;
- std::string path = getVideoPathByTime(picDate, devId, sub);
+ std::string path = getVideoPathByPicDate(picDate, devId, sub);
if (path.empty()) {
ERR("{\"error\":\"not find path\"}");
@@ -2502,12 +2574,10 @@
}
fdfsClient.rwLock.unlock();
std::string result("{\"img_url\":\"" + img_url + "\"}");
-// cout << result << endl;
return result;
} else {
response->write(SimpleWeb::StatusCode::server_error_not_implemented, "{\"error\":\"浼犺緭閿欒锛岃妫�鏌ワ紒\"}");
return "";
-// return "{\"error\":\"浼犺緭閿欒锛岃妫�鏌ワ紒\"}";
}
}
catch (std::exception ex) {
@@ -2518,28 +2588,155 @@
}
}
+
+std::string devHttpServer_c::getAlarmImageFromVideoFile(std::string ip, unsigned int port, std::string content,
+ PResponse &response) {
+ INFO("ip:" << ip << "; port:" << port << "content: " << content);
+ Json::Reader reader;
+ Json::Value value;
+ try {
+ if (reader.parse(content, value)) {
+ std::string devId = value["videoNum"].asString();
+ std::string picDate = value["picDate"].asString();
+ std::string imgKey = value["imgKey"].asString();
+ //鍏煎鏃х増鏈�
+ if (imgKey == "undefined" || imgKey.empty()) {
+ DBG("getAlarmImageByPicDateAndDevId " << imgKey);
+ return getAlarmImageByPicDateAndDevId(picDate, devId, response);
+ } else {
+ DBG("getAlarmImageByImageKeyAndDevId " << imgKey);
+ return getAlarmImageByImageKeyAndDevId(imgKey, devId, response);
+ }
+ } else {
+ response->write(SimpleWeb::StatusCode::server_error_not_implemented, "{\"error\":\"浼犺緭閿欒锛岃妫�鏌ワ紒\"}");
+ ERR("ImageURL:浼犺緭閿欒锛岃妫�鏌�");
+ return "";
+ }
+ }
+ catch (std::exception ex) {
+ std::string message = "{\"error\":\"寮傚父閿欒锛�";
+ message.append(const_cast<char *>(ex.what())).append("\"}");
+ response->write(SimpleWeb::StatusCode::server_error_not_implemented, message);
+ ERR("ImageURL:寮傚父閿欒 " << ex.what());
+ return "";
+ }
+}
+
+
+std::string devHttpServer_c::getAlarmImageByImageKeyAndDevId(const std::string &imgKey, const std::string &devId,
+ PResponse &response) {
+ try {
+ if (!devId.empty() && !imgKey.empty()) {
+ std::string videoPath;
+ std::string path = getVideoPathByImgKey(imgKey, devId);
+ if (path.empty()) {
+ ERR("Not Find Path: " << path);
+ return "{\"error\":\"鏈煡鍒拌棰戣矾寰刓"}";
+ }
+ videoPath.clear();
+ videoPath = path;
+
+ VideoName_s_t videoSt = VideoName_s_t::fromString(path);
+ ImageName_s_t imgSt = ImageName_s_t::fromString(imgKey);
+
+ //#todo 鎸夌収鏃堕棿鍛藉悕
+ std::string str_imgName(AppUtil::getTimeString() + ".jpg");// = "test.jpg";
+
+ auto frameIdDiff = imgSt.m_frameId - videoSt.m_startFrameId;
+ char selectExpBuff[32] = {0};
+ std::string strSelectTemplate = R"#( -vf "select=eq(n\,%d)")#";
+ sprintf(selectExpBuff, strSelectTemplate.c_str(), frameIdDiff - 1);
+ if (videoSt.Valid() && imgSt.Valid()) {
+ std::string cmd("ffmpeg -i '" + videoPath + "'" + std::string(selectExpBuff) + " -vframes 1" + " -y '" +
+ str_imgName + "'");
+ INFO("Video To Image Cmd: " << cmd);
+ system(cmd.c_str());
+ } else {
+ ERR("Parse Video and Image Failed Path: " << path << " ImageId: " << imgKey);
+ return "{\"error\":\"鏈煡鍒拌棰戣矾寰刓"}";
+ }
+
+ cv::Mat img = cv::imread(str_imgName);
+ if (img.empty()) {
+ ERR("{\"error\":\"Video File error\"}");
+ return "{\"error\":\"瑙嗛鏂囦欢閿欒\"}";
+ }
+
+ std::vector<unsigned char> buffer;
+ CvUtil::cvMat2Buffer(img, buffer);
+ std::string img_url = "http://";
+ fdfsClient.rwLock.rdlock();
+ if (fdfsClient.fastFds != nullptr) {
+ std::string t_strImg = "";
+ if (!fdfsClient.fastFds->uploadFile(buffer, t_strImg, "jpg")) {
+ img_url = "upload image fail";
+ ERR("Upload Image Failed " << str_imgName);
+ } else {
+ std::string str_tmp_cmd("rm -f '" + str_imgName + "'");
+ system(str_tmp_cmd.c_str());
+ img_url.append(t_strImg);
+ img_url.clear();
+ img_url = t_strImg;
+ }
+ }
+ fdfsClient.rwLock.unlock();
+ std::string result("{\"img_url\":\"" + img_url + "\"}");
+ INFO("ImageURL:" << img_url);
+ return result;
+ } else {
+ response->write(SimpleWeb::StatusCode::server_error_not_implemented, "{\"error\":\"浼犺緭閿欒锛岃妫�鏌ワ紒\"}");
+ ERR("ImageURL:浼犺緭閿欒锛岃妫�鏌�");
+ return "";
+ }
+ }
+ catch (std::exception ex) {
+ std::string message = "{\"error\":\"寮傚父閿欒锛�";
+ message.append(const_cast<char *>(ex.what())).append("\"}");
+ response->write(SimpleWeb::StatusCode::server_error_not_implemented, message);
+ ERR("ImageURL:寮傚父閿欒 " << ex.what());
+ return "";
+ }
+}
+
+
std::string
devHttpServer_c::getRecordVideoPath(std::string ip, unsigned int port, std::string content, PResponse &response) {
Json::Reader reader;
Json::Value value;
+ INFO("REQ From: " << ip << ":" << port << " Content:" << content);
if (reader.parse(content, value)) {
std::string devId = value["videoNum"].asString();
std::string picDate = value["picDate"].asString();
- qint64 sub;
- std::string path = getVideoPathByTime(picDate, devId, sub);
- if (path.empty()) {
+ std::string imgKey = value["imgKey"].asString();
+ std::string path;
- return "{\"ret_status\":\"鍐呭鏈夎锛岃妫�鏌ワ紒\"}";
+ //鍏煎鏃х増鏈�
+ if (imgKey == "undefined" || imgKey.empty()) {
+ qint64 sub;
+ path = getVideoPathByPicDate(picDate, devId, sub);
+ } else {
+ path = getVideoPathByImgKey(imgKey, devId);
+ }
+ //std::string path = getVideoPathByImgKey(imgKey, devId, sub);
+ ERR("VideoNum: " << devId << " PicDate: " << picDate << " imgKey: " << imgKey);
+ if (path.empty()) {
+ std::string strRsp = "{\"ret_status\":\"鍐呭鏈夎锛岃妫�鏌ワ紒\"}";
+ ERR("RSP:" << strRsp);
+ return strRsp;
} else {
std::string result = "{\"file_path\":\"" + path + "\"}";
+ INFO("RSP:" << result);
return result;
}
} else {
- return "{\"ret_status\":\"浼犺緭閿欒锛岃妫�鏌ワ紒\"}";
+ std::string strRsp = "{\"ret_status\":\"浼犺緭閿欒锛岃妫�鏌ワ紒\"}";
+ ERR("RSP:" << strRsp);
+ return strRsp;
}
}
+
std::string devHttpServer_c::findDevId(std::string ip, unsigned int port, std::string content, PResponse &response) {
@@ -2617,7 +2814,8 @@
return true;
}
-std::string devHttpServer_c::getVideoPathByTime(const std::string &time, const std::string &camId, qint64 &sub) {
+
+std::string devHttpServer_c::getVideoPathByPicDate(const std::string &time, const std::string &camId, qint64 &sub) {
std::string t_FilePath = appConfig.getStringProperty("cutPath");
bool find = false;
@@ -2677,6 +2875,70 @@
}
+
+std::string devHttpServer_c::GetVideoNameByImgKey(const std::string &imgKey, const std::string &strPath) {
+ static std::mutex g_mutex;
+ std::lock_guard<std::mutex> lock(g_mutex);
+ std::vector<std::string> vec = forEachFileByImgKey(strPath);
+ ImageName_s_t imgSt = ImageName_s_t::fromString(imgKey);
+ if (!imgSt.Valid()) {
+ ERR("ParseImageName Failed : " << imgKey);
+ return "";
+ }
+ std::vector<VideoName_s_t> videoStVec;
+ for (const auto &item : vec) {
+ auto videoParseResult = VideoName_s_t::fromString(item);
+ if (videoParseResult.Valid()) {
+ if (videoParseResult.m_startFrameId <= imgSt.m_frameId &&
+ imgSt.m_frameId <= videoParseResult.m_endFrameId) {
+ auto imgTm = AppUtil::ParseFromHypenTimeStr(imgSt.m_timeStamp);
+ auto videoTm = AppUtil::ParseFromHypenTimeStr(videoParseResult.m_timeStamp);
+ if (AppUtil::IsRightAfterLeft(imgTm, videoTm)) {
+ videoStVec.emplace_back(videoParseResult);
+ INFO("Image " << imgKey << " Video: " << item << " Match");
+ } else {
+ ERR("Image " << imgKey << " Video: " << item << " Not Match");
+ }
+ } else {
+ ERR("ImageID: " << imgSt.m_frameId << " VideoRange: " << videoParseResult.m_startFrameId << " , "
+ << videoParseResult.m_endFrameId);
+ }
+
+ } else {
+ ERR("VideoName : " << item << " Parse Failed");
+ }
+ }
+
+ if (videoStVec.size() >= 1) {
+ std::string strVideoName = strPath + videoStVec[0].ToVideoName();
+ INFO("ImageName: " << imgKey << " SingleMatchVideo: " << strVideoName);
+ return strVideoName;
+ } else {
+ ERR("ImageName: " << imgKey << " MatchVideoCount: " << videoStVec.size());
+ for (auto &item:vec) {
+ ERR("VideoName: " << item);
+ }
+ return "";
+ }
+}
+
+//鏂扮殑鏍规嵁鍥剧墖鍚嶇О鑾峰彇璺緞鐨勬柟娉�
+std::string devHttpServer_c::getVideoPathByImgKey(const std::string &imgKey, const std::string &camId) {
+ INFO("GetVideoFor: " << imgKey << " CamID:" << camId);
+ ImageName_s_t imgSt = ImageName_s_t::fromString(imgKey);
+
+ struct tm imgTime = AppUtil::ParseFromHypenTimeStr(imgSt.m_timeStamp);
+ char curFolder[128] = {0};
+ // 201901/26/2019012614 ---- 201901/26/2019012615 {骞存湀}/{鏃/{骞存湀鏃ユ椂}/
+ sprintf(curFolder, "%04d%02d/%02d/%04d%02d%02d%02d/", imgTime.tm_year + 1900, imgTime.tm_mon + 1,
+ imgTime.tm_mday,
+ imgTime.tm_year + 1900, imgTime.tm_mon + 1, imgTime.tm_mday, imgTime.tm_hour);
+ std::string t_FilePath = appConfig.getStringProperty("cutPath");
+ std::string videoPath = t_FilePath + "/" + camId + "/" + std::string(curFolder);
+ return GetVideoNameByImgKey(imgKey, videoPath);
+}
+
+
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/,//");
@@ -2701,6 +2963,7 @@
return len_ms;
}
+//鑾峰彇鏌愪釜鐩綍涓嬬殑鎵�鏈夋枃浠讹紝涓嶅甫鎵╁睍鍚�
std::vector<std::string> devHttpServer_c::forEachFile(const std::string &dir_name) {
std::vector<std::string> v;
auto dir = opendir(dir_name.data());
@@ -2714,6 +2977,26 @@
temp = filename.substr(0, filename.rfind('.'));
v.push_back(temp);
+ }
+
+ }
+ closedir(dir);
+ }
+ return v;
+}
+
+//鑾峰彇鏌愪釜鐩綍涓嬬殑鎵�鏈夋枃浠讹紝甯︽墿灞曞悕
+std::vector<std::string> devHttpServer_c::forEachFileByImgKey(const std::string &dir_name) {
+ std::vector<std::string> v;
+ auto dir = opendir(dir_name.data());
+ struct dirent *ent;
+ int len = 0;
+ if (dir) {
+ while ((ent = readdir(dir)) != NULL) {
+ std::string filename = std::string(ent->d_name);
+ std::string temp;
+ if (filename != "." && filename != "..") {
+ v.push_back(filename);
}
}
@@ -3046,13 +3329,29 @@
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);
+ 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());
@@ -3069,13 +3368,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();
--
Gitblit v1.8.0