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 +++++++++----
QiaoJiaSystem/LocalDBTool/SqliteToolkit.hpp | 34 +++++++++++++++++-----------------
syncDBTool/ErlangDbTool.cpp | 4 +++-
3 files changed, 29 insertions(+), 22 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);
}
diff --git a/QiaoJiaSystem/LocalDBTool/SqliteToolkit.hpp b/QiaoJiaSystem/LocalDBTool/SqliteToolkit.hpp
index f72924a..4dbacb0 100644
--- a/QiaoJiaSystem/LocalDBTool/SqliteToolkit.hpp
+++ b/QiaoJiaSystem/LocalDBTool/SqliteToolkit.hpp
@@ -86,13 +86,13 @@
//
std::string getFacesFromTableSql(std::string tableName) {
std::string sql =
- "select uuid,feature,create_time,faceUrl,del_flag from " + tableName +
- "_fea where feature is not null ";
+ "select uuid,feature,create_time,faceUrl,del_flag from '" + tableName +
+ "_fea' where feature is not null ";
return sql;
}
std::string getTableListSqlWithType(std::string type) {
- std::string sql = "select tableName,del_flag from " + g_tableName + " where del_flag = 0";
+ std::string sql = "select tableName,del_flag from '" + g_tableName + "' where del_flag = 0";
if (type.size() > 0) {
sql.append(" and tableType = '" + type + "'");
}
@@ -100,7 +100,7 @@
}
std::string getTableInfosSql(std::string tableName) {
- std::string sql = "select * from " + tableName;// + " where del_flag = 0";
+ std::string sql = "select * from '" + tableName+"';";// + " where del_flag = 0";
return sql;
}
@@ -129,7 +129,7 @@
str_fea.assign(feature.begin(), feature.end());
std::stringstream sql;//= ;
- sql << "INSERT INTO " << tableName << " (";
+ sql << "INSERT INTO '" << tableName << "' (";
//std::string sqlTemp = sql;
std::string sql2 = ") VALUES(\"";
if (id >= 0) {
@@ -154,7 +154,7 @@
//#todo errInfo
return "tableName or fieldValues is NULL";
}
- std::string sql = "DELETE from " + tableName + " where 1 = 1 ";
+ std::string sql = "DELETE from '" + tableName + "' where 1 = 1 ";
for (auto item : fieldValues) {
if (item.first.size() != 0) {
sql.append("and " + item.first + " = '" + item.second + "' ");
@@ -174,7 +174,7 @@
//#todo errInfo
return "tableName or fieldValues is NULL";
}
- std::string sql = "INSERT INTO " + tableName + " (";
+ std::string sql = "INSERT INTO '" + tableName + "' (";
std::string sqlTemp = sql;
std::string sql2 = ") VALUES('";
for (auto item : fieldValues) {
@@ -187,7 +187,7 @@
sql = sql.substr(0, sql.length() - 1);
//sql2 delete 2 ,' add )
sql2 = sql2.substr(0, sql2.length() - 2);
- sql2.append(" )");
+ sql2.append(" );");
sql.append(sql2);
return sql;
}
@@ -230,9 +230,9 @@
return "tableName is NULL";
}
// 浜哄憳淇℃伅琛�
- std::string sql = "CREATE TABLE " + g_dbName + ".";
+ std::string sql = "CREATE TABLE " + g_dbName + ".'";
sql.append(tableName);
- sql.append(" ( uuid varchar(255) PRIMARY KEY,");
+ sql.append("' ( uuid varchar(255) PRIMARY KEY,");
sql.append("personName varchar(255) DEFAULT NULL,");
sql.append("age varchar(255) DEFAULT NULL,");
sql.append("sex varchar(255) DEFAULT NULL,");
@@ -245,8 +245,8 @@
sql.append(" enabled varchar(255) DEFAULT 1");
sql.append(");");
// 浜鸿劯鐗瑰緛琛�
- sql.append("CREATE TABLE " + g_dbName + ".");
- sql.append(tableName + "_fea");
+ sql.append("CREATE TABLE " + g_dbName + ".'");
+ sql.append(tableName + "_fea'");
sql.append(" ( uuid varchar(255) PRIMARY KEY,");
sql.append(" feature BLOB NOT NULL,");
sql.append(" faceUrl BLOB NOT NULL,");
@@ -274,13 +274,13 @@
SQLERR("fieldValues size is error");
return "";
}
- std::string sql = "update ";
- sql.append(tableName + " set ");
+ std::string sql = "update '";
+ sql.append(tableName + "' set ");
for (auto &item :fieldValues) {
sql.append(item.first + " = '" + item.second + "',");
}
sql.append(" update_time ='" + AppUtil::getTimeSecString() + "'");
- sql.append(" where uuid ='" + uuid + "'");
+ sql.append(" where uuid ='" + uuid + "';");
return sql;
}
@@ -291,8 +291,8 @@
//#todo errInfo
return "tableName is NULL";
}
- std::string sql = "DROP TABLE " + g_dbName + "." + tableName + ";";
- sql.append("DROP TABLE " + g_dbName + "." + tableName + "_fea;");
+ std::string sql = "DROP TABLE " + g_dbName + ".'" + tableName + "';";
+ sql.append("DROP TABLE " + g_dbName + ".'" + tableName + "_fea';");
return sql;
}
diff --git a/syncDBTool/ErlangDbTool.cpp b/syncDBTool/ErlangDbTool.cpp
index 0beefca..667704a 100755
--- a/syncDBTool/ErlangDbTool.cpp
+++ b/syncDBTool/ErlangDbTool.cpp
@@ -751,7 +751,7 @@
ErlMessage emsg; /* Incoming message */
int ret = -1;
ETERM *arrlist[7];
- arrlist[0] = erl_mk_atom(strSql.c_str());
+ arrlist[0] = erl_mk_string(strSql.c_str());
ETERM *list = erl_mk_list(arrlist, 1);
ret = erl_rpc_to(m_fd, "syncDB", "exeSomeSql", list);
@@ -1188,6 +1188,8 @@
bool ErlangTool::ErlangDbTool::updatePerson(std::string t_tableName, AddFaceData &faceData, FieldValues &fieldValues) {
// #todo 璁板緱娴嬭瘯涓枃
std::string strSql = getUpdateFaceTableSql(t_tableName, fieldValues);
+ // #todo 璁板緱娴嬭瘯涓枃 鍙湁浜哄憳淇℃伅琛ㄦ洿鏂帮紝鐗瑰緛鏇存柊鏆傛椂娌″仛
+
return getExecSqlResult(strSql);
}
--
Gitblit v1.8.0