From 5fa7c97d9544e7afdf781a93e8ffb58dce22c977 Mon Sep 17 00:00:00 2001
From: pansen <pansen626@sina.com>
Date: 星期五, 08 三月 2019 14:10:35 +0800
Subject: [PATCH] Merge branch 'yw.1.2.fixbug' of ssh://192.168.1.226:29418/development/c++ into yw.1.2
---
QiaoJiaSystem/DataManagerServer/vss/controller/VssLocalSettingTblController.h | 250 ++++++++++++++++++++++++++------------------------
1 files changed, 130 insertions(+), 120 deletions(-)
diff --git a/QiaoJiaSystem/DataManagerServer/vss/controller/VssLocalSettingTblController.h b/QiaoJiaSystem/DataManagerServer/vss/controller/VssLocalSettingTblController.h
index 01259ad..2bef196 100755
--- a/QiaoJiaSystem/DataManagerServer/vss/controller/VssLocalSettingTblController.h
+++ b/QiaoJiaSystem/DataManagerServer/vss/controller/VssLocalSettingTblController.h
@@ -17,47 +17,52 @@
*/
class VssLocalSettingTblController : public VssBaseController {
private:
- /** 鏈湴鍥芥爣閰嶇疆鏋勯�犲嚱鏁� */
- VssLocalSettingTblController() {}
+ /** 鏈湴鍥芥爣閰嶇疆鏋勯�犲嚱鏁� */
+ VssLocalSettingTblController() {}
+
public:
- /** 鏈湴鍥芥爣閰嶇疆鍗曚緥妯″紡 */
- static VssLocalSettingTblController* instance() {
+ /** 鏈湴鍥芥爣閰嶇疆鍗曚緥妯″紡 */
+ static VssLocalSettingTblController *instance() {
static VssLocalSettingTblController instance;
return &instance;
}
-public:
- /** 娉ㄥ唽{label}http鏈嶅姟 */
- void registerHttpServices(HttpSrvRetRecieve& _HttpSrvRetRecieve) {
- _HttpSrvRetRecieve.setInfo("^/addVssLocalSettingTbl$", "POST",
- std::bind(&VssLocalSettingTblController::addVssLocalSettingTbl, this,
- std::placeholders::_1, std::placeholders::_2,
- std::placeholders::_3, std::placeholders::_4));
-
- _HttpSrvRetRecieve.setInfo("^/delVssLocalSettingTbl$", "POST",
- std::bind(&VssLocalSettingTblController::delVssLocalSettingTbl, this,
- std::placeholders::_1, std::placeholders::_2,
- std::placeholders::_3, std::placeholders::_4));
-
- _HttpSrvRetRecieve.setInfo("^/updateVssLocalSettingTbl$", "POST",
- std::bind(&VssLocalSettingTblController::updateVssLocalSettingTbl, this,
- std::placeholders::_1, std::placeholders::_2,
- std::placeholders::_3, std::placeholders::_4));
-
- _HttpSrvRetRecieve.setInfo("^/findVssLocalSettingTbl$", "POST",
- std::bind(&VssLocalSettingTblController::findVssLocalSettingTbl, this,
- std::placeholders::_1, std::placeholders::_2,
- std::placeholders::_3, std::placeholders::_4));
-
- _HttpSrvRetRecieve.setInfo("^/findVssLocalSettingTblList$", "POST",
- std::bind(&VssLocalSettingTblController::findVssLocalSettingTblList, this,
- std::placeholders::_1, std::placeholders::_2,
- std::placeholders::_3, std::placeholders::_4));
+public:
+ /** 娉ㄥ唽{label}http鏈嶅姟 */
+ void registerHttpServices(HttpSrvRetRecieve &_HttpSrvRetRecieve) {
+
+ _HttpSrvRetRecieve.setInfo("^/addVssLocalSettingTbl$", "POST",
+ std::bind(&VssLocalSettingTblController::addVssLocalSettingTbl, this,
+ std::placeholders::_1, std::placeholders::_2,
+ std::placeholders::_3, std::placeholders::_4));
+
+ _HttpSrvRetRecieve.setInfo("^/delVssLocalSettingTbl$", "POST",
+ std::bind(&VssLocalSettingTblController::delVssLocalSettingTbl, this,
+ std::placeholders::_1, std::placeholders::_2,
+ std::placeholders::_3, std::placeholders::_4));
+
+ _HttpSrvRetRecieve.setInfo("^/updateVssLocalSettingTbl$", "POST",
+ std::bind(&VssLocalSettingTblController::updateVssLocalSettingTbl, this,
+ std::placeholders::_1, std::placeholders::_2,
+ std::placeholders::_3, std::placeholders::_4));
+
+ _HttpSrvRetRecieve.setInfo("^/findVssLocalSettingTbl$", "POST",
+ std::bind(&VssLocalSettingTblController::findVssLocalSettingTbl, this,
+ std::placeholders::_1, std::placeholders::_2,
+ std::placeholders::_3, std::placeholders::_4));
+
+ _HttpSrvRetRecieve.setInfo("^/findVssLocalSettingTblList$", "POST",
+ std::bind(&VssLocalSettingTblController::findVssLocalSettingTblList, this,
+ std::placeholders::_1, std::placeholders::_2,
+ std::placeholders::_3, std::placeholders::_4));
}
+
public:
- /** 娣诲姞鏈湴鍥芥爣閰嶇疆 */
+ /** 娣诲姞鏈湴鍥芥爣閰嶇疆 */
std::string addVssLocalSettingTbl(std::string ip, unsigned int port, std::string content, PResponse &response) {
+ DBG("ip:" << ip << "; port:" << port);
+ DBG("content: " << content);
Json::Reader requestJsonReader;
Json::Value requestJsonValue;
Json::Value responseJsonValue;
@@ -65,69 +70,73 @@
responseJsonValue["success"] = "false";
if (requestJsonReader.parse(content, requestJsonValue)) {
VssLocalSettingTblBuilder vssLocalSettingTblBuilder;
-
- Json::Value iDJsonValue = requestJsonValue[VssLocalSettingTbl_ID];
+
+ Json::Value iDJsonValue = requestJsonValue[VssLocalSettingTbl_ID];
if (iDJsonValue.type() != Json::ValueType::nullValue) {
- vssLocalSettingTblBuilder.addID(iDJsonValue.asInt());
+ vssLocalSettingTblBuilder.addID(std::stoi(iDJsonValue.asString()));
}
-
- Json::Value serverIpJsonValue = requestJsonValue[VssLocalSettingTbl_ServerIp];
+
+ Json::Value serverIpJsonValue = requestJsonValue[VssLocalSettingTbl_ServerIp];
if (serverIpJsonValue.type() != Json::ValueType::nullValue) {
vssLocalSettingTblBuilder.addServerIp(serverIpJsonValue.asString());
}
-
- Json::Value serverPortJsonValue = requestJsonValue[VssLocalSettingTbl_ServerPort];
+
+ Json::Value serverPortJsonValue = requestJsonValue[VssLocalSettingTbl_ServerPort];
if (serverPortJsonValue.type() != Json::ValueType::nullValue) {
vssLocalSettingTblBuilder.addServerPort(serverPortJsonValue.asString());
}
-
- Json::Value serverIdJsonValue = requestJsonValue[VssLocalSettingTbl_ServerId];
+
+ Json::Value serverIdJsonValue = requestJsonValue[VssLocalSettingTbl_ServerId];
if (serverIdJsonValue.type() != Json::ValueType::nullValue) {
vssLocalSettingTblBuilder.addServerId(serverIdJsonValue.asString());
}
-
- Json::Value userAuthIdJsonValue = requestJsonValue[VssLocalSettingTbl_UserAuthId];
+
+ Json::Value userAuthIdJsonValue = requestJsonValue[VssLocalSettingTbl_UserAuthId];
if (userAuthIdJsonValue.type() != Json::ValueType::nullValue) {
vssLocalSettingTblBuilder.addUserAuthId(userAuthIdJsonValue.asString());
}
-
- Json::Value passwordJsonValue = requestJsonValue[VssLocalSettingTbl_Password];
+
+ Json::Value passwordJsonValue = requestJsonValue[VssLocalSettingTbl_Password];
if (passwordJsonValue.type() != Json::ValueType::nullValue) {
vssLocalSettingTblBuilder.addPassword(passwordJsonValue.asString());
}
-
- Json::Value updateTimeJsonValue = requestJsonValue[VssLocalSettingTbl_UpdateTime];
+
+ Json::Value updateTimeJsonValue = requestJsonValue[VssLocalSettingTbl_UpdateTime];
if (updateTimeJsonValue.type() != Json::ValueType::nullValue) {
vssLocalSettingTblBuilder.addUpdateTime(updateTimeJsonValue.asString());
}
- auto keyValuesToAdd = vssLocalSettingTblBuilder.buildVssLocalSettingTblMap();
- if (keyValuesToAdd.size() > 0) {
+ auto keyValuesToAdd = vssLocalSettingTblBuilder.buildVssLocalSettingTblMap();
+ if (keyValuesToAdd.size() > 0) {
responseJsonValue = VssLocalSettingTblSqliteDao::instance()->addVssLocalSettingTbl(keyValuesToAdd);
}
}
return responseJsonValue.toStyledString();
}
-
+
/** 鍒犻櫎鏈湴鍥芥爣閰嶇疆 */
std::string delVssLocalSettingTbl(std::string ip, unsigned int port, std::string content, PResponse &response) {
+ DBG("ip:" << ip << "; port:" << port);
+ DBG("content: " << content);
Json::Reader requestJsonReader;
Json::Value requestJsonValue;
Json::Value responseJsonValue;
responseJsonValue["message"] = "鍒犻櫎澶辫触锛�";
responseJsonValue["success"] = "false";
if (requestJsonReader.parse(content, requestJsonValue)) {
- Json::Value iDJsonValue = requestJsonValue[VssLocalSettingTbl_ID];
- if (iDJsonValue.type() != Json::ValueType::nullValue) {
- string iDValue = iDJsonValue.asString();
- responseJsonValue = VssLocalSettingTblSqliteDao::instance()->deleteByColumn("ID", iDValue);
+ Json::Value iDJsonValue = requestJsonValue[VssLocalSettingTbl_ID];
+ if (iDJsonValue.type() != Json::ValueType::nullValue) {
+ string iDValue = iDJsonValue.asString();
+ responseJsonValue = VssLocalSettingTblSqliteDao::instance()->deleteByColumn("ID", iDValue);
}
-
+
}
return responseJsonValue.toStyledString();
}
-
+
/** 鏇存柊鏈湴鍥芥爣閰嶇疆 */
std::string updateVssLocalSettingTbl(std::string ip, unsigned int port, std::string content, PResponse &response) {
+ DBG("ip:" << ip << "; port:" << port);
+ DBG("content: " << content);
Json::Reader requestJsonReader;
Json::Value requestJsonValue;
Json::Value responseJsonValue;
@@ -135,54 +144,54 @@
responseJsonValue["success"] = "false";
if (requestJsonReader.parse(content, requestJsonValue)) {
VssLocalSettingTblBuilder vssLocalSettingTblBuilder;
-
- Json::Value iDJsonValue = requestJsonValue[VssLocalSettingTbl_ID];
+
+ Json::Value iDJsonValue = requestJsonValue[VssLocalSettingTbl_ID];
if (iDJsonValue.type() != Json::ValueType::nullValue) {
- vssLocalSettingTblBuilder.addID(iDJsonValue.asInt());
+ vssLocalSettingTblBuilder.addID(std::stoi(iDJsonValue.asString()));
}
-
- Json::Value serverIpJsonValue = requestJsonValue[VssLocalSettingTbl_ServerIp];
+
+ Json::Value serverIpJsonValue = requestJsonValue[VssLocalSettingTbl_ServerIp];
if (serverIpJsonValue.type() != Json::ValueType::nullValue) {
vssLocalSettingTblBuilder.addServerIp(serverIpJsonValue.asString());
}
-
- Json::Value serverPortJsonValue = requestJsonValue[VssLocalSettingTbl_ServerPort];
+
+ Json::Value serverPortJsonValue = requestJsonValue[VssLocalSettingTbl_ServerPort];
if (serverPortJsonValue.type() != Json::ValueType::nullValue) {
vssLocalSettingTblBuilder.addServerPort(serverPortJsonValue.asString());
}
-
- Json::Value serverIdJsonValue = requestJsonValue[VssLocalSettingTbl_ServerId];
+
+ Json::Value serverIdJsonValue = requestJsonValue[VssLocalSettingTbl_ServerId];
if (serverIdJsonValue.type() != Json::ValueType::nullValue) {
vssLocalSettingTblBuilder.addServerId(serverIdJsonValue.asString());
}
-
- Json::Value userAuthIdJsonValue = requestJsonValue[VssLocalSettingTbl_UserAuthId];
+
+ Json::Value userAuthIdJsonValue = requestJsonValue[VssLocalSettingTbl_UserAuthId];
if (userAuthIdJsonValue.type() != Json::ValueType::nullValue) {
vssLocalSettingTblBuilder.addUserAuthId(userAuthIdJsonValue.asString());
}
-
- Json::Value passwordJsonValue = requestJsonValue[VssLocalSettingTbl_Password];
+
+ Json::Value passwordJsonValue = requestJsonValue[VssLocalSettingTbl_Password];
if (passwordJsonValue.type() != Json::ValueType::nullValue) {
vssLocalSettingTblBuilder.addPassword(passwordJsonValue.asString());
}
-
- Json::Value updateTimeJsonValue = requestJsonValue[VssLocalSettingTbl_UpdateTime];
+
+ Json::Value updateTimeJsonValue = requestJsonValue[VssLocalSettingTbl_UpdateTime];
if (updateTimeJsonValue.type() != Json::ValueType::nullValue) {
vssLocalSettingTblBuilder.addUpdateTime(updateTimeJsonValue.asString());
}
- if (iDJsonValue.type() != Json::ValueType::nullValue) {
- string iDValue = iDJsonValue.asString();
- if (iDValue.size() > 0 && VssLocalSettingTblSqliteDao::instance()->updateVssLocalSettingTbl(vssLocalSettingTblBuilder.buildVssLocalSettingTblMap(), "ID", iDValue)) {
- responseJsonValue["success"] = "true";
- responseJsonValue["message"] = "鏇存柊鎴愬姛锛�";
- }
+ if (iDJsonValue.type() != Json::ValueType::nullValue) {
+ string iDValue = iDJsonValue.asString();
+ responseJsonValue = VssLocalSettingTblSqliteDao::instance()->updateVssLocalSettingTbl(
+ vssLocalSettingTblBuilder.buildVssLocalSettingTblMap(), "ID", iDValue);
}
}
return responseJsonValue.toStyledString();
}
-
+
/** 鏌ユ壘鍗曚釜鏈湴鍥芥爣閰嶇疆 */
std::string findVssLocalSettingTbl(std::string ip, unsigned int port, std::string content, PResponse &response) {
+ DBG("ip:" << ip << "; port:" << port);
+ DBG("content: " << content);
Json::Reader requestJsonReader;
Json::Value requestJsonValue;
Json::Value responseJsonValue;
@@ -190,50 +199,54 @@
responseJsonValue["success"] = "false";
if (requestJsonReader.parse(content, requestJsonValue)) {
VssLocalSettingTblBuilder vssLocalSettingTblBuilder;
-
- Json::Value iDJsonValue = requestJsonValue[VssLocalSettingTbl_ID];
+
+ Json::Value iDJsonValue = requestJsonValue[VssLocalSettingTbl_ID];
if (iDJsonValue.type() != Json::ValueType::nullValue) {
- vssLocalSettingTblBuilder.addID(iDJsonValue.asInt());
+ vssLocalSettingTblBuilder.addID(std::stoi(iDJsonValue.asString()));
}
-
- Json::Value serverIpJsonValue = requestJsonValue[VssLocalSettingTbl_ServerIp];
+
+ Json::Value serverIpJsonValue = requestJsonValue[VssLocalSettingTbl_ServerIp];
if (serverIpJsonValue.type() != Json::ValueType::nullValue) {
vssLocalSettingTblBuilder.addServerIp(serverIpJsonValue.asString());
}
-
- Json::Value serverPortJsonValue = requestJsonValue[VssLocalSettingTbl_ServerPort];
+
+ Json::Value serverPortJsonValue = requestJsonValue[VssLocalSettingTbl_ServerPort];
if (serverPortJsonValue.type() != Json::ValueType::nullValue) {
vssLocalSettingTblBuilder.addServerPort(serverPortJsonValue.asString());
}
-
- Json::Value serverIdJsonValue = requestJsonValue[VssLocalSettingTbl_ServerId];
+
+ Json::Value serverIdJsonValue = requestJsonValue[VssLocalSettingTbl_ServerId];
if (serverIdJsonValue.type() != Json::ValueType::nullValue) {
vssLocalSettingTblBuilder.addServerId(serverIdJsonValue.asString());
}
-
- Json::Value userAuthIdJsonValue = requestJsonValue[VssLocalSettingTbl_UserAuthId];
+
+ Json::Value userAuthIdJsonValue = requestJsonValue[VssLocalSettingTbl_UserAuthId];
if (userAuthIdJsonValue.type() != Json::ValueType::nullValue) {
vssLocalSettingTblBuilder.addUserAuthId(userAuthIdJsonValue.asString());
}
-
- Json::Value passwordJsonValue = requestJsonValue[VssLocalSettingTbl_Password];
+
+ Json::Value passwordJsonValue = requestJsonValue[VssLocalSettingTbl_Password];
if (passwordJsonValue.type() != Json::ValueType::nullValue) {
vssLocalSettingTblBuilder.addPassword(passwordJsonValue.asString());
}
-
- Json::Value updateTimeJsonValue = requestJsonValue[VssLocalSettingTbl_UpdateTime];
+
+ Json::Value updateTimeJsonValue = requestJsonValue[VssLocalSettingTbl_UpdateTime];
if (updateTimeJsonValue.type() != Json::ValueType::nullValue) {
vssLocalSettingTblBuilder.addUpdateTime(updateTimeJsonValue.asString());
}
- responseJsonValue["message"] = "鏌ヨ鎴愬姛锛�";
- responseJsonValue["success"] = "true";
- responseJsonValue["data"] = VssLocalSettingTblSqliteDao::instance()->findJsonArray(string("select * from ") + VSSLocalSettingTbl_TABLE_NAME + " where 1 = 1 limit 1");
+ responseJsonValue["message"] = "鏌ヨ鎴愬姛锛�";
+ responseJsonValue["success"] = "true";
+ responseJsonValue = VssLocalSettingTblSqliteDao::instance()->findVssLocalSettingTblList(
+ vssLocalSettingTblBuilder.buildVssLocalSettingTblMap());
}
return responseJsonValue.toStyledString();
}
-
+
/** 鏌ユ壘鏈湴鍥芥爣閰嶇疆鍒楄〃 */
- std::string findVssLocalSettingTblList(std::string ip, unsigned int port, std::string content, PResponse &response) {
+ std::string
+ findVssLocalSettingTblList(std::string ip, unsigned int port, std::string content, PResponse &response) {
+ DBG("ip:" << ip << "; port:" << port);
+ DBG("content: " << content);
Json::Reader requestJsonReader;
Json::Value requestJsonValue;
Json::Value responseJsonValue;
@@ -241,53 +254,50 @@
responseJsonValue["success"] = "false";
if (content == "" || requestJsonReader.parse(content, requestJsonValue)) {
VssLocalSettingTblBuilder vssLocalSettingTblBuilder;
-
- Json::Value iDJsonValue = requestJsonValue[VssLocalSettingTbl_ID];
+
+ Json::Value iDJsonValue = requestJsonValue[VssLocalSettingTbl_ID];
if (iDJsonValue.type() != Json::ValueType::nullValue) {
- vssLocalSettingTblBuilder.addID(iDJsonValue.asInt());
+ vssLocalSettingTblBuilder.addID(std::stoi(iDJsonValue.asString()));
}
-
- Json::Value serverIpJsonValue = requestJsonValue[VssLocalSettingTbl_ServerIp];
+
+ Json::Value serverIpJsonValue = requestJsonValue[VssLocalSettingTbl_ServerIp];
if (serverIpJsonValue.type() != Json::ValueType::nullValue) {
vssLocalSettingTblBuilder.addServerIp(serverIpJsonValue.asString());
}
-
- Json::Value serverPortJsonValue = requestJsonValue[VssLocalSettingTbl_ServerPort];
+
+ Json::Value serverPortJsonValue = requestJsonValue[VssLocalSettingTbl_ServerPort];
if (serverPortJsonValue.type() != Json::ValueType::nullValue) {
vssLocalSettingTblBuilder.addServerPort(serverPortJsonValue.asString());
}
-
- Json::Value serverIdJsonValue = requestJsonValue[VssLocalSettingTbl_ServerId];
+
+ Json::Value serverIdJsonValue = requestJsonValue[VssLocalSettingTbl_ServerId];
if (serverIdJsonValue.type() != Json::ValueType::nullValue) {
vssLocalSettingTblBuilder.addServerId(serverIdJsonValue.asString());
}
-
- Json::Value userAuthIdJsonValue = requestJsonValue[VssLocalSettingTbl_UserAuthId];
+
+ Json::Value userAuthIdJsonValue = requestJsonValue[VssLocalSettingTbl_UserAuthId];
if (userAuthIdJsonValue.type() != Json::ValueType::nullValue) {
vssLocalSettingTblBuilder.addUserAuthId(userAuthIdJsonValue.asString());
}
-
- Json::Value passwordJsonValue = requestJsonValue[VssLocalSettingTbl_Password];
+
+ Json::Value passwordJsonValue = requestJsonValue[VssLocalSettingTbl_Password];
if (passwordJsonValue.type() != Json::ValueType::nullValue) {
vssLocalSettingTblBuilder.addPassword(passwordJsonValue.asString());
}
-
- Json::Value updateTimeJsonValue = requestJsonValue[VssLocalSettingTbl_UpdateTime];
+
+ Json::Value updateTimeJsonValue = requestJsonValue[VssLocalSettingTbl_UpdateTime];
if (updateTimeJsonValue.type() != Json::ValueType::nullValue) {
vssLocalSettingTblBuilder.addUpdateTime(updateTimeJsonValue.asString());
}
- responseJsonValue["message"] = "鏌ヨ鎴愬姛锛�";
- responseJsonValue["success"] = "true";
- responseJsonValue["data"] = VssLocalSettingTblSqliteDao::instance()->findJsonArray(string("select * from ") + VSSLocalSettingTbl_TABLE_NAME + " where 1 = 1");
+ responseJsonValue["message"] = "鏌ヨ鎴愬姛锛�";
+ responseJsonValue["success"] = "true";
+ responseJsonValue = VssLocalSettingTblSqliteDao::instance()->findVssLocalSettingTblList(
+ vssLocalSettingTblBuilder.buildVssLocalSettingTblMap());
}
return responseJsonValue.toStyledString();
}
};
-
-
-
-
#endif //VSSLOCALSETTINGTBL_CONTROLLER_H
--
Gitblit v1.8.0