From a2673edc68a502f9a88ddf8e42f4aded9a8d94ef Mon Sep 17 00:00:00 2001
From: pansen <pansen626@sina.com>
Date: 星期二, 02 四月 2019 18:48:31 +0800
Subject: [PATCH] 修改信息结构
---
QiaoJiaSystem/DataManagerServer/http_configserver.cpp | 10 +-
QiaoJiaSystem/DataManagerServer/CMakeLists.txt | 5
QiaoJiaSystem/FaceDetectServer/CMakeLists.txt | 2
QiaoJiaSystem/DataManagerServer/http_configserver.h | 20 ++--
QiaoJiaSystem/DataManagerServer/web-server接口.txt | 4
QiaoJiaSystem/DataManagerServer/main.cpp | 2
QiaoJiaSystem/VideoToImageMulth/RtspAnalysManager.cpp | 152 +++++++++++++++++++++----------------
7 files changed, 107 insertions(+), 88 deletions(-)
diff --git a/QiaoJiaSystem/DataManagerServer/CMakeLists.txt b/QiaoJiaSystem/DataManagerServer/CMakeLists.txt
index 93c317d..e2339d3 100644
--- a/QiaoJiaSystem/DataManagerServer/CMakeLists.txt
+++ b/QiaoJiaSystem/DataManagerServer/CMakeLists.txt
@@ -54,6 +54,7 @@
../../../BasicPlatForm/basic/util/app/
#nsq
+ ../../../BasicPlatForm/libs/EvnsqTool/
../../../BasicPlatForm/libs/EvnsqTool/include
../../../BasicPlatForm/libs/libevent/include
@@ -113,14 +114,14 @@
../../../BasicPlatForm/basic/timer_counter/Clocktimer.cpp
-
../../syncDBTool/ErlangDbTool.cpp
#
../LocalDBTool/GetUUId.cpp
../LocalDBTool/SqliteFaceEncap.cpp
../../../BasicPlatForm/basic/db/sqlite/sqliteEncapsulation.cpp
../../../BasicPlatForm/basic/db/sqlite/sqliteEncapsulation.h
- vss/dao/BaseDao.cpp)
+ vss/dao/BaseDao.cpp
+ )
target_link_libraries(DataWebServer
glog
diff --git a/QiaoJiaSystem/DataManagerServer/http_configserver.cpp b/QiaoJiaSystem/DataManagerServer/http_configserver.cpp
index b53818f..f1d76be 100644
--- a/QiaoJiaSystem/DataManagerServer/http_configserver.cpp
+++ b/QiaoJiaSystem/DataManagerServer/http_configserver.cpp
@@ -34,7 +34,7 @@
using namespace std;
devHttpServer_c::devHttpServer_c()
- : _HttpSrvRetRecieve("0.0.0.0", 8083, 1), erlangDbTool(nullptr), m_SqliteFaceEncap("LocalDataDB"){
+ : _HttpSrvRetRecieve("0.0.0.0", 8083, 1), erlangDbTool(nullptr), m_SqliteFaceEncap("LocalDataDB") {
init();
}
@@ -1534,10 +1534,12 @@
}
if (ret) {
- //todo
+ //todo VideoToImageMulth
{
- std::string topic = "cut_dura_edit";
- std::string msg = content;
+ std::string topic = "VideoToImageMulth";
+ Json::Value json_cfg;
+ json_cfg["cut_dura_edit"] = content;
+ std::string msg = json_cfg.toStyledString();
DBG("msg:" << msg);
nsqMsgProducer->Publish(topic, (void *) (&msg));
}
diff --git a/QiaoJiaSystem/DataManagerServer/http_configserver.h b/QiaoJiaSystem/DataManagerServer/http_configserver.h
index 559119b..cec426b 100644
--- a/QiaoJiaSystem/DataManagerServer/http_configserver.h
+++ b/QiaoJiaSystem/DataManagerServer/http_configserver.h
@@ -19,7 +19,8 @@
#include <atomic>
#include "../FaceSearchServer/CasiaFaceWrapper/CasiaFaceWrapperN.h"
#include "AppPipeController.h"
-#include "NsqMsgTool.hpp"
+
+#include <NsqMsgTool.hpp>
typedef std::shared_ptr<HttpServer::Response> PResponse;
@@ -108,11 +109,8 @@
std::string loadFaceFeaData(std::string ip, unsigned int port, std::string content, PResponse &response);
-
+
std::string getAlarmImageFromVideoFile(std::string ip, unsigned int port, std::string content, PResponse &response);
-
-
-
std::string getRecordVideoPath(std::string ip, unsigned int port, std::string content, PResponse &response);
@@ -186,7 +184,7 @@
unsigned char *serialNumber = NULL) const;
bool createDevId(const int &dev_batch, const int &dev_sequence);
-
+
std::vector<std::string> forEachFile(const std::string &dir_name);
@@ -194,12 +192,12 @@
//鏍规嵁PicDate鑾峰彇鎶ヨ鍥�
- std::string getAlarmImageByPicDateAndDevId(const std::string& picDate,const std::string& devId,
- PResponse &response);
+ std::string getAlarmImageByPicDateAndDevId(const std::string &picDate, const std::string &devId,
+ PResponse &response);
//鏍规嵁ImgKey鑾峰彇鎶ヨ鍥�
- std::string getAlarmImageByImageKeyAndDevId(const std::string& imgKey,const std::string& devId,
- PResponse &response);
+ std::string getAlarmImageByImageKeyAndDevId(const std::string &imgKey, const std::string &devId,
+ PResponse &response);
//鏍规嵁PicData鑾峰彇瑙嗛璺緞
std::string getVideoPathByPicDate(const std::string &picDate, const std::string &camId, qint64 &sub);
@@ -211,7 +209,7 @@
std::vector<std::string> forEachFileByImgKey(const std::string &dir_name);
//鏍规嵁ImgKey鑾峰彇瑙嗛鍚�
- std::string GetVideoNameByImgKey(const std::string& imgKey,const std::string& strPath);
+ std::string GetVideoNameByImgKey(const std::string &imgKey, const std::string &strPath);
};
diff --git a/QiaoJiaSystem/DataManagerServer/main.cpp b/QiaoJiaSystem/DataManagerServer/main.cpp
index 42fa8c7..a9da77a 100644
--- a/QiaoJiaSystem/DataManagerServer/main.cpp
+++ b/QiaoJiaSystem/DataManagerServer/main.cpp
@@ -9,7 +9,7 @@
using namespace cv;
int main(int argc, char **argv) {
- std::cout<<__DATE__<<std::endl;
+ std::cout << __DATE__ << std::endl;
ENABLEGLOG(GET_STR_CONFIG("logPath").c_str());
// unsigned char gateway_addr[15] = {0};
diff --git "a/QiaoJiaSystem/DataManagerServer/web-server\346\216\245\345\217\243.txt" "b/QiaoJiaSystem/DataManagerServer/web-server\346\216\245\345\217\243.txt"
index 64c52f1..c8943af 100644
--- "a/QiaoJiaSystem/DataManagerServer/web-server\346\216\245\345\217\243.txt"
+++ "b/QiaoJiaSystem/DataManagerServer/web-server\346\216\245\345\217\243.txt"
@@ -287,8 +287,8 @@
//瑙嗛鏃堕暱璁剧疆 cut_dura_edit
涓嬪彂锛�
{
- "cut_max_duration" : 3
- "cut_min_duration" : 3
+ "cut_max_duration" : 3,
+ "cut_min_duration" : 3
}
杩斿洖锛氭爣鍑嗚繑鍥炲��
diff --git a/QiaoJiaSystem/FaceDetectServer/CMakeLists.txt b/QiaoJiaSystem/FaceDetectServer/CMakeLists.txt
index 1f1fa1b..e9016d3 100644
--- a/QiaoJiaSystem/FaceDetectServer/CMakeLists.txt
+++ b/QiaoJiaSystem/FaceDetectServer/CMakeLists.txt
@@ -53,7 +53,7 @@
../../../BasicPlatForm/libs/Casia_Face/FaceSdk/lib/gpu
#nsq
- ../../../BasicPlatForm/basic/mq/EvnsqTool/lib
+ ../../../BasicPlatForm/libs/EvnsqTool/lib
../../../BasicPlatForm/libs/libevent/lib
)
diff --git a/QiaoJiaSystem/VideoToImageMulth/RtspAnalysManager.cpp b/QiaoJiaSystem/VideoToImageMulth/RtspAnalysManager.cpp
index 9d0d2e3..ae0cd84 100644
--- a/QiaoJiaSystem/VideoToImageMulth/RtspAnalysManager.cpp
+++ b/QiaoJiaSystem/VideoToImageMulth/RtspAnalysManager.cpp
@@ -16,7 +16,8 @@
//nsq set callback func
DBG("NsqMsgConsumer Init");
- nsqMsgConsumer = new BasicMsg::Nsq::NsqMsgConsumer("127.0.0.1", "4150", "cut_dura_edit", to_string(appPref.getIntData("RpcVTIMPort")));
+ nsqMsgConsumer = new BasicMsg::Nsq::NsqMsgConsumer("127.0.0.1", "4150", "cut_dura_edit",
+ to_string(appPref.getIntData("RpcVTIMPort")));
nsqMsgConsumer->setMessageCallback(std::bind(&OnMsgFunc, std::placeholders::_1, this));
nsqMsgConsumer->init();
DBG("NsqMsgConsumer Init END!!");
@@ -30,83 +31,99 @@
Json::Reader reader;
Json::Value value;
if (reader.parse(msg->body.ToString(), value)) {
- int cut_max_duration = value["cut_max_duration"].asInt();
- int cut_min_duration = value["cut_min_duration"].asInt();
- DBG("cut_max_duration: " << cut_max_duration << " cut_min_duration: " << cut_min_duration);
- appPref.setIntData("n_cut_max_duration", cut_max_duration);
- appPref.setIntData("n_cut_min_duration", cut_min_duration);
+ auto itor_json_end = value.end();
+ Json::Value cfg_val;
+ for (auto itor_json = value.begin(); itor_json != itor_json_end; ++itor_json) {
+ if (itor_json->isString() && reader.parse(itor_json->asString(), cfg_val)) {
+ if (itor_json.name() == "cut_dura_edit") {
+ int cut_max_duration = cfg_val["cut_max_duration"].asInt();
+ int cut_min_duration = cfg_val["cut_min_duration"].asInt();
+ DBG("cut_max_duration: " << cut_max_duration << " cut_min_duration: " << cut_min_duration);
+ appPref.setIntData("n_cut_max_duration", cut_max_duration);
+ appPref.setIntData("n_cut_min_duration", cut_min_duration);
- DBG("cut_max_duration: " << cut_max_duration << " cut_min_duration: " << cut_min_duration);
+ DBG("cut_max_duration: " << cut_max_duration << " cut_min_duration: " << cut_min_duration);
// m_GB28181_Enable = appPref.getIntData("GB28181_Enable");
- //#todo GB28181
- if (pthis->m_GB28181_Enable) {
- DBG("searchCamDevTableByType before");
- auto lst = pthis->m_lDBTool->searchCamDevTableByType(1);
- DBG("searchCamDevTableByType size:" << lst.size());
+//*****************************#todo extract to func ************************************
+ //#todo GB28181
+ if (pthis->m_GB28181_Enable) {
+ DBG("searchCamDevTableByType before");
+ auto lst = pthis->m_lDBTool->searchCamDevTableByType(1);
+ DBG("searchCamDevTableByType size:" << lst.size());
+ if (lst.size() > 0) {
+ int startCamNO = appPref.getIntData("CamStartNO");
+ int CamCount = appPref.getIntData("CamEndNO") - appPref.getIntData("CamStartNO") + 1;
+ INFO("StartCamNO: " << startCamNO << " CamCount: " << CamCount);
+ auto itor = lst.begin();
- if (lst.size() > 0) {
- int startCamNO = appPref.getIntData("CamStartNO");
- int CamCount = appPref.getIntData("CamEndNO") - appPref.getIntData("CamStartNO") + 1;
- INFO("StartCamNO: " << startCamNO << " CamCount: " << CamCount);
- auto itor = lst.begin();
+ if (startCamNO >= lst.size()) {
+ ERR("startCamNO > lst.size()");
+ return;
+ }
- if (startCamNO >= lst.size()) {
- ERR("startCamNO > lst.size()");
- return;
- }
+ for (int i = 0; i < startCamNO; i++) {
+ itor++;
+ }
+ for (int i = 0; i < CamCount; i++) {
+ if (itor == lst.end()) {
+ ERR("itor == lst.end()");
+ return;
+ }
+ std::string t_camIdex = itor->str_cam_dev_id.toStdString();
+ DBG("-----camID:" << t_camIdex << "min:" << cut_min_duration << "max:"
+ << cut_max_duration);
+ pthis->m_controllers_videoCapElem[t_camIdex]->SetVideoMinMaxSeconds(cut_min_duration,
+ cut_max_duration);
+ itor++;
+ }
+ } else {
+ ERR("searchCamDevTableByType size is 0");
+ }
+ } else {
+ auto lst = pthis->m_lDBTool->searchCamDevTableByType(0);
+ if (lst.size() > 0) {
+ int startCamNO = appPref.getIntData("CamStartNO");
+ int CamCount = appPref.getIntData("CamEndNO") - appPref.getIntData("CamStartNO") + 1;
+ INFO("StartCamNO: " << startCamNO << " CamCount: " << CamCount);
+ auto itor = lst.begin();
- for (int i = 0; i < startCamNO; i++) {
- itor++;
- }
+ if (startCamNO >= lst.size()) {
+ ERR("startCamNO > lst.size()");
+ return;
+ }
- for (int i = 0; i < CamCount; i++) {
- if (itor == lst.end()) {
- ERR("itor == lst.end()");
- return;
+ for (int i = 0; i < startCamNO; i++) {
+ itor++;
+ }
+
+ for (int i = 0; i < CamCount; i++) {
+ if (itor == lst.end()) {
+ ERR("itor == lst.end()");
+ return;
+ }
+ std::string t_camIdex = itor->str_cam_dev_id.toStdString();
+ DBG("-----camID:" << t_camIdex << "min:" << cut_min_duration << "max:"
+ << cut_max_duration);
+ pthis->m_controllers[t_camIdex]->SetVideoMinMaxSeconds(cut_min_duration,
+ cut_max_duration);
+ itor++;
+ }
+
+ } else {
+ ERR("searchCamDevTableByType size is 0");
+ }
}
- std::string t_camIdex = itor->str_cam_dev_id.toStdString();
- DBG("-----camID:" << t_camIdex << "min:" << cut_min_duration << "max:" << cut_max_duration);
- pthis->m_controllers_videoCapElem[t_camIdex]->SetVideoMinMaxSeconds(cut_min_duration, cut_max_duration);
- itor++;
- }
- } else {
- ERR("searchCamDevTableByType size is 0");
- }
-
- } else {
- auto lst = pthis->m_lDBTool->searchCamDevTableByType(0);
-
- if (lst.size() > 0) {
- int startCamNO = appPref.getIntData("CamStartNO");
- int CamCount = appPref.getIntData("CamEndNO") - appPref.getIntData("CamStartNO") + 1;
- INFO("StartCamNO: " << startCamNO << " CamCount: " << CamCount);
- auto itor = lst.begin();
-
- if (startCamNO >= lst.size()) {
- ERR("startCamNO > lst.size()");
- return;
- }
-
- for (int i = 0; i < startCamNO; i++) {
- itor++;
- }
-
- for (int i = 0; i < CamCount; i++) {
- if (itor == lst.end()) {
- ERR("itor == lst.end()");
- return;
- }
- std::string t_camIdex = itor->str_cam_dev_id.toStdString();
- DBG("-----camID:" << t_camIdex << "min:" << cut_min_duration << "max:" << cut_max_duration);
- pthis->m_controllers[t_camIdex]->SetVideoMinMaxSeconds(cut_min_duration, cut_max_duration);
- itor++;
+//***************************************************************************************
}
} else {
- ERR("searchCamDevTableByType size is 0");
- }
+ DBG("itor value is not string ");
+ continue;
+ }
}
+
+
} else {
ERR("Error Message!!");
}
@@ -289,7 +306,8 @@
// 25, 0, 0, this);
m_controllers_videoCapElem[index] = new PushStreamAppPipeController(const_cast<string &>(index),
- 25, 0, appPref.getIntData("gpu.index"), this);
+ 25, 0, appPref.getIntData("gpu.index"),
+ this);
m_controllers_videoCapElem[index]->SetVideoMinMaxSeconds(lst_dev.n_cut_min_duration,
lst_dev.n_cut_max_duration);
m_controllers_videoCapElem[index]->start();
--
Gitblit v1.8.0