From f4bedfe12a099da62cc1e8b0eca67ee2bad2cc4a Mon Sep 17 00:00:00 2001
From: pansen <pansen626@sina.com>
Date: 星期三, 03 四月 2019 14:45:42 +0800
Subject: [PATCH] VideoAnalysFromHC 中修改sdkrule的处理等同于编辑摄像机
---
QiaoJiaSystem/DataManagerServer/http_configserver.cpp | 16 ++++++++++++----
QiaoJiaSystem/VideoAnalysFromHC/RtspAnalysElement.cpp | 2 +-
QiaoJiaSystem/VideoToImageMulth/RtspAnalysManager.cpp | 2 +-
3 files changed, 14 insertions(+), 6 deletions(-)
diff --git a/QiaoJiaSystem/DataManagerServer/http_configserver.cpp b/QiaoJiaSystem/DataManagerServer/http_configserver.cpp
index 3f32428..494356c 100644
--- a/QiaoJiaSystem/DataManagerServer/http_configserver.cpp
+++ b/QiaoJiaSystem/DataManagerServer/http_configserver.cpp
@@ -3309,11 +3309,19 @@
if (db_c.updateSdkRule(rule)) {
// if(rule.nIsRun==1)
- killVideoAnalysFromHCApp();
- sleep(1);
- runAllApp();
+// killVideoAnalysFromHCApp();
+// sleep(1);
+// runAllApp();
-
+ {
+ std::string topic = "VideoAnalysFromHC";
+ Json::Value json_cfg;
+ json_cfg["editSdkRule"] = content;
+ std::string msg = json_cfg.toStyledString();
+ DBG("msg:" << msg);
+ usleep(1000);
+ nsqMsgProducer->Publish(topic, (void *) (&msg));
+ }
return "{\"ret_status\": \"ok_ack\"}";
} else {
return "{\"ret_status\":\"鍐呭鏈夎锛岃妫�鏌ワ紒\"}";
diff --git a/QiaoJiaSystem/VideoAnalysFromHC/RtspAnalysElement.cpp b/QiaoJiaSystem/VideoAnalysFromHC/RtspAnalysElement.cpp
index b1bc13a..572401b 100644
--- a/QiaoJiaSystem/VideoAnalysFromHC/RtspAnalysElement.cpp
+++ b/QiaoJiaSystem/VideoAnalysFromHC/RtspAnalysElement.cpp
@@ -92,7 +92,7 @@
for (auto itor_json = value.begin(); itor_json != itor_json_end; ++itor_json) {
//#todo 浣跨敤绛栫暐妯″紡?鍙戦�佺澶氫釜鎸囦护绱Н鍚庡彂閫�?
if (itor_json->isString() && reader.parse(itor_json->asString(), cfg_val)) {
- if (itor_json.name() == "cam_edit") {
+ if (itor_json.name() == "cam_edit" || itor_json.name() == "editSdkRule") {
string cam_idx = cfg_val["str_cam_dev_id"].asString();
if (pthis->controllers.find(cam_idx) != pthis->controllers.end()) {
if (pthis->m_GB28181_Enable) {
diff --git a/QiaoJiaSystem/VideoToImageMulth/RtspAnalysManager.cpp b/QiaoJiaSystem/VideoToImageMulth/RtspAnalysManager.cpp
index e00b34e..746b804 100644
--- a/QiaoJiaSystem/VideoToImageMulth/RtspAnalysManager.cpp
+++ b/QiaoJiaSystem/VideoToImageMulth/RtspAnalysManager.cpp
@@ -78,7 +78,7 @@
item.second->SetVideoMinMaxSeconds(cut_min_duration, cut_max_duration);
}
}
- } else if (itor_json.name() == "cam_edit") {
+ } else if (itor_json.name() == "cam_edit" ) {
string cam_idx = cfg_val["str_cam_dev_id"].asString();
if (pthis->m_GB28181_Enable) {
if (pthis->m_controllers_videoCapElem.find(cam_idx) !=
--
Gitblit v1.8.0