From a89689b92b07cf1830ad8b46521eda92e7f927c0 Mon Sep 17 00:00:00 2001
From: pansen <pansen626@sina.com>
Date: 星期三, 30 一月 2019 16:37:45 +0800
Subject: [PATCH] 修改bug
---
QiaoJiaSystem/DataManagerServer/http_configserver.cpp | 19 +++++++++++--------
1 files changed, 11 insertions(+), 8 deletions(-)
diff --git a/QiaoJiaSystem/DataManagerServer/http_configserver.cpp b/QiaoJiaSystem/DataManagerServer/http_configserver.cpp
index eb2ff5f..b793b61 100644
--- a/QiaoJiaSystem/DataManagerServer/http_configserver.cpp
+++ b/QiaoJiaSystem/DataManagerServer/http_configserver.cpp
@@ -1881,6 +1881,7 @@
uuid_generate(t_uuid);
uuid_unparse(t_uuid, str);
str_uuid = str;
+ Uuid = Uuid.empty() ? str_uuid : Uuid;
if (createBy == "analyDev") {
Uuid = Uuid.empty() ? str_uuid : Uuid;
} else if (createBy == "conCemter") {
@@ -1901,7 +1902,7 @@
fieldValues.insert(std::make_pair("startTime", StartTime));
fieldValues.insert(std::make_pair("endTime", EndTime));
// #todo
- fieldValues.insert(std::make_pair("create_by", "who"));
+ fieldValues.insert(std::make_pair("create_by", createBy));
fieldValues.insert(std::make_pair("uploadFlag", UploadFlag));
fieldValues.insert(std::make_pair("cmpThreshold", CmpThreshold));
@@ -2039,7 +2040,7 @@
subJson.append("\"IsSync\":\"" + item.second.uploadFlag + "\",");
subJson.append("\"threshold\":\"" + item.second.cmpThreshold + "\",");
- subJson.append("\"create_by\":\"" + item.second.create_by + "\",");
+ subJson.append("\"createBy\":\"" + item.second.create_by + "\",");
subJson.append("\"enabled\":\"" + item.second.enabled + "\"");
subJson.append("},");
json.append(subJson);
@@ -2085,7 +2086,7 @@
subJson.append("\"end_time\":\"" + item.endTime + "\",");
subJson.append("\"IsSync\":\"" + item.uploadFlag + "\",");
subJson.append("\"threshold\":\"" + item.cmpThreshold + "\",");
- subJson.append("\"create_by\":\"" + item.createBy + "\",");
+ subJson.append("\"createBy\":\"" + item.createBy + "\",");
subJson.append("\"enabled\":\"" + item.enabled + "\"");
subJson.append("},");
json.append(subJson);
@@ -2589,7 +2590,7 @@
perInfo["StartTime"] = StartTime;
perInfo["EndTime"] = EndTime;
perInfo["IsSync"] = UploadFlag;
- perInfo["threshold"] = CmpThreshold;
+ perInfo["threshold"] = atoi(CmpThreshold.c_str());
perInfo["enabled"] = Enabled;
perInfo["distributionIds"] = m_cluster_id;
perInfo["distributionNames"] = m_cluster_name;
@@ -2721,7 +2722,7 @@
fieldValues.insert(std::make_pair("startTime", StartTime));
fieldValues.insert(std::make_pair("endTime", EndTime));
// #todo
- fieldValues.insert(std::make_pair("create_by", "who"));
+ fieldValues.insert(std::make_pair("create_by", createBy));
fieldValues.insert(std::make_pair("uploadFlag", UploadFlag));
fieldValues.insert(std::make_pair("cmpThreshold", CmpThreshold));
@@ -3476,7 +3477,9 @@
str_imgName += "-";
str_imgName += "snapshot.jpg";
//admin:a1234567@192.168.1.201:554/h264/ch1/main/av_stream -r 1/25 -f image2 -s 1920*1080 /home/basic/work_src/a.jpg
- std::string cmd("ffmpeg -i " + rtsp_url + " -vf select='eq(pict_type\\,I)',setpts='N/(25*TB)' -f image2 -s 1920*1080 -y " + str_imgName);
+ std::string cmd(
+ "ffmpeg -i " + rtsp_url + " -vf select='eq(pict_type\\,I)',setpts='N/(25*TB)' -f image2 -s 1920*1080 -y " +
+ str_imgName);
// std::string cmd("ffmpeg -i " + rtsp_url + " -r 1/25 -f image2 -s 1920*1080 -y " + str_imgName);
DBG(cmd);
system(cmd.c_str());
@@ -3494,14 +3497,14 @@
CvUtil::cvMat2Buffer(img, 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;
}
fdfsClient.rwLock.unlock();
Json::Value result;
result["imgUrl"] = strImgUrl;
- db_c.updateCamDevSnapshot(QString::fromStdString(ip),QString::fromStdString(strImgUrl));
+ db_c.updateCamDevSnapshot(QString::fromStdString(ip), QString::fromStdString(strImgUrl));
return result.toStyledString();
--
Gitblit v1.8.0