From 30d0bd43f53740554e8387fcd14bfab689eeca9c Mon Sep 17 00:00:00 2001
From: pansen <pansen626@sina.com>
Date: 星期五, 25 一月 2019 21:03:30 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/ywv1.2_布控feature' into ywv1.2_布控feature
---
QiaoJiaSystem/DataManagerServer/http_configserver.cpp | 13 +++++++++----
1 files changed, 9 insertions(+), 4 deletions(-)
diff --git a/QiaoJiaSystem/DataManagerServer/http_configserver.cpp b/QiaoJiaSystem/DataManagerServer/http_configserver.cpp
index 7adc23f..9eaf5e6 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));
@@ -2544,10 +2548,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 +2562,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