From e4c9b5bfb1d9000c08d84f2f044cd0c3605a2945 Mon Sep 17 00:00:00 2001
From: miyanhui <dennismi1024@gmail.com>
Date: 星期三, 13 二月 2019 14:17:13 +0800
Subject: [PATCH] 修复检测结果ImgKey不对应的问题
---
QiaoJiaSystem/StructureApp/JudgmentRetrogradeTool.cpp | 289 +++++++++++++++++++++++++++++++++++++++++++++------------
1 files changed, 229 insertions(+), 60 deletions(-)
diff --git a/QiaoJiaSystem/StructureApp/JudgmentRetrogradeTool.cpp b/QiaoJiaSystem/StructureApp/JudgmentRetrogradeTool.cpp
index 1dca1a6..6dc6bee 100644
--- a/QiaoJiaSystem/StructureApp/JudgmentRetrogradeTool.cpp
+++ b/QiaoJiaSystem/StructureApp/JudgmentRetrogradeTool.cpp
@@ -1,36 +1,63 @@
//
// Created by basic on 18-8-24.
//
-
#include "JudgmentRetrogradeTool.h"
#include <basic/util/opencv/CvMath.hpp>
#include <QtCore/QDebug>
+#include <basic/db/Elasticsearch/EsDBTool.h>
+#include <basic/util/opencv/CvUtil.h>
+#include <uuid/uuid.h>
+#include <basic/util/app/AppPreference.hpp>
-JudgmentRetrogradeTool::JudgmentRetrogradeTool():
-TimerElement(1000),
-m_triggerElement(0,50)
+JudgmentRetrogradeTool::JudgmentRetrogradeTool(const SdkRule &rule) :
+ m_triggerElement(0, 0),
+ m_sdkRule(rule),
+ pManagerEsDB(nullptr),
+ m_bSetWH(false),
+ pointArray(nullptr),
+ npts(0)
{
-
+ pManagerEsDB = new EsDBTool(appPref.getStringData("ipAdd"), appPref.getIntData("ipPort"));
}
JudgmentRetrogradeTool::~JudgmentRetrogradeTool() {
+ if (pManagerEsDB) {
+ delete pManagerEsDB;
+ pManagerEsDB = nullptr;
+ }
+ if(pointArray)
+ {
+ delete pointArray;
+ pointArray=nullptr;
+ }
}
+bool JudgmentRetrogradeTool::init(QString area, QString line)
+{
+ m_area=area;
+ m_line=line;
+}
-bool JudgmentRetrogradeTool::init(QString area,QString line) {
+bool JudgmentRetrogradeTool::setMask(QString area, QString line) {
+
//#todo string ->json
QJsonArray arrayAreas = getJsonArrayFromQString(area);
- if(arrayAreas.isEmpty())
- {
- return false;//do not detect
+ if (arrayAreas.isEmpty()) {
+ return false;
}
+ int size=arrayAreas.size();
QVector<QPoint> vec;
- for(int i = 0;i < arrayAreas.size();++i){
+ float sizeW=(float)appPref.getIntData(m_sdkRule.strCamId.toStdString()+"width")/480;
+ float sizeH=(float)appPref.getIntData(m_sdkRule.strCamId.toStdString()+"height")/270;
+ for (int i = 0; i < arrayAreas.size(); ++i) {
+ pointArray=new cv::Point2i[size];
QJsonValue jsonValue = arrayAreas[i];
QJsonObject obj = jsonValue.toObject();
- int x = obj.value("x").toInt()*2 ;
- int y = obj.value("y").toInt()*2 ;
- vec.push_back(QPoint(x,y));
+ int x = obj.value("x").toDouble() *sizeW;
+ int y = obj.value("y").toDouble() *sizeH;
+ vec.push_back(QPoint(x, y));
+ DBG("width="<<sizeW);
+ DBG("height="<<sizeH);
}
@@ -48,22 +75,22 @@
cv::Point start, end;
QJsonArray arrayLine = getJsonArrayFromQString(line);
- if(arrayLine.size() == 2){
+ if (arrayLine.size() == 2) {
QJsonValue jsonValue = arrayLine[0];
QJsonObject obj = jsonValue.toObject();
- start.x = obj.value("x").toInt() ;
- start.y = obj.value("y").toInt() ;
+ start.x = obj.value("x").toDouble();
+ start.y = obj.value("y").toDouble();
QJsonValue jsonValue2 = arrayLine[1];
QJsonObject obj2 = jsonValue2.toObject();
- end.x = obj2.value("x").toInt() ;
- end.y = obj2.value("y").toInt() ;
+ end.x = obj2.value("x").toDouble();
+ end.y = obj2.value("y").toDouble();
- }else{
+ } else {
return false;
}
- setUpBaseline(start,end);
+ setUpBaseline(start, end);
//setDownBaseline(start,end);
// setUpBaseline();
@@ -71,17 +98,15 @@
return true;
}
-void JudgmentRetrogradeTool::setYoloObjects(std::vector<ScoredRect> value)
-{
- mObjs=value;
- for(auto & item :value){
- setPerRect(item.id,item.rect);
- }
+void JudgmentRetrogradeTool::setYoloObjects(std::vector<ScoredRect> value) {
+
+ mObjs = value;
+
}
-void JudgmentRetrogradeTool::setPerRect(const long& id,cv::Rect rect){
- setPerPoint(id,getCenterPoint(rect));
+void JudgmentRetrogradeTool::setPerRect(const long &id, cv::Rect rect) {
+ setPerPoint(id, getCenterPoint(rect));
}
void JudgmentRetrogradeTool::setPerPoint(const long &id, cv::Point2f result) {
@@ -96,13 +121,11 @@
tt.end_Point = listCache.back();
auto &temp = m_mapPerDirection[id];
//#TODO tt.end_Point in UP Area
- QPoint center(tt.end_Point.x,tt.end_Point.y);
- if(m_polygon.containsPoint(center,Qt::OddEvenFill)){
+ QPoint center(tt.end_Point.x, tt.end_Point.y);
+ if (m_polygon.containsPoint(center, Qt::OddEvenFill)) {
temp.push_back(JRTOOL::low_filter(temp.back(), getTheta(m_UpBaseLine, tt)));
- //DBG("ID="<<id<<" left getTheta="<<getTheta(m_DownBaseLine, tt));
- }
- else
- {
+ //DBG("ID="<<id<<" left getTheta="<<getTheta(m_DownBaseLine, tt));
+ } else {
temp.clear();
}
listCache.clear();
@@ -110,7 +133,7 @@
}
bool JudgmentRetrogradeTool::getPerRet(const long &id) {
- bool ret = (m_mapPerRet.find(id) == m_mapPerRet.end()) ? true : m_mapPerRet[id];
+ bool ret = (m_mapPerRet.find(id) == m_mapPerRet.end()) ? false :m_mapPerRet[id]>=m_sdkRule.nTriggerDelay * 8;
return ret;
}
@@ -129,13 +152,58 @@
return JRTOOL::getAngelOfTwoVector(directionVectorPoint, point);
}
-void JudgmentRetrogradeTool::timerFunc()
-{
+void JudgmentRetrogradeTool::threadFunc() {
func();
fireConnectors();
}
void JudgmentRetrogradeTool::func() {
+ if (!isInWeek(m_sdkRule.weekRuleVec))
+ return;
+ bool state=false;
+ for (auto &scoredRect :mObjs) {
+ if (scoredRect.score < m_sdkRule.fSensitivity)continue;
+
+ if (getPerRet(scoredRect.id))//judgment.bool
+ {
+
+ DBG("scoredRect.id" << scoredRect.id << " val=" << m_mapPerRet[scoredRect.id]);
+ m_mapPerRet[scoredRect.id] -=2400;
+// auto t_image = image(
+// CvUtil::zoomRectEqual(scoredRect.rect, 1.2, 1.2) & cv::Rect(0, 0, image.cols, image.rows)).clone();
+ // auto t_image = image(scoredRect.rect& cv::Rect(0, 0, image.cols, image.rows)).clone();
+
+ if(pointArray==nullptr) return;
+ const cv::Point2i* ppt[1] = { pointArray };
+
+ int npt[]={npts};
+ cv::polylines(image, ppt,npt, 1, true,cv::Scalar(255,255,0));
+ cv::arrowedLine(image,m_UpBaseLine.start_Point,m_UpBaseLine.end_Point,cv::Scalar(0,0,255));
+
+ cv::rectangle(image, scoredRect.rect, cv::Scalar(0, 0, 255), 2);
+
+ std::string imgUrl = uploadImgToFdfs(image);
+ saveInfoToEs(imgUrl, scoredRect);
+ state=true;
+
+
+ // break;
+ }
+// m_triggerElement.triggerOnce();
+// if(m_triggerElement.getState())
+// {
+
+// auto t_image = image(
+// CvUtil::zoomRectEqual(scoredRect.rect, 1.2, 1.2) & cv::Rect(0, 0, image.cols, image.rows)).clone();
+// // auto t_image = image(scoredRect.rect& cv::Rect(0, 0, image.cols, image.rows)).clone();
+// std::string imgUrl = uploadImgToFdfs(t_image);
+// saveInfoToEs(imgUrl, scoredRect);
+// }
+
+ setPerRect(scoredRect.id, scoredRect.rect);
+ }
+ m_triggerElement.setState(state);
+ m_triggerElement.triggerOnce();
for (auto &item : m_mapPerDirection) {
int a = 0;
int b = 0;
@@ -147,48 +215,149 @@
a++;
}
}
- // DBG("id="<<item.first<<" a="<<a<<" b="<<b);
- bool ret = a >= b ? true : false;
- m_mapPerRet[item.first] = ret;
+ if(b!=0)
+ {
+ bool ret = a >= b ? true : false;
+ // DBG("id="<<item.first<<" a="<<a<<" b="<<b<<" ret="<<ret);
+ if (!ret) {
+ m_mapPerRet[item.first]+=1;
+ // m_mapPerRet.insert(std::make_pair(item.first, false));
+ // m_mapPerRet[item.first] = false;
+
+ }
+ }
+
+
+
if (temp.size() > 9) {
temp.pop_front();
}
}
- for (auto scoredRect:mObjs) {
- if (!getPerRet(scoredRect.id))//judgment.bool
- {
- m_triggerElement.setState(true);
- break;
- }
- else
- {
- m_triggerElement.setState(false);
- }
- }
- m_triggerElement.triggerOnce();
+
}
-QJsonArray JudgmentRetrogradeTool::getJsonArrayFromQString(const QString strJson)
-{
+std::string JudgmentRetrogradeTool::uploadImgToFdfs(cv::Mat &image) {
+ std::string strImgUrl = "http://";
+ if (fdfsClient != nullptr && fdfsClient->fastFds != nullptr) {
+ fdfsClient->rwLock.rdlock();
+ std::vector<unsigned char> buffer;
+ CvUtil::cvMat2Buffer(image, buffer);
+ std::string strImgUrlTmp = "";
+ fdfsClient->fastFds->uploadFile(buffer, strImgUrlTmp, "jpg");
+ // strImgUrl.append(fdfsClient->fastFds->getIp() + "/" + strImgUrlTmp);
+ strImgUrl.clear();
+ strImgUrl = strImgUrlTmp;
+// strImgUrl.append("/").append(strImgUrlTmp);
+ fdfsClient->rwLock.unlock();
+ }
+ return strImgUrl;
+}
+
+bool JudgmentRetrogradeTool::saveInfoToEs(const std::string &imgUrl, const ScoredRect &obj) {
+
+
+ string str_uuid;
+ uuid_t t_uuid;
+ char str[36];
+ uuid_generate(t_uuid);
+ uuid_unparse(t_uuid, str);
+ str_uuid = str;
+
+
+ Json::Value t_json;
+ t_json["Id"] = str_uuid; //涓婚敭
+//#todo
+
+ t_json["videoReqNum"] = m_sdkRule.strCamId.toStdString();
+ t_json["sdkType"] = to_string(m_sdkRule.nSdkType);
+// t_json["Gender"] = obj.score;
+
+ 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"] = ""; // 澶у浘璺緞
+
+
+ // t_json["Age"] ="";
+ t_json["picDate"] = obj.properties["time"]; // 鎶撴媿鏃堕棿锛屽繀椤绘湁
+ t_json["picLocalUrl"] = ""; // 鏈湴璺緞
+ t_json["isDelete"] = "1";//榛樿1 ,0鏃犳晥 1鏈夋晥
+
+ t_json["likePer"] = 1.0; // 鐩镐技鍊�
+
+ 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"] = "";
+ 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"] = getProperty("local_ip");//褰撳墠鏈嶅姟鍣↖P鍦板潃
+ 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"]=obj.properties["imgKey"];
+ INFO("SaveImageKey ToES: "<<obj.properties["imgKey"]);
+ bool retface = false;
+ if (pManagerEsDB)
+ retface = pManagerEsDB->insertData("personaction", "perVideoAction", t_json.toStyledString(), str_uuid);
+
+ if (retface) {
+ INFO("perVideoAction db success");
+ } else {
+ ERR("personaction db fail");
+ }
+}
+
+bool JudgmentRetrogradeTool::isInWeek(const std::vector<LActRuleWeekRecord> &ruleWeek) {
+
+ int nWeek = QDate::currentDate().dayOfWeek();
+ for (int i = 0; i < ruleWeek.size(); ++i) {
+ if (ruleWeek[i].m_nType == nWeek) {
+ QString strCurrent = QDateTime::currentDateTime().toString("hh:mm");
+ if (strCurrent >= ruleWeek[i].m_strBegin && strCurrent <= ruleWeek[i].m_strEnd) {
+ return true;
+ }
+ }
+ }
+ return false;
+}
+
+QJsonArray JudgmentRetrogradeTool::getJsonArrayFromQString(const QString strJson) {
QJsonDocument jsonDocument = QJsonDocument::fromJson(strJson.toLocal8Bit());
- if( jsonDocument.isNull() ){
- qDebug()<< "please check the string"<< strJson.toLocal8Bit();
+ if (jsonDocument.isNull()) {
+ qDebug() << "please check the string" << strJson.toLocal8Bit();
return QJsonArray();
}
QJsonArray jsonArray = jsonDocument.array();
return jsonArray;
}
-void JudgmentRetrogradeTool::setUpDetectionArea()
-{
+void JudgmentRetrogradeTool::setUpDetectionArea() {
}
-void JudgmentRetrogradeTool::setDownDetectionArea()
-{
+
+void JudgmentRetrogradeTool::setDownDetectionArea() {
}
+
bool JudgmentRetrogradeTool::getTriggerState() const {
return m_triggerElement.getTriggerState();
}
+
+void JudgmentRetrogradeTool::setImage(const cv::Mat &value) {
+ value.copyTo(image);
+ if(!m_bSetWH)
+ {
+ setMask(m_area,m_line);
+ m_bSetWH=true;
+ }
+}
--
Gitblit v1.8.0