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/CamDevController.h | 340 ++++++++++++++++++++++++++++----------------------------
1 files changed, 168 insertions(+), 172 deletions(-)
diff --git a/QiaoJiaSystem/DataManagerServer/vss/controller/CamDevController.h b/QiaoJiaSystem/DataManagerServer/vss/controller/CamDevController.h
index f268df2..52ae28c 100755
--- a/QiaoJiaSystem/DataManagerServer/vss/controller/CamDevController.h
+++ b/QiaoJiaSystem/DataManagerServer/vss/controller/CamDevController.h
@@ -16,46 +16,49 @@
*/
class CamDevController : public VssBaseController {
private:
- /** 鎽勫儚澶磋澶囨瀯閫犲嚱鏁� */
- CamDevController() {}
+ /** 鎽勫儚澶磋澶囨瀯閫犲嚱鏁� */
+ CamDevController() {}
+
public:
- /** 鎽勫儚澶磋澶囧崟渚嬫ā寮� */
- static CamDevController* instance() {
+ /** 鎽勫儚澶磋澶囧崟渚嬫ā寮� */
+ static CamDevController *instance() {
static CamDevController instance;
return &instance;
}
-public:
- /** 娉ㄥ唽{label}http鏈嶅姟 */
- void registerHttpServices(HttpSrvRetRecieve& _HttpSrvRetRecieve) {
- _HttpSrvRetRecieve.setInfo("^/addCamDev$", "POST",
- std::bind(&CamDevController::addCamDev, this,
- std::placeholders::_1, std::placeholders::_2,
- std::placeholders::_3, std::placeholders::_4));
-
- _HttpSrvRetRecieve.setInfo("^/delCamDev$", "POST",
- std::bind(&CamDevController::delCamDev, this,
- std::placeholders::_1, std::placeholders::_2,
- std::placeholders::_3, std::placeholders::_4));
-
- _HttpSrvRetRecieve.setInfo("^/updateCamDev$", "POST",
- std::bind(&CamDevController::updateCamDev, this,
- std::placeholders::_1, std::placeholders::_2,
- std::placeholders::_3, std::placeholders::_4));
-
- _HttpSrvRetRecieve.setInfo("^/findCamDev$", "POST",
- std::bind(&CamDevController::findCamDev, this,
- std::placeholders::_1, std::placeholders::_2,
- std::placeholders::_3, std::placeholders::_4));
-
- _HttpSrvRetRecieve.setInfo("^/findCamDevList$", "POST",
- std::bind(&CamDevController::findCamDevList, this,
- std::placeholders::_1, std::placeholders::_2,
- std::placeholders::_3, std::placeholders::_4));
+public:
+ /** 娉ㄥ唽{label}http鏈嶅姟 */
+ void registerHttpServices(HttpSrvRetRecieve &_HttpSrvRetRecieve) {
+
+ _HttpSrvRetRecieve.setInfo("^/addCamDev$", "POST",
+ std::bind(&CamDevController::addCamDev, this,
+ std::placeholders::_1, std::placeholders::_2,
+ std::placeholders::_3, std::placeholders::_4));
+
+ _HttpSrvRetRecieve.setInfo("^/delCamDev$", "POST",
+ std::bind(&CamDevController::delCamDev, this,
+ std::placeholders::_1, std::placeholders::_2,
+ std::placeholders::_3, std::placeholders::_4));
+
+ _HttpSrvRetRecieve.setInfo("^/updateCamDev$", "POST",
+ std::bind(&CamDevController::updateCamDev, this,
+ std::placeholders::_1, std::placeholders::_2,
+ std::placeholders::_3, std::placeholders::_4));
+
+ _HttpSrvRetRecieve.setInfo("^/findCamDev$", "POST",
+ std::bind(&CamDevController::findCamDev, this,
+ std::placeholders::_1, std::placeholders::_2,
+ std::placeholders::_3, std::placeholders::_4));
+
+ _HttpSrvRetRecieve.setInfo("^/findCamDevList$", "POST",
+ std::bind(&CamDevController::findCamDevList, this,
+ std::placeholders::_1, std::placeholders::_2,
+ std::placeholders::_3, std::placeholders::_4));
}
+
public:
- /** 娣诲姞鎽勫儚澶磋澶� */
+ /** 娣诲姞鎽勫儚澶磋澶� */
std::string addCamDev(std::string ip, unsigned int port, std::string content, PResponse &response) {
Json::Reader requestJsonReader;
Json::Value requestJsonValue;
@@ -64,83 +67,87 @@
responseJsonValue["success"] = "false";
if (requestJsonReader.parse(content, requestJsonValue)) {
CamDevBuilder camDevBuilder;
-
- Json::Value idJsonValue = requestJsonValue[CamDev_id];
+
+ Json::Value idJsonValue = requestJsonValue[CamDev_id];
if (idJsonValue.type() != Json::ValueType::nullValue) {
camDevBuilder.addid(std::stoi((idJsonValue.asString())));
+ } else {
+ ERR("CamDev_id is null " << " is null");
+// return responseJsonValue.toStyledString();
}
-
- Json::Value cam_dev_idJsonValue = requestJsonValue[CamDev_cam_dev_id];
+
+ Json::Value cam_dev_idJsonValue = requestJsonValue[CamDev_cam_dev_id];
if (cam_dev_idJsonValue.type() != Json::ValueType::nullValue) {
camDevBuilder.addcam_dev_id((cam_dev_idJsonValue.asString()));
+ } else {
+ ERR(CamDev_cam_dev_id << " is null");
+ return responseJsonValue.toStyledString();
}
-
- Json::Value nameJsonValue = requestJsonValue[CamDev_name];
+
+ Json::Value nameJsonValue = requestJsonValue[CamDev_name];
if (nameJsonValue.type() != Json::ValueType::nullValue) {
camDevBuilder.addname((nameJsonValue.asString()));
}
-
- Json::Value addrJsonValue = requestJsonValue[CamDev_addr];
+
+ Json::Value addrJsonValue = requestJsonValue[CamDev_addr];
if (addrJsonValue.type() != Json::ValueType::nullValue) {
camDevBuilder.addaddr((addrJsonValue.asString()));
}
-
- Json::Value longitudeJsonValue = requestJsonValue[CamDev_longitude];
+
+ Json::Value longitudeJsonValue = requestJsonValue[CamDev_longitude];
if (longitudeJsonValue.type() != Json::ValueType::nullValue) {
camDevBuilder.addlongitude((longitudeJsonValue.asString()));
}
-
- Json::Value latitudeJsonValue = requestJsonValue[CamDev_latitude];
+
+ Json::Value latitudeJsonValue = requestJsonValue[CamDev_latitude];
if (latitudeJsonValue.type() != Json::ValueType::nullValue) {
camDevBuilder.addlatitude((latitudeJsonValue.asString()));
}
-
- Json::Value ipJsonValue = requestJsonValue[CamDev_ip];
+
+ Json::Value ipJsonValue = requestJsonValue[CamDev_ip];
if (ipJsonValue.type() != Json::ValueType::nullValue) {
camDevBuilder.addip((ipJsonValue.asString()));
}
-
- Json::Value portJsonValue = requestJsonValue[CamDev_port];
+
+ Json::Value portJsonValue = requestJsonValue[CamDev_port];
if (portJsonValue.type() != Json::ValueType::nullValue) {
camDevBuilder.addport(std::stoi((portJsonValue.asString())));
}
-
- Json::Value usernameJsonValue = requestJsonValue[CamDev_username];
+
+ Json::Value usernameJsonValue = requestJsonValue[CamDev_username];
if (usernameJsonValue.type() != Json::ValueType::nullValue) {
camDevBuilder.addusername((usernameJsonValue.asString()));
}
-
- Json::Value passwordJsonValue = requestJsonValue[CamDev_password];
+
+ Json::Value passwordJsonValue = requestJsonValue[CamDev_password];
if (passwordJsonValue.type() != Json::ValueType::nullValue) {
camDevBuilder.addpassword((passwordJsonValue.asString()));
}
-
- Json::Value brandJsonValue = requestJsonValue[CamDev_brand];
+
+ Json::Value brandJsonValue = requestJsonValue[CamDev_brand];
if (brandJsonValue.type() != Json::ValueType::nullValue) {
camDevBuilder.addbrand((brandJsonValue.asString()));
}
-
- Json::Value reservedJsonValue = requestJsonValue[CamDev_reserved];
+
+ Json::Value reservedJsonValue = requestJsonValue[CamDev_reserved];
if (reservedJsonValue.type() != Json::ValueType::nullValue) {
camDevBuilder.addreserved((reservedJsonValue.asString()));
}
-
- Json::Value typeJsonValue = requestJsonValue[CamDev_type];
+
+ Json::Value typeJsonValue = requestJsonValue[CamDev_type];
if (typeJsonValue.type() != Json::ValueType::nullValue) {
camDevBuilder.addtype((typeJsonValue.asString()));
+ } else {
+ camDevBuilder.addtype("1");
}
- auto keyValuesToAdd = camDevBuilder.buildCamDevMap();
- if (keyValuesToAdd.size() > 0) {
- mysqlpp::SimpleResult addCamDevResult = CamDevSqliteDao::instance()->addCamDev(keyValuesToAdd);
- if (addCamDevResult.rows() > 0) {
- responseJsonValue["success"] = "true";
- responseJsonValue["message"] = "娣诲姞鎴愬姛锛�";
- }
+ auto keyValuesToAdd = camDevBuilder.buildCamDevMap();
+ if (keyValuesToAdd.size() > 0) {
+ responseJsonValue = CamDevSqliteDao::instance()->addCamDev(keyValuesToAdd);
}
}
return responseJsonValue.toStyledString();
}
-
+
/** 鍒犻櫎鎽勫儚澶磋澶� */
std::string delCamDev(std::string ip, unsigned int port, std::string content, PResponse &response) {
Json::Reader requestJsonReader;
@@ -149,19 +156,16 @@
responseJsonValue["message"] = "鍒犻櫎澶辫触锛�";
responseJsonValue["success"] = "false";
if (requestJsonReader.parse(content, requestJsonValue)) {
- Json::Value iDJsonValue = requestJsonValue[CamDev_ID];
- if (iDJsonValue.type() != Json::ValueType::nullValue) {
- string iDValue = iDJsonValue.asString();
- if (iDValue.size() > 0 && CamDevSqliteDao::instance()->deleteByColumn("ID", iDValue)) {
- responseJsonValue["success"] = "true";
- responseJsonValue["message"] = "鍒犻櫎鎴愬姛!";
- }
+ Json::Value iDJsonValue = requestJsonValue["id"];
+ if (iDJsonValue.type() != Json::ValueType::nullValue) {
+ string iDValue = iDJsonValue.asString();
+ responseJsonValue = CamDevSqliteDao::instance()->deleteByColumn("id", iDValue);
}
-
+
}
return responseJsonValue.toStyledString();
}
-
+
/** 鏇存柊鎽勫儚澶磋澶� */
std::string updateCamDev(std::string ip, unsigned int port, std::string content, PResponse &response) {
Json::Reader requestJsonReader;
@@ -171,82 +175,79 @@
responseJsonValue["success"] = "false";
if (requestJsonReader.parse(content, requestJsonValue)) {
CamDevBuilder camDevBuilder;
-
- Json::Value idJsonValue = requestJsonValue[CamDev_id];
+
+ Json::Value idJsonValue = requestJsonValue[CamDev_id];
if (idJsonValue.type() != Json::ValueType::nullValue) {
camDevBuilder.addid(std::stoi((idJsonValue.asString())));
}
-
- Json::Value cam_dev_idJsonValue = requestJsonValue[CamDev_cam_dev_id];
+
+ Json::Value cam_dev_idJsonValue = requestJsonValue[CamDev_cam_dev_id];
if (cam_dev_idJsonValue.type() != Json::ValueType::nullValue) {
camDevBuilder.addcam_dev_id((cam_dev_idJsonValue.asString()));
}
-
- Json::Value nameJsonValue = requestJsonValue[CamDev_name];
+
+ Json::Value nameJsonValue = requestJsonValue[CamDev_name];
if (nameJsonValue.type() != Json::ValueType::nullValue) {
camDevBuilder.addname((nameJsonValue.asString()));
}
-
- Json::Value addrJsonValue = requestJsonValue[CamDev_addr];
+
+ Json::Value addrJsonValue = requestJsonValue[CamDev_addr];
if (addrJsonValue.type() != Json::ValueType::nullValue) {
camDevBuilder.addaddr((addrJsonValue.asString()));
}
-
- Json::Value longitudeJsonValue = requestJsonValue[CamDev_longitude];
+
+ Json::Value longitudeJsonValue = requestJsonValue[CamDev_longitude];
if (longitudeJsonValue.type() != Json::ValueType::nullValue) {
camDevBuilder.addlongitude((longitudeJsonValue.asString()));
}
-
- Json::Value latitudeJsonValue = requestJsonValue[CamDev_latitude];
+
+ Json::Value latitudeJsonValue = requestJsonValue[CamDev_latitude];
if (latitudeJsonValue.type() != Json::ValueType::nullValue) {
camDevBuilder.addlatitude((latitudeJsonValue.asString()));
}
-
- Json::Value ipJsonValue = requestJsonValue[CamDev_ip];
+
+ Json::Value ipJsonValue = requestJsonValue[CamDev_ip];
if (ipJsonValue.type() != Json::ValueType::nullValue) {
camDevBuilder.addip((ipJsonValue.asString()));
}
-
- Json::Value portJsonValue = requestJsonValue[CamDev_port];
+
+ Json::Value portJsonValue = requestJsonValue[CamDev_port];
if (portJsonValue.type() != Json::ValueType::nullValue) {
camDevBuilder.addport(std::stoi((portJsonValue.asString())));
}
-
- Json::Value usernameJsonValue = requestJsonValue[CamDev_username];
+
+ Json::Value usernameJsonValue = requestJsonValue[CamDev_username];
if (usernameJsonValue.type() != Json::ValueType::nullValue) {
camDevBuilder.addusername((usernameJsonValue.asString()));
}
-
- Json::Value passwordJsonValue = requestJsonValue[CamDev_password];
+
+ Json::Value passwordJsonValue = requestJsonValue[CamDev_password];
if (passwordJsonValue.type() != Json::ValueType::nullValue) {
camDevBuilder.addpassword((passwordJsonValue.asString()));
}
-
- Json::Value brandJsonValue = requestJsonValue[CamDev_brand];
+
+ Json::Value brandJsonValue = requestJsonValue[CamDev_brand];
if (brandJsonValue.type() != Json::ValueType::nullValue) {
camDevBuilder.addbrand((brandJsonValue.asString()));
}
-
- Json::Value reservedJsonValue = requestJsonValue[CamDev_reserved];
+
+ Json::Value reservedJsonValue = requestJsonValue[CamDev_reserved];
if (reservedJsonValue.type() != Json::ValueType::nullValue) {
camDevBuilder.addreserved((reservedJsonValue.asString()));
}
-
- Json::Value typeJsonValue = requestJsonValue[CamDev_type];
+
+ Json::Value typeJsonValue = requestJsonValue[CamDev_type];
if (typeJsonValue.type() != Json::ValueType::nullValue) {
camDevBuilder.addtype((typeJsonValue.asString()));
}
- if (iDJsonValue.type() != Json::ValueType::nullValue) {
- string iDValue = iDJsonValue.asString();
- if (iDValue.size() > 0 && CamDevSqliteDao::instance()->updateCamDev(camDevBuilder.buildCamDevMap(), "ID", iDValue)) {
- responseJsonValue["success"] = "true";
- responseJsonValue["message"] = "鏇存柊鎴愬姛锛�";
- }
+ if (idJsonValue.type() != Json::ValueType::nullValue) {
+ responseJsonValue = CamDevSqliteDao::instance()->updateCamDev(camDevBuilder.buildCamDevMap(), "id",
+ idJsonValue.asString());
}
}
return responseJsonValue.toStyledString();
}
-
+
/** 鏌ユ壘鍗曚釜鎽勫儚澶磋澶� */
std::string findCamDev(std::string ip, unsigned int port, std::string content, PResponse &response) {
Json::Reader requestJsonReader;
@@ -256,78 +257,78 @@
responseJsonValue["success"] = "false";
if (requestJsonReader.parse(content, requestJsonValue)) {
CamDevBuilder camDevBuilder;
-
- Json::Value idJsonValue = requestJsonValue[CamDev_id];
+
+ Json::Value idJsonValue = requestJsonValue[CamDev_id];
if (idJsonValue.type() != Json::ValueType::nullValue) {
camDevBuilder.addid(std::stoi((idJsonValue.asString())));
}
-
- Json::Value cam_dev_idJsonValue = requestJsonValue[CamDev_cam_dev_id];
+
+ Json::Value cam_dev_idJsonValue = requestJsonValue[CamDev_cam_dev_id];
if (cam_dev_idJsonValue.type() != Json::ValueType::nullValue) {
camDevBuilder.addcam_dev_id((cam_dev_idJsonValue.asString()));
}
-
- Json::Value nameJsonValue = requestJsonValue[CamDev_name];
+
+ Json::Value nameJsonValue = requestJsonValue[CamDev_name];
if (nameJsonValue.type() != Json::ValueType::nullValue) {
camDevBuilder.addname((nameJsonValue.asString()));
}
-
- Json::Value addrJsonValue = requestJsonValue[CamDev_addr];
+
+ Json::Value addrJsonValue = requestJsonValue[CamDev_addr];
if (addrJsonValue.type() != Json::ValueType::nullValue) {
camDevBuilder.addaddr((addrJsonValue.asString()));
}
-
- Json::Value longitudeJsonValue = requestJsonValue[CamDev_longitude];
+
+ Json::Value longitudeJsonValue = requestJsonValue[CamDev_longitude];
if (longitudeJsonValue.type() != Json::ValueType::nullValue) {
camDevBuilder.addlongitude((longitudeJsonValue.asString()));
}
-
- Json::Value latitudeJsonValue = requestJsonValue[CamDev_latitude];
+
+ Json::Value latitudeJsonValue = requestJsonValue[CamDev_latitude];
if (latitudeJsonValue.type() != Json::ValueType::nullValue) {
camDevBuilder.addlatitude((latitudeJsonValue.asString()));
}
-
- Json::Value ipJsonValue = requestJsonValue[CamDev_ip];
+
+ Json::Value ipJsonValue = requestJsonValue[CamDev_ip];
if (ipJsonValue.type() != Json::ValueType::nullValue) {
camDevBuilder.addip((ipJsonValue.asString()));
}
-
- Json::Value portJsonValue = requestJsonValue[CamDev_port];
+
+ Json::Value portJsonValue = requestJsonValue[CamDev_port];
if (portJsonValue.type() != Json::ValueType::nullValue) {
camDevBuilder.addport(std::stoi((portJsonValue.asString())));
}
-
- Json::Value usernameJsonValue = requestJsonValue[CamDev_username];
+
+ Json::Value usernameJsonValue = requestJsonValue[CamDev_username];
if (usernameJsonValue.type() != Json::ValueType::nullValue) {
camDevBuilder.addusername((usernameJsonValue.asString()));
}
-
- Json::Value passwordJsonValue = requestJsonValue[CamDev_password];
+
+ Json::Value passwordJsonValue = requestJsonValue[CamDev_password];
if (passwordJsonValue.type() != Json::ValueType::nullValue) {
camDevBuilder.addpassword((passwordJsonValue.asString()));
}
-
- Json::Value brandJsonValue = requestJsonValue[CamDev_brand];
+
+ Json::Value brandJsonValue = requestJsonValue[CamDev_brand];
if (brandJsonValue.type() != Json::ValueType::nullValue) {
camDevBuilder.addbrand((brandJsonValue.asString()));
}
-
- Json::Value reservedJsonValue = requestJsonValue[CamDev_reserved];
+
+ Json::Value reservedJsonValue = requestJsonValue[CamDev_reserved];
if (reservedJsonValue.type() != Json::ValueType::nullValue) {
camDevBuilder.addreserved((reservedJsonValue.asString()));
}
-
- Json::Value typeJsonValue = requestJsonValue[CamDev_type];
+
+ Json::Value typeJsonValue = requestJsonValue[CamDev_type];
if (typeJsonValue.type() != Json::ValueType::nullValue) {
camDevBuilder.addtype((typeJsonValue.asString()));
}
- responseJsonValue["message"] = "鏌ヨ鎴愬姛锛�";
- responseJsonValue["success"] = "true";
- responseJsonValue["data"] = CamDevSqliteDao::instance()->findJsonArray(string("select * from ") + CamDev_TABLE_NAME + " where 1 = 1 limit 1");
+ responseJsonValue["message"] = "鏌ヨ鎴愬姛锛�";
+ responseJsonValue["success"] = "true";
+ responseJsonValue = CamDevSqliteDao::instance()->findCamDevList(camDevBuilder.buildCamDevMap());
}
return responseJsonValue.toStyledString();
}
-
+
/** 鏌ユ壘鎽勫儚澶磋澶囧垪琛� */
std::string findCamDevList(std::string ip, unsigned int port, std::string content, PResponse &response) {
Json::Reader requestJsonReader;
@@ -337,74 +338,74 @@
responseJsonValue["success"] = "false";
if (content == "" || requestJsonReader.parse(content, requestJsonValue)) {
CamDevBuilder camDevBuilder;
-
- Json::Value idJsonValue = requestJsonValue[CamDev_id];
+
+ Json::Value idJsonValue = requestJsonValue[CamDev_id];
if (idJsonValue.type() != Json::ValueType::nullValue) {
camDevBuilder.addid(std::stoi((idJsonValue.asString())));
}
-
- Json::Value cam_dev_idJsonValue = requestJsonValue[CamDev_cam_dev_id];
+
+ Json::Value cam_dev_idJsonValue = requestJsonValue[CamDev_cam_dev_id];
if (cam_dev_idJsonValue.type() != Json::ValueType::nullValue) {
camDevBuilder.addcam_dev_id((cam_dev_idJsonValue.asString()));
}
-
- Json::Value nameJsonValue = requestJsonValue[CamDev_name];
+
+ Json::Value nameJsonValue = requestJsonValue[CamDev_name];
if (nameJsonValue.type() != Json::ValueType::nullValue) {
camDevBuilder.addname((nameJsonValue.asString()));
}
-
- Json::Value addrJsonValue = requestJsonValue[CamDev_addr];
+
+ Json::Value addrJsonValue = requestJsonValue[CamDev_addr];
if (addrJsonValue.type() != Json::ValueType::nullValue) {
camDevBuilder.addaddr((addrJsonValue.asString()));
}
-
- Json::Value longitudeJsonValue = requestJsonValue[CamDev_longitude];
+
+ Json::Value longitudeJsonValue = requestJsonValue[CamDev_longitude];
if (longitudeJsonValue.type() != Json::ValueType::nullValue) {
camDevBuilder.addlongitude((longitudeJsonValue.asString()));
}
-
- Json::Value latitudeJsonValue = requestJsonValue[CamDev_latitude];
+
+ Json::Value latitudeJsonValue = requestJsonValue[CamDev_latitude];
if (latitudeJsonValue.type() != Json::ValueType::nullValue) {
camDevBuilder.addlatitude((latitudeJsonValue.asString()));
}
-
- Json::Value ipJsonValue = requestJsonValue[CamDev_ip];
+
+ Json::Value ipJsonValue = requestJsonValue[CamDev_ip];
if (ipJsonValue.type() != Json::ValueType::nullValue) {
camDevBuilder.addip((ipJsonValue.asString()));
}
-
- Json::Value portJsonValue = requestJsonValue[CamDev_port];
+
+ Json::Value portJsonValue = requestJsonValue[CamDev_port];
if (portJsonValue.type() != Json::ValueType::nullValue) {
camDevBuilder.addport(std::stoi((portJsonValue.asString())));
}
-
- Json::Value usernameJsonValue = requestJsonValue[CamDev_username];
+
+ Json::Value usernameJsonValue = requestJsonValue[CamDev_username];
if (usernameJsonValue.type() != Json::ValueType::nullValue) {
camDevBuilder.addusername((usernameJsonValue.asString()));
}
-
- Json::Value passwordJsonValue = requestJsonValue[CamDev_password];
+
+ Json::Value passwordJsonValue = requestJsonValue[CamDev_password];
if (passwordJsonValue.type() != Json::ValueType::nullValue) {
camDevBuilder.addpassword((passwordJsonValue.asString()));
}
-
- Json::Value brandJsonValue = requestJsonValue[CamDev_brand];
+
+ Json::Value brandJsonValue = requestJsonValue[CamDev_brand];
if (brandJsonValue.type() != Json::ValueType::nullValue) {
camDevBuilder.addbrand((brandJsonValue.asString()));
}
-
- Json::Value reservedJsonValue = requestJsonValue[CamDev_reserved];
+
+ Json::Value reservedJsonValue = requestJsonValue[CamDev_reserved];
if (reservedJsonValue.type() != Json::ValueType::nullValue) {
camDevBuilder.addreserved((reservedJsonValue.asString()));
}
-
- Json::Value typeJsonValue = requestJsonValue[CamDev_type];
+
+ Json::Value typeJsonValue = requestJsonValue[CamDev_type];
if (typeJsonValue.type() != Json::ValueType::nullValue) {
camDevBuilder.addtype((typeJsonValue.asString()));
}
- responseJsonValue["message"] = "鏌ヨ鎴愬姛锛�";
- responseJsonValue["success"] = "true";
- responseJsonValue["data"] = CamDevSqliteDao::instance()->findJsonArray(string("select * from ") + CamDev_TABLE_NAME + " where 1 = 1");
+ responseJsonValue["message"] = "鏌ヨ鎴愬姛锛�";
+ responseJsonValue["success"] = "true";
+ responseJsonValue = CamDevSqliteDao::instance()->findCamDevList(camDevBuilder.buildCamDevMap());
}
return responseJsonValue.toStyledString();
@@ -412,12 +413,7 @@
};
-
-
-
-
#endif //CAMDEV_CONTROLLER_H
-
--
Gitblit v1.8.0