From 4b2cbeb00e05c3c7eff7e2ab325e09b9727606a7 Mon Sep 17 00:00:00 2001
From: pansen <pansen626@sina.com>
Date: 星期四, 28 二月 2019 17:16:55 +0800
Subject: [PATCH] 版本适配暂时注掉两个属性。 暂时注掉MySQL
---
QiaoJiaSystem/DataManagerServer/http_configserver.cpp | 9 ++++++---
QiaoJiaSystem/DataManagerServer/CMakeLists.txt | 2 +-
syncDBTool/ErlangDbTool.cpp | 9 ++++++---
3 files changed, 13 insertions(+), 7 deletions(-)
diff --git a/QiaoJiaSystem/DataManagerServer/CMakeLists.txt b/QiaoJiaSystem/DataManagerServer/CMakeLists.txt
index e36f449..d6a2220 100644
--- a/QiaoJiaSystem/DataManagerServer/CMakeLists.txt
+++ b/QiaoJiaSystem/DataManagerServer/CMakeLists.txt
@@ -154,7 +154,7 @@
HCCore
hcnetsdk
pthread
- mysqlpp
+# mysqlpp
)
#add_executable(Apptest
diff --git a/QiaoJiaSystem/DataManagerServer/http_configserver.cpp b/QiaoJiaSystem/DataManagerServer/http_configserver.cpp
index 6d83ede..7521a07 100644
--- a/QiaoJiaSystem/DataManagerServer/http_configserver.cpp
+++ b/QiaoJiaSystem/DataManagerServer/http_configserver.cpp
@@ -23,11 +23,13 @@
#include <dirent.h>
#include "basic/pipe_element/ffmpeg/basic_struct_for_video_image.h"
+#ifdef MYSQLRET
#include "vss/controller/VssDevTblController.h"
#include "vss/controller/VssChannelTblController.h"
#include "vss/controller/VssDomainUnitTblController.h"
#include "vss/controller/VssLocalSettingTblController.h"
#include "vss/controller/VssUpperSvrTblController.h"
+#endif
using namespace std;
@@ -248,7 +250,7 @@
std::placeholders::_1, std::placeholders::_2,
std::placeholders::_3, std::placeholders::_4));
-
+#ifdef MYSQLRET
BaseDao::initConnection();
VssLocalSettingTblSqliteDao::instance()->setLDBTool(&db_c);
VssDevTblController::instance()->registerHttpServices(_HttpSrvRetRecieve);
@@ -256,7 +258,7 @@
VssDomainUnitTblController::instance()->registerHttpServices(_HttpSrvRetRecieve);
VssLocalSettingTblController::instance()->registerHttpServices(_HttpSrvRetRecieve);
VssUpperSvrTblController::instance()->registerHttpServices(_HttpSrvRetRecieve);
-
+#endif
_HttpSrvRetRecieve.start();
_HttpSrvRetRecieve.waitForShutDown();
}
@@ -1859,7 +1861,8 @@
}
std::string devHttpServer_c::createDatabase(std::string ip, unsigned int port, std::string content,
- PResponse &response) { DBG("ip:" << ip << "; port:" << port);
+ PResponse &response) {
+ DBG("ip:" << ip << "; port:" << port);
DBG("content: " << content);
if (erlangDbTool == nullptr) {
response->write(SimpleWeb::StatusCode::server_error_not_implemented, "{\"error\":\"鑺傜偣涓嶅瓨鍦� \"}");
diff --git a/syncDBTool/ErlangDbTool.cpp b/syncDBTool/ErlangDbTool.cpp
index 319d361..e736943 100755
--- a/syncDBTool/ErlangDbTool.cpp
+++ b/syncDBTool/ErlangDbTool.cpp
@@ -1654,8 +1654,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 +1670,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));
}
--
Gitblit v1.8.0