From cdfb8eb2a956d25d688033be735f4741b2ab58bd Mon Sep 17 00:00:00 2001
From: xuxiuxi <554325746@qq.com>
Date: 星期五, 15 三月 2019 09:48:42 +0800
Subject: [PATCH] Merge branch 'yw.1.2.fixbug' of http://192.168.1.226:10010/r/development/c++ into yw.1.2.fixbug
---
QiaoJiaSystem/DataManagerServer/vss/dao/BaseDao.h | 29 ++++++++++++++++-------------
1 files changed, 16 insertions(+), 13 deletions(-)
diff --git a/QiaoJiaSystem/DataManagerServer/vss/dao/BaseDao.h b/QiaoJiaSystem/DataManagerServer/vss/dao/BaseDao.h
index e129903..bfffec3 100644
--- a/QiaoJiaSystem/DataManagerServer/vss/dao/BaseDao.h
+++ b/QiaoJiaSystem/DataManagerServer/vss/dao/BaseDao.h
@@ -77,7 +77,8 @@
return rowDataList;
}
- static Json::Value findJsonArray(string sql) {
+ static Json::Value findJsonArray(string sql, std::map<std::string, std::string>& whereColumns) {
+ sql = sql + getWhereColumnNameValuePair(whereColumns);
initConnection();
mysqlpp::Query query = conn->query(sql);
Json::Value rowList;
@@ -97,6 +98,7 @@
rowList.append(row);
}
} else {
+ cout << "error " <<query.error() << endl;
cout << "query failed" << endl;
}
return rowList;
@@ -130,20 +132,21 @@
return updateSql;
}
static void doConnect() {
- // if (conn->connect(
-// appConfig.getStringProperty("database").c_str(),
-// appConfig.getStringProperty("db_host").c_str(),
-// appConfig.getStringProperty("db_user").c_str(),
-// appConfig.getStringProperty("db_password").c_str(),
-// appConfig.getIntProperty("db_port")
-// )) {
+ cout << "db_host=" << appConfig.getStringProperty("db_host").c_str() << endl;
if (conn->connect(
- "EGEyesForVSS",
- "192.168.1.148",
- "root",
- "123456",
- 3306
+ appConfig.getStringProperty("database").c_str(),
+ appConfig.getStringProperty("db_host").c_str(),
+ appConfig.getStringProperty("db_user").c_str(),
+ appConfig.getStringProperty("db_password").c_str(),
+ appConfig.getIntProperty("db_port")
)) {
+// if (conn->connect(
+// "EGEyesForVSS",
+// "192.168.1.148",
+// "root",
+// "123456",
+// 3306
+// )) {
cout << "connect success" << endl;
} else {
cout << "connect failed" << endl;
--
Gitblit v1.8.0