From dd5adf6383819915967b2a76b18ca6e4d88d60cd Mon Sep 17 00:00:00 2001
From: pansen <pansen626@sina.com>
Date: 星期三, 30 一月 2019 09:59:31 +0800
Subject: [PATCH] 添加布控等级。对比暂未添加本字段。
---
QiaoJiaSystem/build/DataWebServer | 0
QiaoJiaSystem/DataManagerServer/http_configserver.cpp | 13 ++++++++-----
QiaoJiaSystem/build/scpToSer.sh | 2 +-
3 files changed, 9 insertions(+), 6 deletions(-)
diff --git a/QiaoJiaSystem/DataManagerServer/http_configserver.cpp b/QiaoJiaSystem/DataManagerServer/http_configserver.cpp
index eb2ff5f..f781e87 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));
@@ -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();
diff --git a/QiaoJiaSystem/build/DataWebServer b/QiaoJiaSystem/build/DataWebServer
index aead73a..2cd6ac0 100755
--- a/QiaoJiaSystem/build/DataWebServer
+++ b/QiaoJiaSystem/build/DataWebServer
Binary files differ
diff --git a/QiaoJiaSystem/build/scpToSer.sh b/QiaoJiaSystem/build/scpToSer.sh
index fda9895..77b3d5b 100644
--- a/QiaoJiaSystem/build/scpToSer.sh
+++ b/QiaoJiaSystem/build/scpToSer.sh
@@ -10,7 +10,7 @@
des_pass=123
expect -c "
# spawn scp -P41100 ${CUR_PATH}"/"$1 basic@58.118.225.79:/home/basic/Apps/QiaoJiaSystem/build
- spawn scp ${CUR_PATH}"/"$1 basic@192.168.1.203:/home/basic/Apps/QiaoJiaSystem/build
+ spawn scp ${CUR_PATH}"/"$1 basic@192.168.1.182:/home/basic/Apps/QiaoJiaSystem/build
expect \"password:\"
send \"${des_pass}\r\"
expect eof
--
Gitblit v1.8.0