From a26c680f12915788cc6126661d51a7672bb6ba8f Mon Sep 17 00:00:00 2001
From: pansen <pansen626@sina.com>
Date: 星期三, 03 四月 2019 14:24:21 +0800
Subject: [PATCH] 修改VideoToImageMulth和VideoAnalysFrimHC的删除摄像机和编辑摄像机的nsq消息回调函数.
---
QiaoJiaSystem/DataManagerServer/http_configserver.cpp | 52 +++++++++++++++++++++++++++++++++++++++++++---------
1 files changed, 43 insertions(+), 9 deletions(-)
diff --git a/QiaoJiaSystem/DataManagerServer/http_configserver.cpp b/QiaoJiaSystem/DataManagerServer/http_configserver.cpp
index b53818f..3f32428 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();
}
@@ -1119,6 +1119,17 @@
if (DEV_NO_TYPE == dev_type) {//add new camera
db_c.updateConfigTableByDevType(DEV_CAMERA);
+ {
+ //#todo
+// std::string topic = "VideoToImageMulth";
+// std::string topic1 = "VideoAnalysFromHC";
+// Json::Value json_cfg;
+// json_cfg["cam_edit"] = content;
+// std::string msg = json_cfg.toStyledString();
+// DBG("msg:" << msg);
+// nsqMsgProducer->Publish(topic, (void *) (&msg));
+// nsqMsgProducer->Publish(topic1, (void *) (&msg));
+ }
runAllApp();
}
//edit camera's sdks
@@ -1126,9 +1137,20 @@
(rec_sdk_old.str_det_thr != rec_sdk.str_det_thr) ||
(rec_sdk_old.str_cmp_thr != rec_sdk.str_cmp_thr)) */
{
- killVideoAnalysFromHCApp();
- sleep(1);
- runAllApp();
+ //#todo sendMessage To haikang&VideoToImage
+ {
+ std::string topic = "VideoToImageMulth";
+ std::string topic1 = "VideoAnalysFromHC";
+ Json::Value json_cfg;
+ json_cfg["cam_edit"] = content;
+ std::string msg = json_cfg.toStyledString();
+ DBG("msg:" << msg);
+ nsqMsgProducer->Publish(topic, (void *) (&msg));
+ nsqMsgProducer->Publish(topic1, (void *) (&msg));
+ }
+// killVideoAnalysFromHCApp();
+// sleep(1);
+// runAllApp();
}
Json::Value value_out;
@@ -1408,12 +1430,22 @@
QString cam_id = QString::fromStdString(value_reader["str_cam_dev_id"].asString());
int ret = db_c.deleteCamDevandSdkByCamID(cam_id);
if (ret) {
- killVideoAnalysFromHCApp();
+// killVideoAnalysFromHCApp();
int dev_record = db_c.searchCamDevNumber();
if (dev_record == 0) {
db_c.updateConfigTableByDevType(DEV_NO_TYPE);
} else {
- runAllApp();
+// runAllApp();
+ }
+ {
+ std::string topic = "VideoToImageMulth";
+ std::string topic1 = "VideoAnalysFromHC";
+ Json::Value json_cfg;
+ json_cfg["cam_del"] = content;
+ std::string msg = json_cfg.toStyledString();
+ DBG("msg:" << msg);
+ nsqMsgProducer->Publish(topic, (void *) (&msg));
+ nsqMsgProducer->Publish(topic1, (void *) (&msg));
}
return "{\"ret_status\": \"ok_ack\"}";
} else {
@@ -1534,10 +1566,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));
}
--
Gitblit v1.8.0