From b10d8e00b83032d802adab3222def7e6d280d928 Mon Sep 17 00:00:00 2001
From: pansen <pansen626@sina.com>
Date: 星期一, 28 一月 2019 20:33:33 +0800
Subject: [PATCH] 添加布控等级。对比暂未添加本字段。
---
QiaoJiaSystem/build/DataWebServer | 0
QiaoJiaSystem/DataManagerServer/http_configserver.cpp | 3 ++-
QiaoJiaSystem/build/FaceSearchServer | 0
QiaoJiaSystem/LocalDBTool/SqliteFaceEncap.cpp | 1 -
QiaoJiaSystem/LocalDBTool/SqliteToolkit.hpp | 3 ++-
QiaoJiaSystem/build/syncDBClient | 0
syncDBTool/ErlangDbTool.cpp | 3 ++-
7 files changed, 6 insertions(+), 4 deletions(-)
diff --git a/QiaoJiaSystem/DataManagerServer/http_configserver.cpp b/QiaoJiaSystem/DataManagerServer/http_configserver.cpp
index ad5ae68..9d26d1a 100644
--- a/QiaoJiaSystem/DataManagerServer/http_configserver.cpp
+++ b/QiaoJiaSystem/DataManagerServer/http_configserver.cpp
@@ -2632,7 +2632,8 @@
subJson.append("\"uuid\":\"" + item.second.uuid + "\",");
subJson.append("\"tableName\":\"" + TableName + "\",");
subJson.append("\"idcard\":\"" + t_faceInfoCache[item.second.uuid].idCard + "\",");
- subJson.append("\"enable\":\"" + item.second.enable + "\",");
+ subJson.append("\"enable\":\"" + t_faceInfoCache[item.second.uuid].enable + "\",");
+ subJson.append("\"monLevel\":\"" + t_faceInfoCache[item.second.uuid].monLevel + "\",");
subJson.append("\"imgUrl\":\"" + item.second.faceurl + "\"");
// subJson.append("\"feature\":\"" + item.second.feature + "\",");
//#todo modifysvn upda svn comm
diff --git a/QiaoJiaSystem/LocalDBTool/SqliteFaceEncap.cpp b/QiaoJiaSystem/LocalDBTool/SqliteFaceEncap.cpp
index cc63e6f..8d2b1c7 100644
--- a/QiaoJiaSystem/LocalDBTool/SqliteFaceEncap.cpp
+++ b/QiaoJiaSystem/LocalDBTool/SqliteFaceEncap.cpp
@@ -346,7 +346,6 @@
memcpy(t_feas.faceFeature.data(), t_fea.data(), t_fea.size());
// string create_time = query.value(2).toString().toStdString();
t_feas.faceurl = query.value(3).toString().toStdString();
- t_feas.enable = query.value(5).toString().toStdString();
}
}
}
diff --git a/QiaoJiaSystem/LocalDBTool/SqliteToolkit.hpp b/QiaoJiaSystem/LocalDBTool/SqliteToolkit.hpp
index 38f2ea8..d59bc75 100644
--- a/QiaoJiaSystem/LocalDBTool/SqliteToolkit.hpp
+++ b/QiaoJiaSystem/LocalDBTool/SqliteToolkit.hpp
@@ -69,6 +69,7 @@
std::string faceurl;
FaceFeature faceFeature;
std::string enable;
+ std::string monLevel;
};
typedef std::map<std::string, FaceFeatureWithUrl> FeatureDBWithUrlCache;
@@ -91,7 +92,7 @@
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;
}
diff --git a/QiaoJiaSystem/build/DataWebServer b/QiaoJiaSystem/build/DataWebServer
index ffaaa5b..7b6059c 100755
--- a/QiaoJiaSystem/build/DataWebServer
+++ b/QiaoJiaSystem/build/DataWebServer
Binary files differ
diff --git a/QiaoJiaSystem/build/FaceSearchServer b/QiaoJiaSystem/build/FaceSearchServer
index fdb46a6..266517b 100755
--- a/QiaoJiaSystem/build/FaceSearchServer
+++ b/QiaoJiaSystem/build/FaceSearchServer
Binary files differ
diff --git a/QiaoJiaSystem/build/syncDBClient b/QiaoJiaSystem/build/syncDBClient
index 0d6caf2..e6eab6e 100755
--- a/QiaoJiaSystem/build/syncDBClient
+++ b/QiaoJiaSystem/build/syncDBClient
Binary files differ
diff --git a/syncDBTool/ErlangDbTool.cpp b/syncDBTool/ErlangDbTool.cpp
index b0cc410..319d361 100755
--- a/syncDBTool/ErlangDbTool.cpp
+++ b/syncDBTool/ErlangDbTool.cpp
@@ -1614,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,a.enable,a.monitorLevel 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);
--
Gitblit v1.8.0