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/vss/dao/CamDevSqliteDao.h |   31 ++++++++++++++++++-------------
 1 files changed, 18 insertions(+), 13 deletions(-)

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