From edb7c9ae9cd72601bcb58d3e1a3d9bf9250f0100 Mon Sep 17 00:00:00 2001
From: pansen <pansen626@sina.com>
Date: 星期二, 29 一月 2019 09:44:54 +0800
Subject: [PATCH] 添加布控等级。对比暂未添加本字段。
---
syncDBTool/ErlangDbTool.cpp | 45 ++++++++++++++++++++++++++++++++++++++++-----
1 files changed, 40 insertions(+), 5 deletions(-)
diff --git a/syncDBTool/ErlangDbTool.cpp b/syncDBTool/ErlangDbTool.cpp
index 75280bc..319d361 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);
@@ -995,7 +995,7 @@
map_TabDataCache tabDataCache;
QString sql = QString::fromStdString(
- "SELECT uuid,tableName,tableType,bwType,startTime,endTime,uploadFlag,cmpThreshold,enabled FROM sys_o_tables where del_flag=0;");
+ "SELECT uuid,tableName,tableType,bwType,startTime,endTime,uploadFlag,cmpThreshold,enabled,create_by FROM sys_o_tables where del_flag=0;");
QSqlQuery query(g_syncDbFile);
query.prepare(sql);
if (!query.exec()) {
@@ -1012,6 +1012,7 @@
t_table_info.uploadFlag = query.value(6).toString().toStdString();
t_table_info.cmpThreshold = query.value(7).toString().toStdString();
t_table_info.enabled = query.value(8).toString().toStdString();
+ t_table_info.create_by = query.value(9).toString().toStdString();
tabDataCache.insert(std::make_pair(t_table_info.uuid, t_table_info));
}
@@ -1184,6 +1185,35 @@
return false;
}
+bool ErlangTool::ErlangDbTool::addPerson(std::string t_tableName, AddFaceData &faceData, FieldValues &fieldValues) {
+// #todo 璁板緱娴嬭瘯涓枃
+ std::string strSql = getInsertSql(t_tableName, fieldValues);
+ fieldValues.clear();
+ fieldValues.insert(make_pair("uuid", faceData.uuid));
+ fieldValues.insert(make_pair("faceUrl", faceData.faceUrl));
+ fieldValues.insert(make_pair("feature", faceData.feature_base64));
+
+ std::string strSqlFea = getInsertSql(t_tableName + "_fea", fieldValues);
+ strSql.append(strSqlFea);
+ // #todo 璁板緱娴嬭瘯涓枃 鍙湁浜哄憳淇℃伅琛ㄦ洿鏂帮紝鐗瑰緛鏇存柊鏆傛椂娌″仛
+
+ return getExecSqlResult(strSql);
+}
+
+bool ErlangTool::ErlangDbTool::updatePerson(std::string t_tableName, AddFaceData &faceData, FieldValues &fieldValues) {
+// #todo 璁板緱娴嬭瘯涓枃
+ std::string strSql = getUpdateFaceTableSql(t_tableName, fieldValues);
+ fieldValues.clear();
+ fieldValues.insert(make_pair("uuid", faceData.uuid));
+ fieldValues.insert(make_pair("faceUrl", faceData.faceUrl));
+
+ fieldValues.insert(make_pair("feature", faceData.feature_base64));
+
+ std::string strSqlFea = getInsertSql(t_tableName + "_fea", fieldValues);
+ strSql.append(strSqlFea);
+
+ return getExecSqlResult(strSql);
+}
ErlangTool::vec_AddDataCache
ErlangTool::ErlangDbTool::addPersons(std::string TableUuid, std::vector<SyncDB::AddPersonInfo> &tmpPer) {
@@ -1584,7 +1614,8 @@
}
if (str_tableUuid.size() > 0) {
QString sql = QString::fromStdString(
- "Select a.uuid as id ,a.faceUrl as img,a.feature,b.idCard as idcard from '" + str_tableUuid +
+ "Select a.uuid as id ,a.faceUrl as img,a.feature,b.idCard as idcard,b.enable,b.monitorLevel from '" +
+ str_tableUuid +
"_fea' as a ,'" + str_tableUuid + "' as b where a.uuid = b.uuid and ( a.del_flag=0 AND b.del_flag=0);");
QSqlQuery query(g_syncDbFile);
query.prepare(sql);
@@ -1597,6 +1628,8 @@
t_feature_info.img = query.value(1).toString().toStdString();
t_feature_info.feature = query.value(2).toString().toStdString();
t_feature_info.idcard = query.value(3).toString().toStdString();
+ t_feature_info.enable = query.value(4).toString().toStdString();
+ t_feature_info.monLevel = query.value(5).toString().toStdString();
dataCache.insert(std::make_pair(t_feature_info.id, t_feature_info));
}
@@ -1622,8 +1655,8 @@
}
if (str_tableUuid.size() > 0) {
QString sql = QString::fromStdString(
- "Select b.uuid as id,b.faceUrl as img,a.idCard as idcard from '" + str_tableUuid + "' as a, '" +
- str_tableUuid + "_fea' As b where a.uuid = b.uuid and ( a.del_flag=0 AND b.del_flag=0);");
+ "Select b.uuid as id,b.faceUrl as img,a.idCard as idcard,a.enable,a.monitorLevel from '" + str_tableUuid +
+ "' as a, '" + str_tableUuid + "_fea' As b where a.uuid = b.uuid and ( a.del_flag=0 AND b.del_flag=0);");
QSqlQuery query(g_syncDbFile);
query.prepare(sql);
if (!query.exec()) {
@@ -1634,6 +1667,8 @@
t_feature_info.id = query.value(0).toString().toStdString();
t_feature_info.img = query.value(1).toString().toStdString();
t_feature_info.idcard = query.value(2).toString().toStdString();
+ t_feature_info.enable = query.value(3).toString().toStdString();
+ t_feature_info.monLevel = query.value(4).toString().toStdString();
dataCache.insert(std::make_pair(t_feature_info.id, t_feature_info));
}
--
Gitblit v1.8.0