Merge branch 'yw.1.2.fixbug' of http://192.168.1.226:10010/r/development/c+...

xuxiuxi

2019-03-08 c5b9ce0c0cf973575a936df3aa928d4b7a7fa7d2

Merge branch 'yw.1.2.fixbug' of http://192.168.1.226:10010/r/development/c++ into yw.1.2.fixbug

# Conflicts:
#	QiaoJiaSystem/DataManagerServer/http_configserver.cpp
fix add camera dev_cam_id duplicate bug

 QiaoJiaSystem/DataManagerServer/vss/dao/CamDevSqliteDao.h

@@ -26,6 +26,14 @@
        Json::Value responseJsonValue;
        responseJsonValue["message"] = "添加失败！";
        responseJsonValue["success"] = "false";

        std::map<std::string, std::string> whereKeyValues;
        whereKeyValues["cam_dev_id"] = keyValuesToAdd["cam_dev_id"];
        if (this->findCamDevList(whereKeyValues)["data"].size() > 0) {
            responseJsonValue["message"] = "cam_dev_id exist！";
            return responseJsonValue;
        }

        QMutexLocker mutexLocker(m_mutexVisit);//TODO
        QSqlTableModel pModel(NULL, *m_db);