From d3b7bbe7102cd089680a828f5d8f6402c8cf6342 Mon Sep 17 00:00:00 2001
From: pansen <pansen626@sina.com>
Date: 星期四, 07 三月 2019 14:43:28 +0800
Subject: [PATCH] GB28181集成完成,集成推流模块
---
QiaoJiaSystem/StructureApp/PerimeterElement.cpp | 49 ++++++++++++++++++++++++++++++++++++++-----------
1 files changed, 38 insertions(+), 11 deletions(-)
diff --git a/QiaoJiaSystem/StructureApp/PerimeterElement.cpp b/QiaoJiaSystem/StructureApp/PerimeterElement.cpp
index bdb066f..19f3a92 100644
--- a/QiaoJiaSystem/StructureApp/PerimeterElement.cpp
+++ b/QiaoJiaSystem/StructureApp/PerimeterElement.cpp
@@ -19,11 +19,13 @@
PipeElement(true),
trackingTrigger(nullptr),
mRealNum(0),
- m_triggerElement(rule.nTriggerDelay*8,0),
+ //姣忕鍑犲紶,灏变箻浠ュ嚑
+ m_triggerElement(rule.nTriggerDelay*3,0),
pManagerEsDB(nullptr),
m_bIsMask(true),
m_bSetWH(false),
- pointArray(nullptr)
+ pointArray(nullptr),
+ m_rpcClient("RtspAnalysServer", "127.0.0.1",appPref.getIntData("RpcServerPort"),"tcp")
{
pManagerEsDB = new EsDBTool(appPref.getStringData("ipAdd"), appPref.getIntData("ipPort"));
@@ -54,6 +56,7 @@
return;
int num = 0;
std::string picDate;
+ std::string imgKey;
bool state = false;
m_recVec.clear();
@@ -70,6 +73,10 @@
picDate = obj.properties["time"];
// DBG("picDate="<<picDate);
+ }
+ if(imgKey.empty())
+ {
+ imgKey =obj.properties["imgKey"];
}
if (m_sdkRule.nSdkType == PerimeterSdk)
{
@@ -112,22 +119,22 @@
}
-
switch (m_sdkRule.nSdkType) {
case PerimeterSdk:
//state = num > 0 ;
state =( num !=mRealNum);
// DBG("num="<<num<< "time="<< picDate);
-
+ INFO("SDK Type: PerimeterSdk");
break;
case CrowdSdk:
state = num > m_sdkRule.nAlarmNumLowerLimit && num !=mRealNum;
+ INFO("SDK Type: CrowdSdk");
break;
case PerHubSdk:
state = num > m_sdkRule.nAlarmNumLowerLimit && num < m_sdkRule.nAlarmNumUpperLimit && num !=mRealNum;
-
+ INFO("SDK Type: PerHubSdk");
// if(m_sdkRule.nAlarmNumLowerLimit>=0)
// {
@@ -159,10 +166,10 @@
default:
break;
}
-
+ INFO("State:"<<state<<" Num:"<<num<<" mRealNum:"<<mRealNum<<" LowerLimit :"<<m_sdkRule.nAlarmNumLowerLimit<<" HightLimit: "<<m_sdkRule.nAlarmNumUpperLimit);
m_triggerElement.setState(state);
m_triggerElement.triggerOnce();
- if (m_triggerElement.getTriggerState() )
+ if (m_triggerElement.getTriggerState())
{
if(num > 0) {
if(pointArray!=nullptr)
@@ -171,7 +178,7 @@
int npt[]={npts};
- cv::polylines(image, ppt,npt, 1, true,cv::Scalar(255,255,0));
+ cv::polylines(image, ppt,npt, 1, true,cv::Scalar(255,255,0), 2);
}
for(auto rect:m_recVec)
@@ -185,10 +192,14 @@
// return;
// }
std::string imgUrl = uploadImgToFdfs(image);
- saveInfoToEs(imgUrl, picDate);
+ saveInfoToEs(imgUrl, picDate,imgKey);
}
DBG("num=" << num << " lastnum=" << mRealNum);
mRealNum = num;
+
+ //todo 閲嶇疆鎶ヨtrigger
+ m_triggerElement.setState(false);
+ m_triggerElement.triggerOnce();
}
// if (m_triggerElement.getTriggerState() && num!=mRealNum)
@@ -325,7 +336,7 @@
return strImgUrl;
}
-bool PerimeterElement::saveInfoToEs(const std::string &imgUrl, const std::string &time) {
+bool PerimeterElement::saveInfoToEs(const std::string &imgUrl, const std::string &time,const std::string& imgKey) {
string str_uuid;
uuid_t t_uuid;
@@ -375,7 +386,23 @@
t_json["videoIp"] = m_sdkRule.strAddr.toStdString(); // 璁惧ip
t_json["ack_alarm"] = m_triggerElement.getTriggerState() ? "0" : ""; // que ren shi fou bao jing
t_json["cluster_id"] = appPref.getStringData("clusterID");; // ji qun id
-
+ t_json["imgKey"] = imgKey;
+ try {
+ auto server = m_rpcClient.getServer();
+ if (!server)
+ {
+ ERR("server is null");
+ //return false;
+ }
+ INFO("Record Video "<<imgKey);
+ server->recordVideo(imgKey);
+ }
+ catch (std::exception &e)
+ {
+ ERR("Record Video Err: "<<imgKey <<" Message: "<<e.what());
+ //return false;
+ }
+ INFO("SaveImgKeyToES: "<<imgKey);
bool retface = false;
if (pManagerEsDB)
retface = pManagerEsDB->insertData("personaction", "perVideoAction", t_json.toStyledString(), str_uuid);
--
Gitblit v1.8.0