Merge branch 'yw.1.2.fixbug' of ssh://192.168.1.226:29418/development/c++ i...

pansen

2019-03-08 5fa7c97d9544e7afdf781a93e8ffb58dce22c977

Merge branch 'yw.1.2.fixbug' of ssh://192.168.1.226:29418/development/c++ into yw.1.2

 QiaoJiaSystem/DataManagerServer/vss/controller/VssChannelTblController.h

@@ -473,7 +473,7 @@
            }

            responseJsonValue["message"] = "查询成功！";

            responseJsonValue["success"] = "true";

            responseJsonValue["data"] = VssChannelTblDao::instance()->findJsonArray(string("select * from ") + VSSChannelTbl_TABLE_NAME + " where 1 = 1 limit 1");

            responseJsonValue["data"] = VssChannelTblDao::instance()->findJsonArray(string("select * from ") + VSSChannelTbl_TABLE_NAME + " where 1 = 1 limit 1", vssChannelTblBuilder.buildVssChannelTblMap());

        }

        return responseJsonValue.toStyledString();

    }

@@ -604,7 +604,9 @@
            }

            responseJsonValue["message"] = "查询成功！";

            responseJsonValue["success"] = "true";

            responseJsonValue["data"] = VssChannelTblDao::instance()->findJsonArray(string("select * from ") + VSSChannelTbl_TABLE_NAME + " where 1 = 1");

            responseJsonValue["data"] = VssChannelTblDao::instance()->findJsonArray(string("select * from ") +

                                                                                    VSSChannelTbl_TABLE_NAME + " where 1 = 1"

                                                                                    , vssChannelTblBuilder.buildVssChannelTblMap());



        }

        return responseJsonValue.toStyledString();


 QiaoJiaSystem/DataManagerServer/vss/controller/VssDevTblController.h

@@ -293,7 +293,7 @@
            }

            responseJsonValue["message"] = "查询成功！";

            responseJsonValue["success"] = "true";

            responseJsonValue["data"] = VssDevTblDao::instance()->findJsonArray(string("select * from ") + VSSDevTbl_TABLE_NAME + " where 1 = 1 limit 1");

            responseJsonValue["data"] = VssDevTblDao::instance()->findJsonArray(string("select * from ") + VSSDevTbl_TABLE_NAME + " where 1 = 1 limit 1", vssDevTblBuilder.buildVssDevTblMap());

        }

        return responseJsonValue.toStyledString();

    }

@@ -364,7 +364,7 @@
            }

            responseJsonValue["message"] = "查询成功！";

            responseJsonValue["success"] = "true";

            responseJsonValue["data"] = VssDevTblDao::instance()->findJsonArray(string("select * from ") + VSSDevTbl_TABLE_NAME + " where 1 = 1");

            responseJsonValue["data"] = VssDevTblDao::instance()->findJsonArray(string("select * from ") + VSSDevTbl_TABLE_NAME + " where 1 = 1", vssDevTblBuilder.buildVssDevTblMap());



        }

        return responseJsonValue.toStyledString();


 QiaoJiaSystem/DataManagerServer/vss/controller/VssDomainUnitTblController.h

@@ -248,7 +248,7 @@
            }

            responseJsonValue["message"] = "查询成功！";

            responseJsonValue["success"] = "true";

            responseJsonValue["data"] = VssDomainUnitTblDao::instance()->findJsonArray(string("select * from ") + VSSDomainUnitTbl_TABLE_NAME + " where 1 = 1 limit 1");

            responseJsonValue["data"] = VssDomainUnitTblDao::instance()->findJsonArray(string("select * from ") + VSSDomainUnitTbl_TABLE_NAME + " where 1 = 1 limit 1", vssDomainUnitTblBuilder.buildVssDomainUnitTblMap());

        }

        return responseJsonValue.toStyledString();

    }

@@ -304,7 +304,7 @@
            }

            responseJsonValue["message"] = "查询成功！";

            responseJsonValue["success"] = "true";

            responseJsonValue["data"] = VssDomainUnitTblDao::instance()->findJsonArray(string("select * from ") + VSSDomainUnitTbl_TABLE_NAME + " where 1 = 1");

            responseJsonValue["data"] = VssDomainUnitTblDao::instance()->findJsonArray(string("select * from ") + VSSDomainUnitTbl_TABLE_NAME + " where 1 = 1", vssDomainUnitTblBuilder.buildVssDomainUnitTblMap());



        }

        return responseJsonValue.toStyledString();


 QiaoJiaSystem/DataManagerServer/vss/controller/VssUpperSvrTblController.h

@@ -368,7 +368,7 @@
            }

            responseJsonValue["message"] = "查询成功！";

            responseJsonValue["success"] = "true";

            responseJsonValue["data"] = VssUpperSvrTblDao::instance()->findJsonArray(string("select * from ") + VSSUpperSvrTbl_TABLE_NAME + " where 1 = 1 limit 1");

            responseJsonValue["data"] = VssUpperSvrTblDao::instance()->findJsonArray(string("select * from ") + VSSUpperSvrTbl_TABLE_NAME + " where 1 = 1 limit 1", vssUpperSvrTblBuilder.buildVssUpperSvrTblMap());

        }

        return responseJsonValue.toStyledString();

    }

@@ -464,7 +464,7 @@
            }

            responseJsonValue["message"] = "查询成功！";

            responseJsonValue["success"] = "true";

            responseJsonValue["data"] = VssUpperSvrTblDao::instance()->findJsonArray(string("select * from ") + VSSUpperSvrTbl_TABLE_NAME + " where 1 = 1");

            responseJsonValue["data"] = VssUpperSvrTblDao::instance()->findJsonArray(string("select * from ") + VSSUpperSvrTbl_TABLE_NAME + " where 1 = 1", vssUpperSvrTblBuilder.buildVssUpperSvrTblMap());



        }

        return responseJsonValue.toStyledString();


 QiaoJiaSystem/DataManagerServer/vss/dao/BaseDao.h

@@ -77,7 +77,8 @@
        return rowDataList;
    }

    static Json::Value findJsonArray(string sql) {
    static Json::Value findJsonArray(string sql, std::map<std::string, std::string>& whereColumns) {
        sql = sql + getWhereColumnNameValuePair(whereColumns);
        initConnection();
        mysqlpp::Query query = conn->query(sql);
        Json::Value rowList;

 QiaoJiaSystem/DataManagerServer/vss/dao/CamDevSqliteDao.h

@@ -27,6 +27,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);