From db043cb402515837303880cb0948d060e9d76490 Mon Sep 17 00:00:00 2001
From: chenshijun <csj_sky@126.com>
Date: 星期一, 15 四月 2019 17:13:16 +0800
Subject: [PATCH] 整合代码
---
QiaoJiaSystem/VideoAnalysFromHC/RtspAnalysElement.h | 10 +++++++++-
1 files changed, 9 insertions(+), 1 deletions(-)
diff --git a/QiaoJiaSystem/VideoAnalysFromHC/RtspAnalysElement.h b/QiaoJiaSystem/VideoAnalysFromHC/RtspAnalysElement.h
index 01d9abd..084f8c2 100644
--- a/QiaoJiaSystem/VideoAnalysFromHC/RtspAnalysElement.h
+++ b/QiaoJiaSystem/VideoAnalysFromHC/RtspAnalysElement.h
@@ -11,6 +11,7 @@
#include <VideoServer/QiaoJia/DB/LDBTool.h>
#include <basic/util/app/AppPreference.hpp>
+#include "NsqMsgTool.hpp"
class RtspAnalysElement {
@@ -36,6 +37,8 @@
private:
void init();
+ static void OnMsgFunc(void *msgPtr, void *pThisPtr);
+
std::string resetFdfs(std::string ip = "", unsigned int port = 0, std::string content = "");
static std::vector<int> chnString2Vec(std::string str_list);
@@ -43,14 +46,19 @@
// void setDataByType(Json::Value& json,const SdkRule& rule);
private:
- LDBTool *m_lDBTool;
+ //nsq
+ BasicMsg::Nsq::NsqMsgConsumer *nsqMsgConsumer;
+ LDBTool *m_lDBTool;
+ int m_GB28181_Enable;
std::map<std::string, AppPipeController *> controllers;
std::atomic<int> currentCount;
int maxCount;
FastFdsWithLock fdfsClient;
std::map<int, SdkRule> sdkRuleMap;
+
+ void addCamWithSearchRuleMap(const Record_Cam_Dev &item, string rtsp_url);
};
--
Gitblit v1.8.0