From 25928e3093a7c0257128192d7785ec3f74e89e81 Mon Sep 17 00:00:00 2001
From: pans <pansen626@sina.com>
Date: 星期六, 30 三月 2019 12:46:20 +0800
Subject: [PATCH] 添加注释
---
syncDBTool/ErlangDbTool.cpp | 15 ++++++++++-----
1 files changed, 10 insertions(+), 5 deletions(-)
diff --git a/syncDBTool/ErlangDbTool.cpp b/syncDBTool/ErlangDbTool.cpp
index 319d361..b3cdeea 100755
--- a/syncDBTool/ErlangDbTool.cpp
+++ b/syncDBTool/ErlangDbTool.cpp
@@ -11,6 +11,8 @@
#include <QtCore/QString>
#include <QtCore/QDebug>
#include <QtCore/QVariantList>
+#include <basic/util/app/AppPreference.hpp>
+
using ErlangTool::map_DevDataCache;
using ErlangTool::map_TabDataCache;
@@ -1614,7 +1616,7 @@
}
if (str_tableUuid.size() > 0) {
QString sql = QString::fromStdString(
- "Select a.uuid as id ,a.faceUrl as img,a.feature,b.idCard as idcard,b.enable,b.monitorLevel from '" +
+ "Select a.uuid as id ,a.faceUrl as img,a.feature,b.idCard as idcard,b.enabled,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);
@@ -1654,8 +1656,11 @@
}
}
if (str_tableUuid.size() > 0) {
+// QString sql = QString::fromStdString(
+// "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);");
QString sql = QString::fromStdString(
- "Select b.uuid as id,b.faceUrl as img,a.idCard as idcard,a.enable,a.monitorLevel from '" + str_tableUuid +
+ "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);");
QSqlQuery query(g_syncDbFile);
query.prepare(sql);
@@ -1667,8 +1672,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();
+// 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));
}
@@ -1757,7 +1762,7 @@
ETERM *fromp, *tuplep, *fnp, *argp, *resp;
int port; /* Listen port number */
- port = PORT;
+ port = appPref.getIntData("ErlNodePort");
/* Make a listen socket */
if ((listen = my_listen(port)) <= 0) {
ERR("my_listen is error");
--
Gitblit v1.8.0