From 7106611f42c54da23d477efb81d66a5e57a38915 Mon Sep 17 00:00:00 2001
From: zhangjixing <775834166@qq.com>
Date: 星期五, 18 一月 2019 10:30:04 +0800
Subject: [PATCH]
---
QiaoJiaSystem/StructureApp/JudgmentRetrogradeTool.cpp | 95 ++++++++++++++++++++++++++++-------------------
1 files changed, 57 insertions(+), 38 deletions(-)
diff --git a/QiaoJiaSystem/StructureApp/JudgmentRetrogradeTool.cpp b/QiaoJiaSystem/StructureApp/JudgmentRetrogradeTool.cpp
index d04013c..bcf0518 100644
--- a/QiaoJiaSystem/StructureApp/JudgmentRetrogradeTool.cpp
+++ b/QiaoJiaSystem/StructureApp/JudgmentRetrogradeTool.cpp
@@ -10,10 +10,10 @@
#include <basic/util/app/AppPreference.hpp>
JudgmentRetrogradeTool::JudgmentRetrogradeTool(const SdkRule &rule) :
- TimerElement(1000),
- m_triggerElement(0, rule.nTriggerDelay * 1000 * 1000),
+ m_triggerElement(0, 0),
m_sdkRule(rule),
- pManagerEsDB(nullptr) {
+ pManagerEsDB(nullptr)
+{
pManagerEsDB = new EsDBTool(appPref.getStringData("ipAdd"), appPref.getIntData("ipPort"));
}
@@ -29,7 +29,7 @@
//#todo string ->json
QJsonArray arrayAreas = getJsonArrayFromQString(area);
if (arrayAreas.isEmpty()) {
- return false;//do not detect
+ return false;
}
QVector<QPoint> vec;
for (int i = 0; i < arrayAreas.size(); ++i) {
@@ -79,14 +79,9 @@
}
void JudgmentRetrogradeTool::setYoloObjects(std::vector<ScoredRect> value) {
- if (!isInWeek(m_sdkRule.weekRuleVec))
- return;
- mObjs = value;
- for (auto &item :value) {
- if (item.score < m_sdkRule.fSensitivity)continue;
- setPerRect(item.id, item.rect);
- }
+ mObjs = value;
+
}
@@ -118,7 +113,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;
}
@@ -137,12 +132,47 @@
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();
+ std::string imgUrl = uploadImgToFdfs(t_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;
@@ -154,13 +184,18 @@
a++;
}
}
- // DBG("id="<<item.first<<" a="<<a<<" b="<<b);
- bool ret = a >= b ? true : false;
- if (!ret) {
- m_mapPerRet.insert(std::make_pair(item.first, false));
- // m_mapPerRet[item.first] = false;
+ 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) {
@@ -168,25 +203,8 @@
}
}
- for (auto scoredRect:mObjs) {
- if (!getPerRet(scoredRect.id))//judgment.bool
- {
- DBG("scoredRect.id" << scoredRect.id << " val=" << m_mapPerRet[scoredRect.id]);
- m_mapPerRet[scoredRect.id] = true;
- m_triggerElement.setState(true);
- 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);
- break;
- } else {
- m_triggerElement.setState(false);
- }
- }
- m_triggerElement.triggerOnce();
}
std::string JudgmentRetrogradeTool::uploadImgToFdfs(cv::Mat &image) {
@@ -197,7 +215,7 @@
CvUtil::cvMat2Buffer(image, buffer);
std::string strImgUrlTmp = "";
fdfsClient->fastFds->uploadFile(buffer, strImgUrlTmp, "jpg");
- strImgUrl.append(fdfsClient->fastFds->getIp() + "/" + strImgUrlTmp);
+ // strImgUrl.append(fdfsClient->fastFds->getIp() + "/" + strImgUrlTmp);
strImgUrl.clear();
strImgUrl = strImgUrlTmp;
// strImgUrl.append("/").append(strImgUrlTmp);
@@ -230,7 +248,8 @@
t_json["personPicUrl"] = "";// 浜哄憳 鍦板簱鍥剧墖
t_json["ChannlId"] = getProperty("ch_id"); // 閫氶亾id
t_json["likeDate"] = AppUtil::getTimeSecString(); // 姣斿鏃堕棿
- t_json["picAddress"] = getProperty("str_addr");// 鎶撴媿鍦板潃
+ t_json["picAddress"] = m_sdkRule.strAddr.toStdString();// 鎶撴媿鍦板潃
+ DBG("picAddress="<<m_sdkRule.strAddr.toStdString());
t_json["picMaxUrl"] = "wait todo"; // 澶у浘璺緞
@@ -253,7 +272,7 @@
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"] = "wait todo"; // ji qun id
+ t_json["cluster_id"] = appPref.getStringData("clusterID");; // ji qun id
bool retface = false;
if (pManagerEsDB)
--
Gitblit v1.8.0