From ffa3485e9d36911f3b6aeac7ddbcca61c3e3dde6 Mon Sep 17 00:00:00 2001
From: pansen <pansen626@sina.com>
Date: 星期四, 10 一月 2019 20:12:15 +0800
Subject: [PATCH] Merge svn 3352
---
QiaoJiaSystem/VideoServer/QiaoJia/DB/LDBTool.h | 20 ++++++++------------
1 files changed, 8 insertions(+), 12 deletions(-)
diff --git a/QiaoJiaSystem/VideoServer/QiaoJia/DB/LDBTool.h b/QiaoJiaSystem/VideoServer/QiaoJia/DB/LDBTool.h
index 2c73a77..2eaf1dd 100644
--- a/QiaoJiaSystem/VideoServer/QiaoJia/DB/LDBTool.h
+++ b/QiaoJiaSystem/VideoServer/QiaoJia/DB/LDBTool.h
@@ -111,9 +111,8 @@
//config
bool updateConfigTableByServerInfo(Record_Config configRec);
- bool updateConfigTableByCutDuration(int n_cut_max_duration);
+ bool updateConfigTableByCutDuration(int n_cut_max_duration,int n_cut_min_duration);
Record_Config searchConfigTableWithinServerInfo(void);
- int searchConfigTableWithinCutDuration(void);
bool updateConfigTableByDevType(int devType);
int searchDevTypeFromConfigTable(void);
//Record_Config searchDevIdFromConfigTable(void);
@@ -121,17 +120,14 @@
//name_key_match
bool insertRecordVedioPath(QString pathKey,QString filePath);
QString searchRecordVedioPathByKey(QString pathKey);
- //perimeter_rule
- bool insertPerimeterRule(ActRule actRule);
- bool updatePerimeterRuleByCamId(ActRule actRule);
- ActRule searchPerimeterRuleByCamId(int camId);
+
//rule_week
- bool insertCameraWeekRule(LActRuleWeekRecord weekRule);
- QVector<LActRuleWeekRecord> searchCameraWeekRuleByCamId(int camId);
- //rule_act
- ActRule searchActRuleByCamId(int camId);
- //crowd_rule
- ActRule searchCrowdRuleByCamId(int camId);
+ bool updateCameraWeekRule(const LActRuleWeekRecord& weekRule);
+ std::vector<LActRuleWeekRecord> searchCameraWeekRuleByCamId(const QString& camId,const int& sdkType);
+
+ //sdk_rule
+ bool updateSdkRule(const SdkRule& sdkRule);
+ SdkRuleMap searchSdkRuleByCamId(const QString& camId);
private:
QSqlDatabase m_db;
QSqlTableModel *m_pModel;
--
Gitblit v1.8.0