From 1f16245b4b4fc36c519e7afc9fd9cf828f25199d Mon Sep 17 00:00:00 2001
From: chenshijun <csj_sky@126.com>
Date: 星期四, 28 二月 2019 20:06:35 +0800
Subject: [PATCH] 修改新增摄像机获取底图问题 解码两次问题
---
QiaoJiaSystem/VideoServer/QiaoJia/DB/LDBTool.cpp | 60 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++----
1 files changed, 56 insertions(+), 4 deletions(-)
diff --git a/QiaoJiaSystem/VideoServer/QiaoJia/DB/LDBTool.cpp b/QiaoJiaSystem/VideoServer/QiaoJia/DB/LDBTool.cpp
index acabafb..8b8a3e1 100644
--- a/QiaoJiaSystem/VideoServer/QiaoJia/DB/LDBTool.cpp
+++ b/QiaoJiaSystem/VideoServer/QiaoJia/DB/LDBTool.cpp
@@ -356,11 +356,23 @@
pModel_cam.setEditStrategy(QSqlTableModel::OnManualSubmit);//OnManualSubmit OnFieldChange
pModel_cam.select();
+// QSqlTableModel pModel_sdk(NULL, m_db);
+// pModel_sdk.setTable("cam_sdk");
+// pModel_sdk.setFilter(QObject::tr("cam_dev_id = '%1'").arg(strCamId));
+// pModel_sdk.setEditStrategy(QSqlTableModel::OnManualSubmit);//OnManualSubmit OnFieldChange
+// pModel_sdk.select();
+
QSqlTableModel pModel_sdk(NULL, m_db);
- pModel_sdk.setTable("cam_sdk");
- pModel_sdk.setFilter(QObject::tr("cam_dev_id = '%1'").arg(strCamId));
+ pModel_sdk.setTable("sdk_rule");
+ pModel_sdk.setFilter(QObject::tr("cam_id = '%1'").arg(strCamId));
pModel_sdk.setEditStrategy(QSqlTableModel::OnManualSubmit);//OnManualSubmit OnFieldChange
pModel_sdk.select();
+
+ QSqlTableModel pModel_week(NULL, m_db);
+ pModel_week.setTable("rule_week");
+ pModel_week.setFilter(QObject::tr("camera_id = '%1'").arg(strCamId));
+ pModel_week.setEditStrategy(QSqlTableModel::OnManualSubmit);//OnManualSubmit OnFieldChange
+ pModel_week.select();
int rowCount_cam = pModel_cam.rowCount();
if (rowCount_cam >= 1) {
@@ -376,17 +388,25 @@
}
}
+ int rowCount_week = pModel_week.rowCount();
+ if (rowCount_week >= 1) {
+ for (int i = 0; i < rowCount_week; i++) {
+ pModel_week.removeRow(i);//TODO
+ }
+ }
+
m_db.transaction();//寮�濮嬩簨鍔℃搷浣�
if (pModel_cam.submitAll() && \
- pModel_sdk.submitAll()) {
+ pModel_sdk.submitAll() && pModel_week.submitAll()) {
m_db.commit();//鎻愪氦
return true;
} else {
m_db.rollback();//鍥炴粴
ERR("deleteLDeviceTable err ,Database Error: " \
<< pModel_cam.lastError().text().toStdString() \
- << pModel_sdk.lastError().text().toStdString());
+ << pModel_sdk.lastError().text().toStdString() \
+ << pModel_week.lastError().text().toStdString() );
// QMessageBox::warning(NULL,QObject::tr("deleteLDeviceTable"),QObject::tr("Database Error: %1").arg(pModel.lastError().text()));
return false;
}
@@ -433,7 +453,39 @@
return false;
}
}
+bool LDBTool::updateCamDevSnapshot(const QString& strIp,const QString& imgUrl)
+{
+ QMutexLocker mutexLocker(&m_mutexVisit);//TODO
+ QSqlTableModel pModel(NULL, m_db);
+ pModel.setTable("cam_dev");
+ pModel.setFilter(
+ QObject::tr("ip = '%1'").arg(strIp));
+ pModel.setEditStrategy(QSqlTableModel::OnManualSubmit);//OnManualSubmit OnFieldChange
+ pModel.select();
+ QSqlRecord rec = pModel.record(0);
+ rec.setValue("reserved", imgUrl);
+
+ int rowCount = pModel.rowCount();
+ if (rowCount > 0)
+ {
+ pModel.setRecord(0, rec);//TODO
+ }
+
+ m_db.transaction();//寮�濮嬩簨鍔℃搷浣�
+
+ if (pModel.submitAll())
+ {
+ m_db.commit();//鎻愪氦
+ return true;
+ }
+ else
+ {
+ m_db.rollback();//鍥炴粴
+ ERR("updateCamDevSnapshot err ,Database Error: " << pModel.lastError().text().toStdString());
+ return false;
+ }
+}
int LDBTool::searchCamDevNumber(void) {
QSqlTableModel pModel(NULL, m_db);
pModel.setTable("cam_dev");
--
Gitblit v1.8.0