cam_dev add type code

xuxiuxi

2019-03-08 118d5304c8744a3cb533164af6fbdc91229d6f3d

cam_dev add type code

 QiaoJiaSystem/DataManagerServer/http_configserver.cpp

@@ -1052,7 +1052,7 @@
        if ((!ret) || (serialnumber[0] == 0)) {
            return "{\"ret_status\": \"内容有误，请检查！\"}";
        }

        rec.type = 0;
        rec.str_cam_dev_id = QString::fromLatin1((const char *) serialnumber);//摄像机id cam_mac
        rec.str_name = QString::fromStdString(value["str_name"].asString());
        rec.str_addr = QString::fromStdString(value["str_addr"].asString());

 QiaoJiaSystem/DataManagerServer/vss/controller/CamDevController.h

@@ -128,6 +128,8 @@
            Json::Value typeJsonValue = requestJsonValue[CamDev_type];
            if (typeJsonValue.type() != Json::ValueType::nullValue) {
                camDevBuilder.addtype((typeJsonValue.asString()));
            } else {
                camDevBuilder.addtype("1");
            }
            auto keyValuesToAdd = camDevBuilder.buildCamDevMap();
            if (keyValuesToAdd.size() > 0) {
@@ -309,6 +311,8 @@
            Json::Value typeJsonValue = requestJsonValue[CamDev_type];
            if (typeJsonValue.type() != Json::ValueType::nullValue) {
                camDevBuilder.addtype((typeJsonValue.asString()));
            } else {
                camDevBuilder.addtype("1");
            }
            responseJsonValue["message"] = "查询成功！";
            responseJsonValue["success"] = "true";
@@ -390,6 +394,8 @@
            Json::Value typeJsonValue = requestJsonValue[CamDev_type];
            if (typeJsonValue.type() != Json::ValueType::nullValue) {
                camDevBuilder.addtype((typeJsonValue.asString()));
            } else {
                camDevBuilder.addtype("1");
            }
            responseJsonValue["message"] = "查询成功！";
            responseJsonValue["success"] = "true";

 QiaoJiaSystem/VideoServer/QiaoJia/DB/DBStruct.h

@@ -61,6 +61,7 @@
        str_brand = "";
        str_reserved = "";
        n_type = -1;
        type = -1;
    }

    int n_id;//自增id
@@ -76,6 +77,7 @@
    QString str_brand;//摄像机品牌
    QString str_reserved;//预留
    int n_type;//预留
    int type;// 0 rtsp, 1 gb28181
};

struct Record_Cam_Chn {

 QiaoJiaSystem/VideoServer/QiaoJia/DB/LDBTool.cpp

@@ -500,7 +500,7 @@
    std::list<Record_Cam_Dev> lst;
    QSqlTableModel pModel(NULL, m_db);
    pModel.setTable("cam_dev");
    pModel.setFilter(QObject::tr("cam_dev_id != '' and cam_dev_id is not null"));
    pModel.setFilter(QObject::tr("cam_dev_id != '' and cam_dev_id is not null and type='0'"));
    pModel.setEditStrategy(QSqlTableModel::OnManualSubmit);//OnManualSubmit OnFieldChange
    pModel.select();