From 25eae971d34c0d0f7a5fc9dd70e98711fc950006 Mon Sep 17 00:00:00 2001
From: test <pansen626@sina.com>
Date: 星期一, 22 四月 2019 09:49:55 +0800
Subject: [PATCH] 修改人员异常的大于小于设置，并使用-1作为不生效以应对单边限制
---
QiaoJiaSystem/StructureApp/PerimeterElement.cpp | 134 ++++++++++++++++++++++++++++++++------------
1 files changed, 98 insertions(+), 36 deletions(-)
diff --git a/QiaoJiaSystem/StructureApp/PerimeterElement.cpp b/QiaoJiaSystem/StructureApp/PerimeterElement.cpp
index b605b07..e7b70ef 100644
--- a/QiaoJiaSystem/StructureApp/PerimeterElement.cpp
+++ b/QiaoJiaSystem/StructureApp/PerimeterElement.cpp
@@ -13,16 +13,19 @@
#include <uuid/uuid.h>
#include <jsoncpp/json/json.h>
-#define ALARM_PERCENT (10) //10%
+#define ALARM_PERCENT (25) //25%
PerimeterElement::PerimeterElement(const SdkRule &rule) :
m_sdkRule(rule),
PipeElement(true),
trackingTrigger(nullptr),
mRealNum(0),
- m_triggerElement(rule.nTriggerDelay*8,0),
+ //姣忕鍑犲紶,灏变箻浠ュ嚑
+ m_triggerElement(rule.nTriggerDelay*3,0),
pManagerEsDB(nullptr),
- m_bIsMask(true)
-{
+ m_bIsMask(true),
+ m_bSetWH(false),
+ pointArray(nullptr),
+ m_rpcClient("RtspAnalysServer", "127.0.0.1", appPref.getIntData("RpcVTIMPort"), "tcp") {
pManagerEsDB = new EsDBTool(appPref.getStringData("ipAdd"), appPref.getIntData("ipPort"));
}
@@ -32,11 +35,15 @@
delete pManagerEsDB;
pManagerEsDB = nullptr;
}
+ if (pointArray) {
+// delete[] pointArray[0];
+ delete[] pointArray;
+ }
}
void PerimeterElement::threadInitial() {
- setMask(m_sdkRule.strAreas.toStdString());
+// setMask(m_sdkRule.strAreas.toStdString());
}
@@ -47,12 +54,13 @@
return;
int num = 0;
std::string picDate;
+ std::string imgKey;
bool state = false;
m_recVec.clear();
- // DBG("Objs="<<mObjs.size()<<" fSensitivity="<<m_sdkRule.fSensitivity<<" nThreshold"<<m_sdkRule.nThreshold);
+// DBG("Objs="<<mObjs.size()<<" fSensitivity="<<m_sdkRule.fSensitivity<<" nThreshold"<<m_sdkRule.nThreshold);
- for (auto obj:mObjs) {
+ for (auto &obj:mObjs) {
if (obj.score < m_sdkRule.fSensitivity)continue;
@@ -63,6 +71,9 @@
picDate = obj.properties["time"];
// DBG("picDate="<<picDate);
+ }
+ if (imgKey.empty()) {
+ imgKey = obj.properties["imgKey"];
}
if (m_sdkRule.nSdkType == PerimeterSdk)
{
@@ -110,16 +121,26 @@
//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;
-
+ DBG("nAlarmNumLowerLimit:" << m_sdkRule.nAlarmNumLowerLimit
+ << " nAlarmNumUpperLimit:" << m_sdkRule.nAlarmNumUpperLimit
+ << " mRealNum:" << mRealNum);
+ if(m_sdkRule.nAlarmNumUpperLimit == -1){
+ state = num >= m_sdkRule.nAlarmNumLowerLimit && num !=mRealNum;
+ }else if(m_sdkRule.nAlarmNumLowerLimit == -1){
+ state = num <= m_sdkRule.nAlarmNumUpperLimit && num !=mRealNum;
+ } else {
+ state = num >= m_sdkRule.nAlarmNumLowerLimit && num <= m_sdkRule.nAlarmNumUpperLimit && num != mRealNum;
+ }
+// INFO("SDK Type: PerHubSdk");
// if(m_sdkRule.nAlarmNumLowerLimit>=0)
// {
@@ -151,23 +172,40 @@
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) {
- cv::Mat t_image = image(CutMask()).clone();
- if(t_image.empty())
+ if(pointArray!=nullptr)
{
- DBG("t_image empty");
- return;
+ const cv::Point2i* ppt[1] = { pointArray };
+
+ int npt[]={npts};
+
+ cv::polylines(image, ppt,npt, 1, true,cv::Scalar(255,255,0), 2);
}
- std::string imgUrl = uploadImgToFdfs(t_image);
- saveInfoToEs(imgUrl, picDate);
+
+ for(auto rect:m_recVec)
+ {
+ cv::rectangle(image, rect, cv::Scalar(0, 0, 255), 2);
+ }
+// cv::Mat t_image = image(CutMask()).clone();
+// if(t_image.empty())
+// {
+// DBG("t_image empty");
+// return;
+// }
+ std::string imgUrl = uploadImgToFdfs(image);
+ saveInfoToEs(imgUrl, picDate,imgKey);
}
- DBG("num=" << num << " lastnum=" << mRealNum);
+// DBG("num=" << num << " lastnum=" << mRealNum);
mRealNum = num;
+
+ //todo 閲嶇疆鎶ヨtrigger
+ m_triggerElement.setState(false);
+ m_triggerElement.triggerOnce();
}
// if (m_triggerElement.getTriggerState() && num!=mRealNum)
@@ -235,12 +273,16 @@
}
int size = arrayAreas.size();
npts = size;
+ float sizeW=(float)appPref.getIntData(m_sdkRule.strCamId.toStdString()+"width")/480;
+ float sizeH=(float)appPref.getIntData(m_sdkRule.strCamId.toStdString()+"height")/270;
+ pointArray=new cv::Point2i[npts];
for (int i = 0; i < size; ++i) {
QJsonValue jsonValue = arrayAreas[i];
QJsonObject obj = jsonValue.toObject();
- int x = obj.value("x").toDouble() * 4;
- int y = obj.value("y").toDouble() * 4;
+ int x = obj.value("x").toDouble() *sizeW;
+ int y = obj.value("y").toDouble() *sizeH;
+ pointArray[i]={x,y};
if(m_sdkRule.nSdkType == PerimeterSdk)
{
poly1.push_back(Point(x,y));
@@ -249,7 +291,8 @@
{
mPolygon << (QPoint(x, y));
}
-
+// DBG("width="<<sizeW);
+// DBG("height="<<sizeH);
}
@@ -258,7 +301,7 @@
QJsonArray PerimeterElement::getJsonArrayFromQString(const QString &strJson) {
QJsonDocument jsonDocument = QJsonDocument::fromJson(strJson.toLocal8Bit());
if (jsonDocument.isNull()) {
- DBG("please check the string" << strJson.toStdString());
+ ERR("please check the string" << strJson.toStdString());
return QJsonArray();
}
QJsonArray jsonArray = jsonDocument.array();
@@ -270,6 +313,12 @@
// image = cv::Mat(value.rows, value.cols, CV_8UC3, sharedMemory->data());
// }
value.copyTo(image);
+ if(!m_bSetWH)
+ {
+ setMask(m_sdkRule.strAreas.toStdString());
+ m_bSetWH=true;
+ }
+
}
bool PerimeterElement::getTriggerState() const {
@@ -293,7 +342,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;
@@ -312,38 +361,54 @@
// DBG("to_string(m_sdkRule.nSdkType)="<<to_string(m_sdkRule.nSdkType));
// t_json["Gender"] = obj.score;
- t_json["picName"] = "wait todo";// 鎶撴媿鐓х墖鍚嶇О
- t_json["content"] = "wait todo";// 鍐呭鎻忚堪
+ t_json["picName"] = "";// 鎶撴媿鐓х墖鍚嶇О
+ t_json["content"] = "";// 鍐呭鎻忚堪
t_json["personPicUrl"] = "";// 浜哄憳 鍦板簱鍥剧墖
t_json["ChannlId"] = getProperty("ch_id"); // 閫氶亾id
t_json["likeDate"] = AppUtil::getTimeSecString(); // 姣斿鏃堕棿
t_json["picAddress"] = m_sdkRule.strAddr.toStdString();// 鎶撴媿鍦板潃
DBG("picAddress="<<m_sdkRule.strAddr.toStdString());
- t_json["picMaxUrl"] = "wait todo"; // 澶у浘璺緞
+ t_json["picMaxUrl"] = ""; // 澶у浘璺緞
// t_json["Age"] ="wait todo";
t_json["picDate"] = time; // 鎶撴媿鏃堕棿锛屽繀椤绘湁
DBG("picDate="<<time);
- t_json["picLocalUrl"] = "wait todo"; // 鏈湴璺緞
+ t_json["picLocalUrl"] = ""; // 鏈湴璺緞
t_json["isDelete"] = "1";//榛樿1 ,0鏃犳晥 1鏈夋晥
- t_json["likePer"] = "0"; // 鐩镐技鍊�
+ t_json["likePer"] = 1.0; // 鐩镐技鍊�
- t_json["BaseName"] = "wait todo";// 鍦板簱鍚嶇О
+ t_json["BaseName"] = "";// 鍦板簱鍚嶇О
t_json["videoNum"] = m_sdkRule.strCamId.toStdString();//Video璁惧缂栧彿
t_json["picSmUrl"] = imgUrl; // 鎶撴媿鍥剧墖
t_json["indeviceid"] = appPref.getStringData("fxDevID");;// 璁惧id
- t_json["idcard"] = "wait todo";
- t_json["personId"] = "wait todo";
+ t_json["idcard"] = "";
+ t_json["personId"] = "";
t_json["indevicename"] = appPref.getStringData("fxDevNAME");// 璁惧鍚嶇О
t_json["FaceFeature"] = "base64";
t_json["personIsHub"] = m_triggerElement.getTriggerState() ? "1" : "4"; //1: 鎶ヨ 2: 鍙枒 3: 瀹夊叏 4: 鏈煡
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);
@@ -416,7 +481,4 @@
// DBG("RECT x="<<rect.x<<"y"<<rect.y<<"w"<<rect.width<<"h"<<rect.height);
return rect;
}
-bool PerimeterElement::isAnd()
-{
-}
--
Gitblit v1.8.0