From bcf8d8c62fdf61c4c3091bbf0db32383cbd5ea9e Mon Sep 17 00:00:00 2001
From: pansen <pansen626@sina.com>
Date: 星期四, 28 二月 2019 14:24:09 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/yw.1.2.fixbug' into yw.1.2
---
QiaoJiaSystem/StructureApp/JudgmentRetrogradeTool.cpp | 22 ++++++++++++++++++++--
1 files changed, 20 insertions(+), 2 deletions(-)
diff --git a/QiaoJiaSystem/StructureApp/JudgmentRetrogradeTool.cpp b/QiaoJiaSystem/StructureApp/JudgmentRetrogradeTool.cpp
index 34d4b3c..476883e 100644
--- a/QiaoJiaSystem/StructureApp/JudgmentRetrogradeTool.cpp
+++ b/QiaoJiaSystem/StructureApp/JudgmentRetrogradeTool.cpp
@@ -15,7 +15,8 @@
pManagerEsDB(nullptr),
m_bSetWH(false),
pointArray(nullptr),
- npts(0)
+ npts(0),
+ m_rpcClient("RtspAnalysServer", "127.0.0.1",appPref.getIntData("RpcServerPort"),"tcp")
{
pManagerEsDB = new EsDBTool(appPref.getStringData("ipAdd"), appPref.getIntData("ipPort"));
}
@@ -181,7 +182,6 @@
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;
@@ -304,6 +304,24 @@
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
+ std::string imgKey = obj.properties["imgKey"];
+ t_json["imgKey"]=imgKey;
+ INFO("SaveImageKey ToES: "<<obj.properties["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;
+ }
bool retface = false;
if (pManagerEsDB)
--
Gitblit v1.8.0