From 91c3b892e976ecf33819c0c2664e4dfcfd88e434 Mon Sep 17 00:00:00 2001
From: chenshijun <csj_sky@126.com>
Date: 星期六, 30 三月 2019 17:45:59 +0800
Subject: [PATCH] 添加新版本的GB28181代码
---
QiaoJiaSystem/DataManagerServer/vss/controller/VssDevTblController.h | 395 +++++++++++++++++++++++++++++---------------------------
1 files changed, 205 insertions(+), 190 deletions(-)
diff --git a/QiaoJiaSystem/DataManagerServer/vss/controller/VssDevTblController.h b/QiaoJiaSystem/DataManagerServer/vss/controller/VssDevTblController.h
index 94a3377..586f0a1 100755
--- a/QiaoJiaSystem/DataManagerServer/vss/controller/VssDevTblController.h
+++ b/QiaoJiaSystem/DataManagerServer/vss/controller/VssDevTblController.h
@@ -16,46 +16,46 @@
*/
class VssDevTblController : public VssBaseController {
private:
- /** 鍒涘缓涓�绾ц澶囪〃鏋勯�犲嚱鏁� */
- VssDevTblController() {}
+ /** 鍒涘缓涓�绾ц澶囪〃鏋勯�犲嚱鏁� */
+ VssDevTblController() {}
public:
- /** 鍒涘缓涓�绾ц澶囪〃鍗曚緥妯″紡 */
+ /** 鍒涘缓涓�绾ц澶囪〃鍗曚緥妯″紡 */
static VssDevTblController* instance() {
static VssDevTblController instance;
return &instance;
}
public:
- /** 娉ㄥ唽{label}http鏈嶅姟 */
+ /** 娉ㄥ唽{label}http鏈嶅姟 */
void registerHttpServices(HttpSrvRetRecieve& _HttpSrvRetRecieve) {
- _HttpSrvRetRecieve.setInfo("^/addVssDevTbl$", "POST",
- std::bind(&VssDevTblController::addVssDevTbl, this,
- std::placeholders::_1, std::placeholders::_2,
- std::placeholders::_3, std::placeholders::_4));
-
- _HttpSrvRetRecieve.setInfo("^/delVssDevTbl$", "POST",
- std::bind(&VssDevTblController::delVssDevTbl, this,
- std::placeholders::_1, std::placeholders::_2,
- std::placeholders::_3, std::placeholders::_4));
-
- _HttpSrvRetRecieve.setInfo("^/updateVssDevTbl$", "POST",
- std::bind(&VssDevTblController::updateVssDevTbl, this,
- std::placeholders::_1, std::placeholders::_2,
- std::placeholders::_3, std::placeholders::_4));
-
- _HttpSrvRetRecieve.setInfo("^/findVssDevTbl$", "POST",
- std::bind(&VssDevTblController::findVssDevTbl, this,
- std::placeholders::_1, std::placeholders::_2,
- std::placeholders::_3, std::placeholders::_4));
-
- _HttpSrvRetRecieve.setInfo("^/findVssDevTblList$", "POST",
- std::bind(&VssDevTblController::findVssDevTblList, this,
- std::placeholders::_1, std::placeholders::_2,
- std::placeholders::_3, std::placeholders::_4));
+ _HttpSrvRetRecieve.setInfo("^/addVssDevTbl$", "POST",
+ std::bind(&VssDevTblController::addVssDevTbl, this,
+ std::placeholders::_1, std::placeholders::_2,
+ std::placeholders::_3, std::placeholders::_4));
+
+ _HttpSrvRetRecieve.setInfo("^/delVssDevTbl$", "POST",
+ std::bind(&VssDevTblController::delVssDevTbl, this,
+ std::placeholders::_1, std::placeholders::_2,
+ std::placeholders::_3, std::placeholders::_4));
+
+ _HttpSrvRetRecieve.setInfo("^/updateVssDevTbl$", "POST",
+ std::bind(&VssDevTblController::updateVssDevTbl, this,
+ std::placeholders::_1, std::placeholders::_2,
+ std::placeholders::_3, std::placeholders::_4));
+
+ _HttpSrvRetRecieve.setInfo("^/findVssDevTbl$", "POST",
+ std::bind(&VssDevTblController::findVssDevTbl, this,
+ std::placeholders::_1, std::placeholders::_2,
+ std::placeholders::_3, std::placeholders::_4));
+
+ _HttpSrvRetRecieve.setInfo("^/findVssDevTblList$", "POST",
+ std::bind(&VssDevTblController::findVssDevTblList, this,
+ std::placeholders::_1, std::placeholders::_2,
+ std::placeholders::_3, std::placeholders::_4));
}
public:
- /** 娣诲姞鍒涘缓涓�绾ц澶囪〃 */
+ /** 娣诲姞鍒涘缓涓�绾ц澶囪〃 */
std::string addVssDevTbl(std::string ip, unsigned int port, std::string content, PResponse &response) {
Json::Reader requestJsonReader;
Json::Value requestJsonValue;
@@ -64,73 +64,73 @@
responseJsonValue["success"] = "false";
if (requestJsonReader.parse(content, requestJsonValue)) {
VssDevTblBuilder vssDevTblBuilder;
-
- Json::Value iDJsonValue = requestJsonValue[VssDevTbl_ID];
+
+ Json::Value iDJsonValue = requestJsonValue[VssDevTbl_ID];
if (iDJsonValue.type() != Json::ValueType::nullValue) {
- vssDevTblBuilder.addID(iDJsonValue.asInt());
+ vssDevTblBuilder.addID(std::stoi((iDJsonValue.asString())));
}
-
- Json::Value devPubIDJsonValue = requestJsonValue[VssDevTbl_DevPubID];
+
+ Json::Value devPubIDJsonValue = requestJsonValue[VssDevTbl_DevPubID];
if (devPubIDJsonValue.type() != Json::ValueType::nullValue) {
- vssDevTblBuilder.addDevPubID(devPubIDJsonValue.asString());
+ vssDevTblBuilder.addDevPubID((devPubIDJsonValue.asString()));
}
-
- Json::Value devNicknameJsonValue = requestJsonValue[VssDevTbl_DevNickname];
+
+ Json::Value devNicknameJsonValue = requestJsonValue[VssDevTbl_DevNickname];
if (devNicknameJsonValue.type() != Json::ValueType::nullValue) {
- vssDevTblBuilder.addDevNickname(devNicknameJsonValue.asString());
+ vssDevTblBuilder.addDevNickname((devNicknameJsonValue.asString()));
}
-
- Json::Value userNameJsonValue = requestJsonValue[VssDevTbl_UserName];
+
+ Json::Value userNameJsonValue = requestJsonValue[VssDevTbl_UserName];
if (userNameJsonValue.type() != Json::ValueType::nullValue) {
- vssDevTblBuilder.addUserName(userNameJsonValue.asString());
+ vssDevTblBuilder.addUserName((userNameJsonValue.asString()));
}
-
- Json::Value passwdJsonValue = requestJsonValue[VssDevTbl_Passwd];
+
+ Json::Value passwdJsonValue = requestJsonValue[VssDevTbl_Passwd];
if (passwdJsonValue.type() != Json::ValueType::nullValue) {
- vssDevTblBuilder.addPasswd(passwdJsonValue.asString());
+ vssDevTblBuilder.addPasswd((passwdJsonValue.asString()));
}
-
- Json::Value corpIDJsonValue = requestJsonValue[VssDevTbl_CorpID];
+
+ Json::Value corpIDJsonValue = requestJsonValue[VssDevTbl_CorpID];
if (corpIDJsonValue.type() != Json::ValueType::nullValue) {
- vssDevTblBuilder.addCorpID(corpIDJsonValue.asString());
+ vssDevTblBuilder.addCorpID((corpIDJsonValue.asString()));
}
-
- Json::Value iPJsonValue = requestJsonValue[VssDevTbl_IP];
+
+ Json::Value iPJsonValue = requestJsonValue[VssDevTbl_IP];
if (iPJsonValue.type() != Json::ValueType::nullValue) {
- vssDevTblBuilder.addIP(iPJsonValue.asString());
+ vssDevTblBuilder.addIP((iPJsonValue.asString()));
}
-
- Json::Value portJsonValue = requestJsonValue[VssDevTbl_Port];
+
+ Json::Value portJsonValue = requestJsonValue[VssDevTbl_Port];
if (portJsonValue.type() != Json::ValueType::nullValue) {
- vssDevTblBuilder.addPort(portJsonValue.asInt());
+ vssDevTblBuilder.addPort(std::stoi((portJsonValue.asString())));
}
-
- Json::Value aliveJsonValue = requestJsonValue[VssDevTbl_Alive];
+
+ Json::Value aliveJsonValue = requestJsonValue[VssDevTbl_Alive];
if (aliveJsonValue.type() != Json::ValueType::nullValue) {
- vssDevTblBuilder.addAlive(aliveJsonValue.asInt());
+ vssDevTblBuilder.addAlive(std::stoi((aliveJsonValue.asString())));
}
-
- Json::Value dMarkerJsonValue = requestJsonValue[VssDevTbl_DMarker];
+
+ Json::Value dMarkerJsonValue = requestJsonValue[VssDevTbl_DMarker];
if (dMarkerJsonValue.type() != Json::ValueType::nullValue) {
- vssDevTblBuilder.addDMarker(dMarkerJsonValue.asInt());
+ vssDevTblBuilder.addDMarker(std::stoi((dMarkerJsonValue.asString())));
}
-
- Json::Value updateTimeJsonValue = requestJsonValue[VssDevTbl_UpdateTime];
+
+ Json::Value updateTimeJsonValue = requestJsonValue[VssDevTbl_UpdateTime];
if (updateTimeJsonValue.type() != Json::ValueType::nullValue) {
- vssDevTblBuilder.addUpdateTime(updateTimeJsonValue.asString());
+ vssDevTblBuilder.addUpdateTime((updateTimeJsonValue.asString()));
}
- auto keyValuesToAdd = vssDevTblBuilder.buildVssDevTblMap();
- if (keyValuesToAdd.size() > 0) {
- mysqlpp::SimpleResult addVssDevTblResult = VssDevTblDao::instance()->addVssDevTbl(keyValuesToAdd);
- if (addVssDevTblResult.rows() > 0) {
- responseJsonValue["success"] = "true";
- responseJsonValue["message"] = "娣诲姞鎴愬姛锛�";
- }
+ auto keyValuesToAdd = vssDevTblBuilder.buildVssDevTblMap();
+ if (keyValuesToAdd.size() > 0) {
+ mysqlpp::SimpleResult addVssDevTblResult = VssDevTblDao::instance()->addVssDevTbl(keyValuesToAdd);
+ if (addVssDevTblResult.rows() > 0) {
+ responseJsonValue["success"] = "true";
+ responseJsonValue["message"] = "娣诲姞鎴愬姛锛�";
+ }
}
}
return responseJsonValue.toStyledString();
}
-
+
/** 鍒犻櫎鍒涘缓涓�绾ц澶囪〃 */
std::string delVssDevTbl(std::string ip, unsigned int port, std::string content, PResponse &response) {
Json::Reader requestJsonReader;
@@ -139,19 +139,19 @@
responseJsonValue["message"] = "鍒犻櫎澶辫触锛�";
responseJsonValue["success"] = "false";
if (requestJsonReader.parse(content, requestJsonValue)) {
- Json::Value iDJsonValue = requestJsonValue[VssDevTbl_ID];
- if (iDJsonValue.type() != Json::ValueType::nullValue) {
- string iDValue = iDJsonValue.asString();
+ Json::Value iDJsonValue = requestJsonValue[VssDevTbl_ID];
+ if (iDJsonValue.type() != Json::ValueType::nullValue) {
+ string iDValue = iDJsonValue.asString();
if (iDValue.size() > 0 && VssDevTblDao::instance()->deleteByColumn("ID", iDValue)) {
- responseJsonValue["success"] = "true";
- responseJsonValue["message"] = "鍒犻櫎鎴愬姛!";
- }
+ responseJsonValue["success"] = "true";
+ responseJsonValue["message"] = "鍒犻櫎鎴愬姛!";
+ }
}
-
+
}
return responseJsonValue.toStyledString();
}
-
+
/** 鏇存柊鍒涘缓涓�绾ц澶囪〃 */
std::string updateVssDevTbl(std::string ip, unsigned int port, std::string content, PResponse &response) {
Json::Reader requestJsonReader;
@@ -161,72 +161,72 @@
responseJsonValue["success"] = "false";
if (requestJsonReader.parse(content, requestJsonValue)) {
VssDevTblBuilder vssDevTblBuilder;
-
- Json::Value iDJsonValue = requestJsonValue[VssDevTbl_ID];
+
+ Json::Value iDJsonValue = requestJsonValue[VssDevTbl_ID];
if (iDJsonValue.type() != Json::ValueType::nullValue) {
- vssDevTblBuilder.addID(iDJsonValue.asInt());
+ vssDevTblBuilder.addID(std::stoi((iDJsonValue.asString())));
}
-
- Json::Value devPubIDJsonValue = requestJsonValue[VssDevTbl_DevPubID];
+
+ Json::Value devPubIDJsonValue = requestJsonValue[VssDevTbl_DevPubID];
if (devPubIDJsonValue.type() != Json::ValueType::nullValue) {
- vssDevTblBuilder.addDevPubID(devPubIDJsonValue.asString());
+ vssDevTblBuilder.addDevPubID((devPubIDJsonValue.asString()));
}
-
- Json::Value devNicknameJsonValue = requestJsonValue[VssDevTbl_DevNickname];
+
+ Json::Value devNicknameJsonValue = requestJsonValue[VssDevTbl_DevNickname];
if (devNicknameJsonValue.type() != Json::ValueType::nullValue) {
- vssDevTblBuilder.addDevNickname(devNicknameJsonValue.asString());
+ vssDevTblBuilder.addDevNickname((devNicknameJsonValue.asString()));
}
-
- Json::Value userNameJsonValue = requestJsonValue[VssDevTbl_UserName];
+
+ Json::Value userNameJsonValue = requestJsonValue[VssDevTbl_UserName];
if (userNameJsonValue.type() != Json::ValueType::nullValue) {
- vssDevTblBuilder.addUserName(userNameJsonValue.asString());
+ vssDevTblBuilder.addUserName((userNameJsonValue.asString()));
}
-
- Json::Value passwdJsonValue = requestJsonValue[VssDevTbl_Passwd];
+
+ Json::Value passwdJsonValue = requestJsonValue[VssDevTbl_Passwd];
if (passwdJsonValue.type() != Json::ValueType::nullValue) {
- vssDevTblBuilder.addPasswd(passwdJsonValue.asString());
+ vssDevTblBuilder.addPasswd((passwdJsonValue.asString()));
}
-
- Json::Value corpIDJsonValue = requestJsonValue[VssDevTbl_CorpID];
+
+ Json::Value corpIDJsonValue = requestJsonValue[VssDevTbl_CorpID];
if (corpIDJsonValue.type() != Json::ValueType::nullValue) {
- vssDevTblBuilder.addCorpID(corpIDJsonValue.asString());
+ vssDevTblBuilder.addCorpID((corpIDJsonValue.asString()));
}
-
- Json::Value iPJsonValue = requestJsonValue[VssDevTbl_IP];
+
+ Json::Value iPJsonValue = requestJsonValue[VssDevTbl_IP];
if (iPJsonValue.type() != Json::ValueType::nullValue) {
- vssDevTblBuilder.addIP(iPJsonValue.asString());
+ vssDevTblBuilder.addIP((iPJsonValue.asString()));
}
-
- Json::Value portJsonValue = requestJsonValue[VssDevTbl_Port];
+
+ Json::Value portJsonValue = requestJsonValue[VssDevTbl_Port];
if (portJsonValue.type() != Json::ValueType::nullValue) {
- vssDevTblBuilder.addPort(portJsonValue.asInt());
+ vssDevTblBuilder.addPort(std::stoi((portJsonValue.asString())));
}
-
- Json::Value aliveJsonValue = requestJsonValue[VssDevTbl_Alive];
+
+ Json::Value aliveJsonValue = requestJsonValue[VssDevTbl_Alive];
if (aliveJsonValue.type() != Json::ValueType::nullValue) {
- vssDevTblBuilder.addAlive(aliveJsonValue.asInt());
+ vssDevTblBuilder.addAlive(std::stoi((aliveJsonValue.asString())));
}
-
- Json::Value dMarkerJsonValue = requestJsonValue[VssDevTbl_DMarker];
+
+ Json::Value dMarkerJsonValue = requestJsonValue[VssDevTbl_DMarker];
if (dMarkerJsonValue.type() != Json::ValueType::nullValue) {
- vssDevTblBuilder.addDMarker(dMarkerJsonValue.asInt());
+ vssDevTblBuilder.addDMarker(std::stoi((dMarkerJsonValue.asString())));
}
-
- Json::Value updateTimeJsonValue = requestJsonValue[VssDevTbl_UpdateTime];
+
+ Json::Value updateTimeJsonValue = requestJsonValue[VssDevTbl_UpdateTime];
if (updateTimeJsonValue.type() != Json::ValueType::nullValue) {
- vssDevTblBuilder.addUpdateTime(updateTimeJsonValue.asString());
+ vssDevTblBuilder.addUpdateTime((updateTimeJsonValue.asString()));
}
- if (iDJsonValue.type() != Json::ValueType::nullValue) {
- string iDValue = iDJsonValue.asString();
+ if (iDJsonValue.type() != Json::ValueType::nullValue) {
+ string iDValue = iDJsonValue.asString();
if (iDValue.size() > 0 && VssDevTblDao::instance()->updateVssDevTbl(vssDevTblBuilder.buildVssDevTblMap(), "ID", iDValue)) {
- responseJsonValue["success"] = "true";
- responseJsonValue["message"] = "鏇存柊鎴愬姛锛�";
- }
+ responseJsonValue["success"] = "true";
+ responseJsonValue["message"] = "鏇存柊鎴愬姛锛�";
+ }
}
}
return responseJsonValue.toStyledString();
}
-
+
/** 鏌ユ壘鍗曚釜鍒涘缓涓�绾ц澶囪〃 */
std::string findVssDevTbl(std::string ip, unsigned int port, std::string content, PResponse &response) {
Json::Reader requestJsonReader;
@@ -236,68 +236,68 @@
responseJsonValue["success"] = "false";
if (requestJsonReader.parse(content, requestJsonValue)) {
VssDevTblBuilder vssDevTblBuilder;
-
- Json::Value iDJsonValue = requestJsonValue[VssDevTbl_ID];
+
+ Json::Value iDJsonValue = requestJsonValue[VssDevTbl_ID];
if (iDJsonValue.type() != Json::ValueType::nullValue) {
- vssDevTblBuilder.addID(iDJsonValue.asInt());
+ vssDevTblBuilder.addID(std::stoi((iDJsonValue.asString())));
}
-
- Json::Value devPubIDJsonValue = requestJsonValue[VssDevTbl_DevPubID];
+
+ Json::Value devPubIDJsonValue = requestJsonValue[VssDevTbl_DevPubID];
if (devPubIDJsonValue.type() != Json::ValueType::nullValue) {
- vssDevTblBuilder.addDevPubID(devPubIDJsonValue.asString());
+ vssDevTblBuilder.addDevPubID((devPubIDJsonValue.asString()));
}
-
- Json::Value devNicknameJsonValue = requestJsonValue[VssDevTbl_DevNickname];
+
+ Json::Value devNicknameJsonValue = requestJsonValue[VssDevTbl_DevNickname];
if (devNicknameJsonValue.type() != Json::ValueType::nullValue) {
- vssDevTblBuilder.addDevNickname(devNicknameJsonValue.asString());
+ vssDevTblBuilder.addDevNickname((devNicknameJsonValue.asString()));
}
-
- Json::Value userNameJsonValue = requestJsonValue[VssDevTbl_UserName];
+
+ Json::Value userNameJsonValue = requestJsonValue[VssDevTbl_UserName];
if (userNameJsonValue.type() != Json::ValueType::nullValue) {
- vssDevTblBuilder.addUserName(userNameJsonValue.asString());
+ vssDevTblBuilder.addUserName((userNameJsonValue.asString()));
}
-
- Json::Value passwdJsonValue = requestJsonValue[VssDevTbl_Passwd];
+
+ Json::Value passwdJsonValue = requestJsonValue[VssDevTbl_Passwd];
if (passwdJsonValue.type() != Json::ValueType::nullValue) {
- vssDevTblBuilder.addPasswd(passwdJsonValue.asString());
+ vssDevTblBuilder.addPasswd((passwdJsonValue.asString()));
}
-
- Json::Value corpIDJsonValue = requestJsonValue[VssDevTbl_CorpID];
+
+ Json::Value corpIDJsonValue = requestJsonValue[VssDevTbl_CorpID];
if (corpIDJsonValue.type() != Json::ValueType::nullValue) {
- vssDevTblBuilder.addCorpID(corpIDJsonValue.asString());
+ vssDevTblBuilder.addCorpID((corpIDJsonValue.asString()));
}
-
- Json::Value iPJsonValue = requestJsonValue[VssDevTbl_IP];
+
+ Json::Value iPJsonValue = requestJsonValue[VssDevTbl_IP];
if (iPJsonValue.type() != Json::ValueType::nullValue) {
- vssDevTblBuilder.addIP(iPJsonValue.asString());
+ vssDevTblBuilder.addIP((iPJsonValue.asString()));
}
-
- Json::Value portJsonValue = requestJsonValue[VssDevTbl_Port];
+
+ Json::Value portJsonValue = requestJsonValue[VssDevTbl_Port];
if (portJsonValue.type() != Json::ValueType::nullValue) {
- vssDevTblBuilder.addPort(portJsonValue.asInt());
+ vssDevTblBuilder.addPort(std::stoi((portJsonValue.asString())));
}
-
- Json::Value aliveJsonValue = requestJsonValue[VssDevTbl_Alive];
+
+ Json::Value aliveJsonValue = requestJsonValue[VssDevTbl_Alive];
if (aliveJsonValue.type() != Json::ValueType::nullValue) {
- vssDevTblBuilder.addAlive(aliveJsonValue.asInt());
+ vssDevTblBuilder.addAlive(std::stoi((aliveJsonValue.asString())));
}
-
- Json::Value dMarkerJsonValue = requestJsonValue[VssDevTbl_DMarker];
+
+ Json::Value dMarkerJsonValue = requestJsonValue[VssDevTbl_DMarker];
if (dMarkerJsonValue.type() != Json::ValueType::nullValue) {
- vssDevTblBuilder.addDMarker(dMarkerJsonValue.asInt());
+ vssDevTblBuilder.addDMarker(std::stoi((dMarkerJsonValue.asString())));
}
-
- Json::Value updateTimeJsonValue = requestJsonValue[VssDevTbl_UpdateTime];
+
+ Json::Value updateTimeJsonValue = requestJsonValue[VssDevTbl_UpdateTime];
if (updateTimeJsonValue.type() != Json::ValueType::nullValue) {
- vssDevTblBuilder.addUpdateTime(updateTimeJsonValue.asString());
+ vssDevTblBuilder.addUpdateTime((updateTimeJsonValue.asString()));
}
- responseJsonValue["message"] = "鏌ヨ鎴愬姛锛�";
- responseJsonValue["success"] = "true";
- responseJsonValue["data"] = VssDevTblDao::instance()->findJsonArray(string("select * from ") + VSSDevTbl_TABLE_NAME + " where 1 = 1 limit 1");
+ responseJsonValue["message"] = "鏌ヨ鎴愬姛锛�";
+ responseJsonValue["success"] = "true";
+ responseJsonValue["data"] = VssDevTblDao::instance()->findJsonArray(string("select * from ") + VSSDevTbl_TABLE_NAME + " where 1 = 1 limit 1", vssDevTblBuilder.buildVssDevTblMap());
}
return responseJsonValue.toStyledString();
}
-
+
/** 鏌ユ壘鍒涘缓涓�绾ц澶囪〃鍒楄〃 */
std::string findVssDevTblList(std::string ip, unsigned int port, std::string content, PResponse &response) {
Json::Reader requestJsonReader;
@@ -307,64 +307,79 @@
responseJsonValue["success"] = "false";
if (content == "" || requestJsonReader.parse(content, requestJsonValue)) {
VssDevTblBuilder vssDevTblBuilder;
-
- Json::Value iDJsonValue = requestJsonValue[VssDevTbl_ID];
+
+ Json::Value iDJsonValue = requestJsonValue[VssDevTbl_ID];
if (iDJsonValue.type() != Json::ValueType::nullValue) {
- vssDevTblBuilder.addID(iDJsonValue.asInt());
+ vssDevTblBuilder.addID(std::stoi((iDJsonValue.asString())));
}
-
- Json::Value devPubIDJsonValue = requestJsonValue[VssDevTbl_DevPubID];
+
+ Json::Value devPubIDJsonValue = requestJsonValue[VssDevTbl_DevPubID];
if (devPubIDJsonValue.type() != Json::ValueType::nullValue) {
- vssDevTblBuilder.addDevPubID(devPubIDJsonValue.asString());
+ vssDevTblBuilder.addDevPubID((devPubIDJsonValue.asString()));
}
-
- Json::Value devNicknameJsonValue = requestJsonValue[VssDevTbl_DevNickname];
+
+ Json::Value devNicknameJsonValue = requestJsonValue[VssDevTbl_DevNickname];
if (devNicknameJsonValue.type() != Json::ValueType::nullValue) {
- vssDevTblBuilder.addDevNickname(devNicknameJsonValue.asString());
+ vssDevTblBuilder.addDevNickname((devNicknameJsonValue.asString()));
}
-
- Json::Value userNameJsonValue = requestJsonValue[VssDevTbl_UserName];
+
+ Json::Value userNameJsonValue = requestJsonValue[VssDevTbl_UserName];
if (userNameJsonValue.type() != Json::ValueType::nullValue) {
- vssDevTblBuilder.addUserName(userNameJsonValue.asString());
+ vssDevTblBuilder.addUserName((userNameJsonValue.asString()));
}
-
- Json::Value passwdJsonValue = requestJsonValue[VssDevTbl_Passwd];
+
+ Json::Value passwdJsonValue = requestJsonValue[VssDevTbl_Passwd];
if (passwdJsonValue.type() != Json::ValueType::nullValue) {
- vssDevTblBuilder.addPasswd(passwdJsonValue.asString());
+ vssDevTblBuilder.addPasswd((passwdJsonValue.asString()));
}
-
- Json::Value corpIDJsonValue = requestJsonValue[VssDevTbl_CorpID];
+
+ Json::Value corpIDJsonValue = requestJsonValue[VssDevTbl_CorpID];
if (corpIDJsonValue.type() != Json::ValueType::nullValue) {
- vssDevTblBuilder.addCorpID(corpIDJsonValue.asString());
+ vssDevTblBuilder.addCorpID((corpIDJsonValue.asString()));
}
-
- Json::Value iPJsonValue = requestJsonValue[VssDevTbl_IP];
+
+ Json::Value iPJsonValue = requestJsonValue[VssDevTbl_IP];
if (iPJsonValue.type() != Json::ValueType::nullValue) {
- vssDevTblBuilder.addIP(iPJsonValue.asString());
+ vssDevTblBuilder.addIP((iPJsonValue.asString()));
}
-
- Json::Value portJsonValue = requestJsonValue[VssDevTbl_Port];
+
+ Json::Value portJsonValue = requestJsonValue[VssDevTbl_Port];
if (portJsonValue.type() != Json::ValueType::nullValue) {
- vssDevTblBuilder.addPort(portJsonValue.asInt());
+ vssDevTblBuilder.addPort(std::stoi((portJsonValue.asString())));
}
-
- Json::Value aliveJsonValue = requestJsonValue[VssDevTbl_Alive];
+
+ Json::Value aliveJsonValue = requestJsonValue[VssDevTbl_Alive];
if (aliveJsonValue.type() != Json::ValueType::nullValue) {
- vssDevTblBuilder.addAlive(aliveJsonValue.asInt());
+ vssDevTblBuilder.addAlive(std::stoi((aliveJsonValue.asString())));
}
-
- Json::Value dMarkerJsonValue = requestJsonValue[VssDevTbl_DMarker];
+
+ Json::Value dMarkerJsonValue = requestJsonValue[VssDevTbl_DMarker];
if (dMarkerJsonValue.type() != Json::ValueType::nullValue) {
- vssDevTblBuilder.addDMarker(dMarkerJsonValue.asInt());
+ vssDevTblBuilder.addDMarker(std::stoi((dMarkerJsonValue.asString())));
}
-
- Json::Value updateTimeJsonValue = requestJsonValue[VssDevTbl_UpdateTime];
+
+ Json::Value updateTimeJsonValue = requestJsonValue[VssDevTbl_UpdateTime];
if (updateTimeJsonValue.type() != Json::ValueType::nullValue) {
- vssDevTblBuilder.addUpdateTime(updateTimeJsonValue.asString());
+ vssDevTblBuilder.addUpdateTime((updateTimeJsonValue.asString()));
}
- responseJsonValue["message"] = "鏌ヨ鎴愬姛锛�";
- responseJsonValue["success"] = "true";
- responseJsonValue["data"] = VssDevTblDao::instance()->findJsonArray(string("select * from ") + VSSDevTbl_TABLE_NAME + " where 1 = 1");
+ responseJsonValue["message"] = "鏌ヨ鎴愬姛锛�";
+ responseJsonValue["success"] = "true";
+ auto devDataList = VssDevTblDao::instance()->findJsonArray(string("select * from ") + VSSDevTbl_TABLE_NAME
+ + " where 1 = 1", vssDevTblBuilder.buildVssDevTblMap());
+ for (int i = 0; i < devDataList.size(); i++) {
+ auto& devData = devDataList[i];
+ auto DevPubID = devData[VssDevTbl_DevPubID];
+ std::map<std::string, std::string> whereKeyValues;
+ whereKeyValues[CamDev_cam_dev_id] = DevPubID.asString();
+ auto camDevDataList = CamDevSqliteDao::instance()->findCamDevList(whereKeyValues)["data"];
+ devData["RemarkName"] = "";
+ if (camDevDataList.size() > 0) {
+ auto camDevData = camDevDataList[0];
+ devData["RemarkName"] = camDevData[CamDev_name].asString();
+ }
+ }
+ responseJsonValue["data"] = devDataList;
+
}
return responseJsonValue.toStyledString();
--
Gitblit v1.8.0