From 43a25cfe285b11f88a4678cd94b929866b6fedc5 Mon Sep 17 00:00:00 2001
From: pansen <pansen626@sina.com>
Date: 星期六, 26 一月 2019 14:08:02 +0800
Subject: [PATCH] # Type(<scope>): <subject>
---
QiaoJiaSystem/DataManagerServer/http_configserver.cpp | 17 ++++++++++-------
1 files changed, 10 insertions(+), 7 deletions(-)
diff --git a/QiaoJiaSystem/DataManagerServer/http_configserver.cpp b/QiaoJiaSystem/DataManagerServer/http_configserver.cpp
index 7adc23f..9a632e9 100644
--- a/QiaoJiaSystem/DataManagerServer/http_configserver.cpp
+++ b/QiaoJiaSystem/DataManagerServer/http_configserver.cpp
@@ -1867,8 +1867,12 @@
std::string EndTime = value["EndTime"].asString();
std::string UploadFlag = value["IsSync"].asString();
+ UploadFlag = UploadFlag.empty() ? "0" : UploadFlag;
std::string CmpThreshold = value["threshold"].asString();
+ CmpThreshold = CmpThreshold.empty() ? "60" : CmpThreshold;
std::string Enabled = value["enabled"].asString();
+ Enabled = Enabled.empty() ? "1" : Enabled;
+
bool ret = false;
FieldValues fieldValues;
fieldValues.insert(std::make_pair("uuid", Uuid));
@@ -2414,10 +2418,9 @@
string str_serIp = GET_STR_CONFIG("mainServerIp");
string str_serPort = GET_STR_CONFIG("mainServerPort");
-// string sendUrl = "192.168.1.203:3697/addPerson/uploadToTemporary";
+// string sendUrl = "192.168.1.203:3697/addPerson/uploadToTemporary";
string sendUrl = str_serIp;
sendUrl.append(":").append(str_serPort).append("/addPerson/uploadToTemporary");
-
Json::Value perInfos;
Json::Value perInfo;
@@ -2429,7 +2432,6 @@
auto rec = db_c.searchConfigTableWithinServerInfo();
perInfo["deviceId"] = rec.dev_id.toStdString();
perInfo["photos"] = img_url;
-// perInfo["featureBase"] = feature_base64;
perInfo["featureBase64"] = feature_base64;
perInfo["cardId"] = idcard;//鍥剧墖鎻忚堪
perInfos.append(perInfo);
@@ -2544,10 +2546,6 @@
//#鏇存柊搴曞簱绠＄悊琛�
FieldValues fieldValues;
fieldValues.insert(std::make_pair("uuid", Uuid));
- if (TableName.find("lt_") != 0) {
- TableName.insert(0, "lt_");
- }
- fieldValues.insert(std::make_pair("tableName", TableName));
// fieldValues.insert(std::make_pair("tableDesc", "ceshi2"));
fieldValues.insert(std::make_pair("tableType", TableType));
fieldValues.insert(std::make_pair("bwType", BwType));
@@ -2562,9 +2560,14 @@
if (TableType == "person") {
if (SyncType == 1) {
+ fieldValues.insert(std::make_pair("tableName", TableName));
//鍚屾搴�
ret = erlangDbTool->updateDatabase("sys_o_tables", fieldValues);
} else if (SyncType == 0) {
+ if (TableName.find("lt_") != 0) {
+ TableName.insert(0, "lt_");
+ }
+ fieldValues.insert(std::make_pair("tableName", TableName));
//鏈湴搴�
ret = m_SqliteFaceEncap.updateTable("sys_o_tables", fieldValues);
}
--
Gitblit v1.8.0