From 439a23896bda9c4e954092816354914e645579b6 Mon Sep 17 00:00:00 2001
From: zhangmeng <775834166@qq.com>
Date: 星期一, 10 六月 2019 09:37:13 +0800
Subject: [PATCH] 替换这个文件
---
QiaoJiaSystem/VideoToImageMulth/RtspAnalysManager.cpp | 32 +++++++++++++++++++++++++++++---
1 files changed, 29 insertions(+), 3 deletions(-)
diff --git a/QiaoJiaSystem/VideoToImageMulth/RtspAnalysManager.cpp b/QiaoJiaSystem/VideoToImageMulth/RtspAnalysManager.cpp
index fa3087a..79afeb0 100644
--- a/QiaoJiaSystem/VideoToImageMulth/RtspAnalysManager.cpp
+++ b/QiaoJiaSystem/VideoToImageMulth/RtspAnalysManager.cpp
@@ -4,7 +4,7 @@
#include "RtspAnalysManager.h"
#include <basic/pipe_element/ffmpeg/basic_struct_for_video_image.h>
-
+#include <DataManagerServer/vss/dao/VssChannelTblDao.h>
using std::string;
void *gRtspAnalysManagerCamera = nullptr;
@@ -90,7 +90,13 @@
}
}
} else if (itor_json.name() == "cam_edit") {
- string cam_idx = cfg_val["str_cam_dev_id"].asString();
+ string cam_idx = "";
+ if(pthis->m_GB28181_Enable){
+ cam_idx = cfg_val["equipCode"].asString();
+ }else{
+ cam_idx = cfg_val["str_cam_dev_id"].asString();
+ }
+
if (pthis->m_GB28181_Enable) {
if (pthis->m_controllers_videoCapElem.find(cam_idx) !=
pthis->m_controllers_videoCapElem.end()) {
@@ -108,7 +114,12 @@
}
}
} else if (itor_json.name() == "cam_del") {
- string cam_idx = cfg_val["str_cam_dev_id"].asString();
+ string cam_idx = "";
+ if(pthis->m_GB28181_Enable){
+ cam_idx = cfg_val["equipCode"].asString();
+ }else{
+ cam_idx = cfg_val["str_cam_dev_id"].asString();
+ }
pthis->removeCamera(cam_idx);
} else if (itor_json.name() == "cam_startPublish") {
string cam_idx = cfg_val["id"].asString();
@@ -181,6 +192,13 @@
itor++;
}
+ auto mysql = VssChannelTblDao::instance();
+ bool flag = mysql->exec("update VSSChannelTbl set Longitude=\"0\"");
+ if (flag){
+ INFO("update all longtitue 0");
+ }else{
+ INFO("update all longtitude error");
+ }
for (int i = 0; i < CamCount; i++) {
if (itor == lst.end()) {
ERR("itor == lst.end()");
@@ -192,6 +210,14 @@
INFO("cam add is " << itor->str_addr.toStdString());
addCamera(t_camIdex, rtsp_url);
+ std::string sql("update VSSChannelTbl set Longitude=\"1\" where ChanPubID=");
+ sql = sql + "\"" + t_camIdex + "\";";
+ flag = mysql->exec(sql.c_str());
+ if (flag){
+ INFO("update:"<< t_camIdex <<" longtitue 0");
+ }else{
+ INFO("update:"<< t_camIdex <<" longtitue error");
+ }
sleep(1);
itor++;
}
--
Gitblit v1.8.0