修改同步库更新的bug

pansen

2019-03-08 52ffba4b81a86d86cda9cdce6e33d2dc6392243c

 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 列名；whereValue 列值 */
    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();