From c64a4f19a0a41b62917eb1dc8b0789c9ddf6baab Mon Sep 17 00:00:00 2001
From: pansen <pansen626@sina.com>
Date: 星期五, 15 三月 2019 11:03:50 +0800
Subject: [PATCH] Merge branch 'yw.1.2.fixbug' of ssh://192.168.1.226:29418/development/c++ into yw.1.2
---
QiaoJiaSystem/DataManagerServer/http_configserver.cpp | 1 +
QiaoJiaSystem/VideoServer/QiaoJia/DB/LDBTool.cpp | 3 ++-
2 files changed, 3 insertions(+), 1 deletions(-)
diff --git a/QiaoJiaSystem/DataManagerServer/http_configserver.cpp b/QiaoJiaSystem/DataManagerServer/http_configserver.cpp
index 5193036..07d6de6 100644
--- a/QiaoJiaSystem/DataManagerServer/http_configserver.cpp
+++ b/QiaoJiaSystem/DataManagerServer/http_configserver.cpp
@@ -1003,6 +1003,7 @@
elem["str_latitude"] = iter->str_latitude.toStdString();
elem["str_ip"] = iter->str_ip.toStdString();
elem["n_port"] = iter->n_port;
+ elem["type"] = iter->type;
elem["str_username"] = iter->str_username.toStdString();
elem["str_password"] = iter->str_password.toStdString();
elem["str_brand"] = iter->str_brand.toStdString();
diff --git a/QiaoJiaSystem/VideoServer/QiaoJia/DB/LDBTool.cpp b/QiaoJiaSystem/VideoServer/QiaoJia/DB/LDBTool.cpp
index 3e4f741..f1a6d89 100644
--- a/QiaoJiaSystem/VideoServer/QiaoJia/DB/LDBTool.cpp
+++ b/QiaoJiaSystem/VideoServer/QiaoJia/DB/LDBTool.cpp
@@ -501,7 +501,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"));
pModel.setEditStrategy(QSqlTableModel::OnManualSubmit);//OnManualSubmit OnFieldChange
pModel.select();
@@ -511,6 +511,7 @@
Record_Cam_Dev lChannelRec;
QSqlRecord rec = pModel.record(i);
lChannelRec.n_id = rec.value("id").toInt();
+ lChannelRec.type = rec.value("type").toInt();
lChannelRec.str_cam_dev_id = rec.value("cam_dev_id").toString();
lChannelRec.str_name = rec.value("name").toString();
lChannelRec.str_addr = rec.value("addr").toString();
--
Gitblit v1.8.0