From 99221e4721a1246883465c2b52fbff14eb9aaa7a Mon Sep 17 00:00:00 2001
From: pans <pansen626@sina.com>
Date: 星期六, 30 三月 2019 12:12:02 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/yangwu1.3' into yangwu1.3
---
QiaoJiaSystem/LocalDBTool/SqliteFaceEncap.cpp | 13 +++++++++++++
1 files changed, 13 insertions(+), 0 deletions(-)
diff --git a/QiaoJiaSystem/LocalDBTool/SqliteFaceEncap.cpp b/QiaoJiaSystem/LocalDBTool/SqliteFaceEncap.cpp
index 2ae3d1e..8d2b1c7 100644
--- a/QiaoJiaSystem/LocalDBTool/SqliteFaceEncap.cpp
+++ b/QiaoJiaSystem/LocalDBTool/SqliteFaceEncap.cpp
@@ -179,6 +179,9 @@
if (faceData.faceUrl.size() > 0) {
strSql.append(" faceUrl = :faceUrl ,");
}
+// if (faceData.enabled.size() > 0) {
+// strSql.append(" enabled = :enabled ,");
+// }
//#todo
strSql.append(" update_time = '2010-01-03 01:01:00' ");
@@ -192,6 +195,9 @@
if (faceData.faceUrl.size() > 0) {
query.addBindValue(QString::fromStdString(faceData.faceUrl));
}
+// if (faceData.enabled.size() > 0) {
+// query.addBindValue(QString::fromStdString(faceData.enabled));
+// }
if (!query.exec()) {
ERR("updateFaceData fail");
@@ -370,6 +376,11 @@
tableInfo.bwType = query.value(3).toString().toStdString();
tableInfo.startTime = query.value(4).toString().toStdString();
tableInfo.endTime = query.value(5).toString().toStdString();
+ tableInfo.uploadFlag = query.value(6).toString().toStdString();
+ tableInfo.cmpThreshold = query.value(7).toString().toStdString();
+ tableInfo.enabled = query.value(8).toString().toStdString();
+ tableInfo.createBy = query.value(9).toString().toStdString();
+
tableInfos.push_back(tableInfo);
}
}
@@ -397,6 +408,8 @@
tableInfo.sex = query.value(3).toString().toStdString();
tableInfo.idCard = query.value(4).toString().toStdString();
tableInfo.phoneNum = query.value(5).toString().toStdString();
+ tableInfo.enable = query.value(10).toString().toStdString();
+ tableInfo.monLevel = query.value(11).toString().toStdString();
faceInfosCache.insert(std::make_pair(tableInfo.uuid, tableInfo));
}
}
--
Gitblit v1.8.0