From 52ffba4b81a86d86cda9cdce6e33d2dc6392243c Mon Sep 17 00:00:00 2001
From: pansen <pansen626@sina.com>
Date: 星期五, 08 三月 2019 11:50:47 +0800
Subject: [PATCH] 修改同步库更新的bug
---
QiaoJiaSystem/DataManagerServer/http_configserver.cpp | 24 ++++++-----
QiaoJiaSystem/DataManagerServer/vss/dao/CamDevSqliteDao.h | 31 +++++++++------
QiaoJiaSystem/DataManagerServer/vss/controller/CamDevController.h | 22 +++++++---
3 files changed, 46 insertions(+), 31 deletions(-)
diff --git a/QiaoJiaSystem/DataManagerServer/http_configserver.cpp b/QiaoJiaSystem/DataManagerServer/http_configserver.cpp
index f93e4e0..4bac277 100644
--- a/QiaoJiaSystem/DataManagerServer/http_configserver.cpp
+++ b/QiaoJiaSystem/DataManagerServer/http_configserver.cpp
@@ -1934,6 +1934,7 @@
ret = erlangDbTool->createDatabase(Uuid, fieldValues);
} else if (SyncType == 0) {
TableName.insert(0, "lt_");
+ fieldValues.insert(std::make_pair("tableName", TableName));
//鏈湴搴�
ret = m_SqliteFaceEncap.createTable(TableName, fieldValues);
}
@@ -2408,26 +2409,27 @@
std::string BwType = value["BwType"].asString();
std::string StartTime = value["StartTime"].asString();
std::string EndTime = value["EndTime"].asString();
-
+ //#鏇存柊搴曞簱绠＄悊琛�
+ FieldValues fieldValues;
+ fieldValues.insert(std::make_pair("uuid", Uuid));
+ fieldValues.insert(std::make_pair("tableName", TableName));
+// fieldValues.insert(std::make_pair("tableDesc", "ceshi2"));
+ fieldValues.insert(std::make_pair("tableType", TableType));
+ fieldValues.insert(std::make_pair("bwType", BwType));
+ fieldValues.insert(std::make_pair("startTime", StartTime));
+ fieldValues.insert(std::make_pair("endTime", EndTime));
+// fieldValues.insert(std::make_pair("create_by", "who"));
bool ret = false;
if (SyncType == 1) {
//鍚屾搴�
- ret = erlangDbTool->updateDatabase(Uuid, TableType, TableName, SyncType, BwType, StartTime, EndTime);
+ ret = erlangDbTool->updateDatabase(TableName, fieldValues);
} else if (SyncType == 0) {
//鏈湴搴�
- //#鏇存柊搴曞簱绠＄悊琛�
- FieldValues fieldValues;
- fieldValues.insert(std::make_pair("uuid", Uuid));
if (TableName.find("lt_") != 0) {
TableName.insert(0, "lt_");
}
fieldValues.insert(std::make_pair("tableName", TableName));
-// fieldValues.insert(std::make_pair("tableDesc", "ceshi2"));
- fieldValues.insert(std::make_pair("tableType", TableType));
- fieldValues.insert(std::make_pair("bwType", BwType));
- fieldValues.insert(std::make_pair("startTime", StartTime));
- fieldValues.insert(std::make_pair("endTime", EndTime));
-// fieldValues.insert(std::make_pair("create_by", "who"));
+
ret = m_SqliteFaceEncap.updateTable("sys_o_tables", fieldValues);
}
diff --git a/QiaoJiaSystem/DataManagerServer/vss/controller/CamDevController.h b/QiaoJiaSystem/DataManagerServer/vss/controller/CamDevController.h
index a8675c4..52ae28c 100755
--- a/QiaoJiaSystem/DataManagerServer/vss/controller/CamDevController.h
+++ b/QiaoJiaSystem/DataManagerServer/vss/controller/CamDevController.h
@@ -18,15 +18,17 @@
private:
/** 鎽勫儚澶磋澶囨瀯閫犲嚱鏁� */
CamDevController() {}
+
public:
/** 鎽勫儚澶磋澶囧崟渚嬫ā寮� */
- static CamDevController* instance() {
+ static CamDevController *instance() {
static CamDevController instance;
return &instance;
}
+
public:
/** 娉ㄥ唽{label}http鏈嶅姟 */
- void registerHttpServices(HttpSrvRetRecieve& _HttpSrvRetRecieve) {
+ void registerHttpServices(HttpSrvRetRecieve &_HttpSrvRetRecieve) {
_HttpSrvRetRecieve.setInfo("^/addCamDev$", "POST",
std::bind(&CamDevController::addCamDev, this,
@@ -54,6 +56,7 @@
std::placeholders::_3, std::placeholders::_4));
}
+
public:
/** 娣诲姞鎽勫儚澶磋澶� */
std::string addCamDev(std::string ip, unsigned int port, std::string content, PResponse &response) {
@@ -68,11 +71,17 @@
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];
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];
@@ -128,6 +137,8 @@
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) {
@@ -230,7 +241,8 @@
camDevBuilder.addtype((typeJsonValue.asString()));
}
if (idJsonValue.type() != Json::ValueType::nullValue) {
- responseJsonValue = CamDevSqliteDao::instance()->updateCamDev(camDevBuilder.buildCamDevMap(), "id", idJsonValue.asString());
+ responseJsonValue = CamDevSqliteDao::instance()->updateCamDev(camDevBuilder.buildCamDevMap(), "id",
+ idJsonValue.asString());
}
}
return responseJsonValue.toStyledString();
@@ -399,10 +411,6 @@
return responseJsonValue.toStyledString();
}
};
-
-
-
-
#endif //CAMDEV_CONTROLLER_H
diff --git a/QiaoJiaSystem/DataManagerServer/vss/dao/CamDevSqliteDao.h b/QiaoJiaSystem/DataManagerServer/vss/dao/CamDevSqliteDao.h
index d264b87..eff1416 100755
--- a/QiaoJiaSystem/DataManagerServer/vss/dao/CamDevSqliteDao.h
+++ b/QiaoJiaSystem/DataManagerServer/vss/dao/CamDevSqliteDao.h
@@ -14,15 +14,16 @@
private:
/** 鎽勫儚澶磋澶囨瀯閫犲嚱鏁� */
CamDevSqliteDao() {}
+
public:
/** 鎽勫儚澶磋澶囧崟渚嬫ā寮� */
- static CamDevSqliteDao* instance() {
+ static CamDevSqliteDao *instance() {
static CamDevSqliteDao instance;
return &instance;
}
/** 娣诲姞鎽勫儚澶磋澶� keyValuesToAdd 闇�瑕佹坊鍔犵殑鍒楀悕鍜屽垪鍊煎map*/
- Json::Value addCamDev(std::map<std::string, std::string>& keyValuesToAdd) {
+ Json::Value addCamDev(std::map<std::string, std::string> &keyValuesToAdd) {
Json::Value responseJsonValue;
responseJsonValue["message"] = "娣诲姞澶辫触锛�";
responseJsonValue["success"] = "false";
@@ -34,7 +35,8 @@
QSqlRecord rec = pModel.record();
for (auto keyValueToAdd : keyValuesToAdd) {
- rec.setValue(QString::fromUtf8(keyValueToAdd.first.c_str()), QString::fromUtf8(keyValueToAdd.second.c_str()));
+ rec.setValue(QString::fromUtf8(keyValueToAdd.first.c_str()),
+ QString::fromUtf8(keyValueToAdd.second.c_str()));
}
rec.setGenerated("id", false);
@@ -63,7 +65,7 @@
}
/** 鍒犻櫎鎽勫儚澶磋澶� whereKey 鍒楀悕锛泈hereValue 鍒楀�� */
- Json::Value deleteCamDev(std::map<std::string, std::string>& whereKeyValues) {
+ Json::Value deleteCamDev(std::map<std::string, std::string> &whereKeyValues) {
Json::Value responseJsonValue;
responseJsonValue["message"] = "鍒犻櫎澶辫触锛�";
@@ -71,8 +73,9 @@
QMutexLocker mutexLocker(m_mutexVisit);//TODO
QSqlTableModel pModel(NULL, *m_db);
pModel.setTable(CamDev_TABLE_NAME);
- for (auto whereKeyValue : whereKeyValues ) {
- pModel.setFilter(QObject::tr((string(whereKeyValue.first)+" = '%1'").c_str()).arg(QString::fromUtf8(whereKeyValue.second.c_str())));
+ for (auto whereKeyValue : whereKeyValues) {
+ pModel.setFilter(QObject::tr((string(whereKeyValue.first) + " = '%1'").c_str()).arg(
+ QString::fromUtf8(whereKeyValue.second.c_str())));
}
pModel.setEditStrategy(QSqlTableModel::OnManualSubmit);//OnManualSubmit OnFieldChange
pModel.select();
@@ -102,8 +105,8 @@
}
/** 鏇存柊鏈湴鍥芥爣閰嶇疆 keyValuesToUpdate 闇�瑕佹洿鏂扮殑鍒楀悕鍜屽垪鍊煎锛� whereKeyValues 鍒楀悕鍜屽垪鍊兼潯浠� */
- Json::Value updateCamDev(std::map<std::string, std::string>& keyValuesToUpdate,
- std::map<std::string, std::string>& whereKeyValues) {
+ Json::Value updateCamDev(std::map<std::string, std::string> &keyValuesToUpdate,
+ std::map<std::string, std::string> &whereKeyValues) {
Json::Value responseJsonValue;
responseJsonValue["message"] = "鏇存柊澶辫触锛�";
responseJsonValue["success"] = "false";
@@ -111,7 +114,8 @@
QSqlTableModel pModel(NULL, *m_db);
pModel.setTable(CamDev_TABLE_NAME);
for (auto whereKeyValue : whereKeyValues) {
- pModel.setFilter(QObject::tr((whereKeyValue.first + " = '%1'").c_str()).arg(QString::fromStdString(whereKeyValue.second)));
+ pModel.setFilter(QObject::tr((whereKeyValue.first + " = '%1'").c_str()).arg(
+ QString::fromStdString(whereKeyValue.second)));
}
pModel.setEditStrategy(QSqlTableModel::OnManualSubmit);//OnManualSubmit OnFieldChange
pModel.select();
@@ -152,7 +156,7 @@
}
/** 鏇存柊鎽勫儚澶磋澶� keyValuesToUpdate 闇�瑕佹洿鏂扮殑鍒楀悕鍜屽垪鍊煎锛� whereKeyValues 鍒楀悕鍜屽垪鍊兼潯浠� */
- Json::Value updateCamDev(std::map<std::string, std::string>& keyValuesToUpdate,
+ Json::Value updateCamDev(std::map<std::string, std::string> &keyValuesToUpdate,
string whereKey,
string whereValue) {
std::map<std::string, std::string> whereKeyValues;
@@ -161,7 +165,7 @@
}
/**鏌ヨ鎽勫儚澶磋澶囧垪琛� whereKeyValues 鍒楀悕鍜屽垪鍊煎鏉′欢 */
- Json::Value findCamDevList(std::map<std::string, std::string>& whereKeyValues) {
+ Json::Value findCamDevList(std::map<std::string, std::string> &whereKeyValues) {
Json::Value responseJsonValue;
responseJsonValue["message"] = "鏌ヨ澶辫触锛�";
@@ -172,8 +176,9 @@
std::list<Record_Cut_Video_info> lst;
QSqlTableModel pModel(NULL, *m_db);
pModel.setTable(CamDev_TABLE_NAME);;
- for (auto whereKeyValue : whereKeyValues ) {
- pModel.setFilter(QObject::tr((string(whereKeyValue.first)+" = '%1'").c_str()).arg(QString::fromUtf8(whereKeyValue.second.c_str())));
+ for (auto whereKeyValue : whereKeyValues) {
+ pModel.setFilter(QObject::tr((string(whereKeyValue.first) + " = '%1'").c_str()).arg(
+ QString::fromUtf8(whereKeyValue.second.c_str())));
}
pModel.setEditStrategy(QSqlTableModel::OnManualSubmit);//OnManualSubmit OnFieldChange
pModel.select();
--
Gitblit v1.8.0