Merge svn 3352

pansen

2019-01-10 ffa3485e9d36911f3b6aeac7ddbcca61c3e3dde6

 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;