From 7e58157f116d5dde56ac21f1be8cb67457b8b625 Mon Sep 17 00:00:00 2001
From: chenshijun <csj_sky@126.com>
Date: 星期四, 07 三月 2019 14:49:42 +0800
Subject: [PATCH] Merge branch 'yw.1.2.fixbug' of ssh://192.168.1.226:29418/development/c++ into yw.1.2.fixbug

---
 QiaoJiaSystem/DataManagerServer/vss/dao/VssChannelTblDao.h |    7 ++++++-
 1 files changed, 6 insertions(+), 1 deletions(-)

diff --git a/QiaoJiaSystem/DataManagerServer/vss/dao/VssChannelTblDao.h b/QiaoJiaSystem/DataManagerServer/vss/dao/VssChannelTblDao.h
index 9db3d3b..ed07dd7 100755
--- a/QiaoJiaSystem/DataManagerServer/vss/dao/VssChannelTblDao.h
+++ b/QiaoJiaSystem/DataManagerServer/vss/dao/VssChannelTblDao.h
@@ -23,6 +23,7 @@
     
     /** 娣诲姞鍒涘缓浜岀骇璁惧琛� keyValuesToAdd 闇�瑕佹坊鍔犵殑鍒楀悕鍜屽垪鍊煎map*/
     mysqlpp::SimpleResult addVssChannelTbl(std::map<std::string, std::string>& keyValuesToAdd) {
+        QMutexLocker mutexLocker(&m_mutexVisit);
         return add(keyValuesToAdd, VSSChannelTbl_TABLE_NAME);
     }
     
@@ -35,12 +36,14 @@
 
     /** 鍒犻櫎鍒涘缓浜岀骇璁惧琛� whereColumnNameValues 鍒楀悕鍜屽垪鍊煎鏉′欢 */
     bool deleteVssChannelTbl(std::map<std::string, std::string>& whereKeyValues) {
+        QMutexLocker mutexLocker(&m_mutexVisit);
         return del(VSSChannelTbl_TABLE_NAME, whereKeyValues);
     }
     
     /** 鏇存柊鍒涘缓浜岀骇璁惧琛� keyValuesToUpdate 闇�瑕佹洿鏂扮殑鍒楀悕鍜屽垪鍊煎锛� whereKeyValues 鍒楀悕鍜屽垪鍊兼潯浠� */
-	bool updateVssChannelTbl(std::map<std::string, std::string>& keyValuesToUpdate, 
+	bool updateVssChannelTbl(std::map<std::string, std::string>& keyValuesToUpdate,
 									std::map<std::string, std::string>& whereKeyValues) {
+        QMutexLocker mutexLocker(&m_mutexVisit);
 		return update(keyValuesToUpdate, VSSChannelTbl_TABLE_NAME, whereKeyValues);
 	}
 	
@@ -55,6 +58,7 @@
 	
 	/** 鏌ヨ鍒涘缓浜岀骇璁惧琛ㄥ垪琛�  querySql 瑕佹煡璇㈢殑sql璇彞 */
 	vector<VssChannelTbl> findVssChannelTblList(string querySql) {
+        QMutexLocker mutexLocker(&m_mutexVisit);
         vector<VssChannelTbl> vssChannelTblVec;
         vector<map<string, string>> rowDatList = findList(querySql);
         vssChannelTblVec.reserve(rowDatList.size());
@@ -81,6 +85,7 @@
     
     /** 鎵цsql璇彞 */
     bool execute(string sql) {
+        QMutexLocker mutexLocker(&m_mutexVisit);
         return exec(move(sql));
     }
     

--
Gitblit v1.8.0