From ed223aee5fe5f3b222488549597976f34c679c3d Mon Sep 17 00:00:00 2001
From: pansen <pansen626@sina.com>
Date: 星期二, 05 三月 2019 14:00:47 +0800
Subject: [PATCH] 代码格式化及部分bug修改
---
QiaoJiaSystem/VideoServer/QiaoJia/DB/LDBTool.h | 34 ++++++++++++++++++++++------------
1 files changed, 22 insertions(+), 12 deletions(-)
diff --git a/QiaoJiaSystem/VideoServer/QiaoJia/DB/LDBTool.h b/QiaoJiaSystem/VideoServer/QiaoJia/DB/LDBTool.h
index 2c73a77..eb53d1c 100644
--- a/QiaoJiaSystem/VideoServer/QiaoJia/DB/LDBTool.h
+++ b/QiaoJiaSystem/VideoServer/QiaoJia/DB/LDBTool.h
@@ -50,7 +50,10 @@
bool deleteCamDevandSdkByCamID(QString strCamId);
bool updateCamDevTable(Record_Cam_Dev camRec);
std::list<Record_Cam_Dev> searchCamDevTableAll(void);
+ std::list<Record_Cam_Dev> searchCamDevTableByType(int type);
int searchCamDevNumber(void);
+ bool searchCamDevByCamId(QString strCamId);
+ bool updateCamDevSnapshot(const QString& strIp ,const QString& imgUrl);
//load_file_info
bool insertLoadFileTable(Record_Load_File_info loadfileRec);
@@ -111,9 +114,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,22 +123,30 @@
//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;
QMutex m_mutexVisit;
+public:
+ QSqlDatabase* get_m_db() {
+ return &m_db;
+ }
+ QSqlTableModel* get_m_pModel() {
+ return m_pModel;
+ }
+ QMutex* get_m_mutexVisit() {
+ return &m_mutexVisit;
+ }
+
};
#endif // LDBTOOL_H
--
Gitblit v1.8.0