From a89689b92b07cf1830ad8b46521eda92e7f927c0 Mon Sep 17 00:00:00 2001
From: pansen <pansen626@sina.com>
Date: 星期三, 30 一月 2019 16:37:45 +0800
Subject: [PATCH] 修改bug
---
QiaoJiaSystem/LocalDBTool/SqliteToolkit.hpp | 16 ++++++++++++++--
1 files changed, 14 insertions(+), 2 deletions(-)
diff --git a/QiaoJiaSystem/LocalDBTool/SqliteToolkit.hpp b/QiaoJiaSystem/LocalDBTool/SqliteToolkit.hpp
index 6e2ed40..7495c9d 100644
--- a/QiaoJiaSystem/LocalDBTool/SqliteToolkit.hpp
+++ b/QiaoJiaSystem/LocalDBTool/SqliteToolkit.hpp
@@ -28,6 +28,7 @@
std::string uuid;
FaceFeature feature;
std::string faceUrl;
+ std::string feature_base64;
};
struct FaceInfo {
@@ -37,6 +38,8 @@
std::string sex;
std::string idCard;
std::string phoneNum;
+ std::string enable;
+ std::string monLevel;
};
typedef std::vector<FaceInfo> FaceInfos;
typedef std::map<std::string, FaceInfo> FaceInfosCache;
@@ -66,6 +69,7 @@
std::string faceurl;
FaceFeature faceFeature;
std::string enable;
+ std::string monLevel;
};
typedef std::map<std::string, FaceFeatureWithUrl> FeatureDBWithUrlCache;
@@ -86,8 +90,9 @@
//
std::string getFacesFromTableSql(std::string tableName) {
+// #todo get monLevel 鑱斿悎鏌ヨ
std::string sql =
- "select uuid,feature,create_time,faceUrl,del_flag,enabled from '" + tableName +
+ "select uuid,feature,create_time,faceUrl,del_flag from '" + tableName +
"_fea' where feature is not null ";
return sql;
}
@@ -179,7 +184,7 @@
std::string sqlTemp = sql;
std::string sql2 = ") VALUES('";
for (auto item : fieldValues) {
- if (item.first.size() != 0) {
+ if (item.first.size() != 0 && item.second.size() != 0) {
sql.append(item.first + ",");
sql2.append(item.second + "','");
}
@@ -199,6 +204,9 @@
* @return sql
*/
std::string getInitDBSql() {
+// %% ALTER TABLE sys_o_tables ADD COLUMN uploadFlag varchar(255) DEFAULT 0;
+// %% ALTER TABLE sys_o_tables ADD COLUMN cmpThreshold varchar(255) DEFAULT 60;
+// %% ALTER TABLE sys_o_tables ADD COLUMN enabled varchar(255) DEFAULT 1;
std::string sql = "CREATE TABLE \"main\".\"sys_o_tables\" (";
sql.append(" uuid varchar(255) PRIMARY KEY, ");
// sql.append(" ClusterName varchar(255) DEFAULT NULL,");//鏈湴搴撲笉闇�瑕�
@@ -243,6 +251,7 @@
sql.append("update_time DATETIME DEFAULT NULL,");
sql.append("create_by varchar(255) DEFAULT NULL,");
sql.append("del_flag INTEGER DEFAULT 0,");
+ sql.append("monitorLevel varchar(255) DEFAULT 0,");
sql.append(" enabled varchar(255) DEFAULT 1");
sql.append(");");
// 浜鸿劯鐗瑰緛琛�
@@ -278,6 +287,9 @@
std::string sql = "update '";
sql.append(tableName + "' set ");
for (auto &item :fieldValues) {
+ if (item.second.size() == 0) {
+ continue;
+ }
sql.append(item.first + " = '" + item.second + "',");
}
sql.append(" update_time ='" + AppUtil::getTimeSecString() + "'");
--
Gitblit v1.8.0