From f54c3b20dc82df32c4314d2c27aa2eb1fead6312 Mon Sep 17 00:00:00 2001
From: chenshijun <csj_sky@126.com>
Date: 星期三, 20 二月 2019 09:32:23 +0800
Subject: [PATCH] 修改重启命令
---
QiaoJiaSystem/DataManagerServer/http_configserver.cpp | 28 ++++++++++++++++++----------
1 files changed, 18 insertions(+), 10 deletions(-)
diff --git a/QiaoJiaSystem/DataManagerServer/http_configserver.cpp b/QiaoJiaSystem/DataManagerServer/http_configserver.cpp
index 7d8b08e..07a20cf 100644
--- a/QiaoJiaSystem/DataManagerServer/http_configserver.cpp
+++ b/QiaoJiaSystem/DataManagerServer/http_configserver.cpp
@@ -951,8 +951,10 @@
void devHttpServer_c::killVideoAnalysFromHCApp() const {
string local_passwd = appConfig.getStringProperty("localPasswd");
- string cmd_kill = "echo \"" + local_passwd + "\" | sudo -S pkill -9 VideoAnalysFrom";
- system(cmd_kill.c_str());
+ string cmd_kill_VideoAnalys = "echo \"" + local_passwd + "\" | sudo -S pkill -9 VideoAnalys";
+ system(cmd_kill_VideoAnalys.c_str());
+ string cmd_kill_VideoToIma = "echo \"" + local_passwd + "\" | sudo -S pkill -9 VideoToIma";
+ system(cmd_kill_VideoToIma.c_str());
DBG("system(\"sudo -S pkill -9 VideoAnalysFromHC\");");
}
@@ -2078,6 +2080,12 @@
img_str.append(fdfsClient.fastFds->getIp() + "/").append(img_tmp);
img_url.swap(img_str);
}
+ } else {
+ std::string img_str = "http://";
+ if (fdfsClient.fastFds != nullptr) {
+ img_str.append(fdfsClient.fastFds->getIp() + "/").append(img_url);
+ img_url.swap(img_str);
+ }
}
auto t_results = m_curlDownloadImg.download_jpeg(const_cast<char *>(img_url.c_str()));
@@ -2528,7 +2536,7 @@
std::string picDate = value["picDate"].asString();
std::string imgKey = value["imgKey"].asString();
//鍏煎鏃х増鏈�
- if(imgKey=="undefined")
+ if(imgKey=="undefined" || imgKey.empty())
{
return getAlarmImageByPicDateAndDevId(picDate,devId,response);
}
@@ -2554,7 +2562,7 @@
-std::string devHttpServer_c::getAlarmImageByImageKeyAndDevId(const std::string& devId,const std::string& imgKey,
+std::string devHttpServer_c::getAlarmImageByImageKeyAndDevId(const std::string& imgKey,const std::string& devId,
PResponse &response) {
try {
if (!devId.empty() && !imgKey.empty()) {
@@ -2644,7 +2652,7 @@
std::string path;
//鍏煎鏃х増鏈�
- if(imgKey=="undefined")
+ if(imgKey=="undefined"||imgKey.empty())
{
qint64 sub;
path = getVideoPathByPicDate(picDate,devId,sub);
@@ -2825,7 +2833,7 @@
auto videoParseResult = VideoName_s_t::fromString(item);
if (videoParseResult.Valid()) {
if (videoParseResult.m_startFrameId <= imgSt.m_frameId &&
- imgSt.m_frameId < videoParseResult.m_endFrameId) {
+ imgSt.m_frameId <= videoParseResult.m_endFrameId) {
auto imgTm = AppUtil::ParseFromHypenTimeStr(imgSt.m_timeStamp);
auto videoTm = AppUtil::ParseFromHypenTimeStr(videoParseResult.m_timeStamp);
if (AppUtil::IsRightAfterLeft(imgTm, videoTm)) {
@@ -2858,10 +2866,10 @@
}
//鏂扮殑鏍规嵁鍥剧墖鍚嶇О鑾峰彇璺緞鐨勬柟娉�
-std::string devHttpServer_c::getVideoPathByImgKey(const std::string &strImageName, const std::string &camId)
+std::string devHttpServer_c::getVideoPathByImgKey(const std::string &imgKey, const std::string &camId)
{
- INFO("GetVideoFor: "<<strImageName<<" CamID:"<<camId);
- ImageName_s_t imgSt= ImageName_s_t::fromString(strImageName);
+ INFO("GetVideoFor: "<<imgKey<<" CamID:"<<camId);
+ ImageName_s_t imgSt= ImageName_s_t::fromString(imgKey);
struct tm imgTime = AppUtil::ParseFromHypenTimeStr(imgSt.m_timeStamp);
char curFolder[128]={0};
@@ -2871,7 +2879,7 @@
imgTime.tm_year+1900,imgTime.tm_mon+1,imgTime.tm_mday,imgTime.tm_hour);
std::string t_FilePath = appConfig.getStringProperty("cutPath");
std::string videoPath = t_FilePath+"/"+camId+"/"+std::string(curFolder);
- return GetVideoNameByImgKey(strImageName,videoPath);
+ return GetVideoNameByImgKey(imgKey,videoPath);
}
--
Gitblit v1.8.0