From a89689b92b07cf1830ad8b46521eda92e7f927c0 Mon Sep 17 00:00:00 2001
From: pansen <pansen626@sina.com>
Date: 星期三, 30 一月 2019 16:37:45 +0800
Subject: [PATCH] 修改bug

---
 QiaoJiaSystem/VideoServer/QiaoJia/DB/DBStruct.h |   72 +++++++++++++++++++++++++-----------
 1 files changed, 50 insertions(+), 22 deletions(-)

diff --git a/QiaoJiaSystem/VideoServer/QiaoJia/DB/DBStruct.h b/QiaoJiaSystem/VideoServer/QiaoJia/DB/DBStruct.h
index 5de036a..684890d 100644
--- a/QiaoJiaSystem/VideoServer/QiaoJia/DB/DBStruct.h
+++ b/QiaoJiaSystem/VideoServer/QiaoJia/DB/DBStruct.h
@@ -1,11 +1,12 @@
 #ifndef DBCONNECTSTRUCT
 #define DBCONNECTSTRUCT
 
-//#include <vector>
+
 //#include <QImage>
 #include <QString>
 #include <QDateTime>
 #include <QVector>
+#include <map>
 struct Record_Storage_Dev
 {
     Record_Storage_Dev()
@@ -43,7 +44,7 @@
     QDateTime tim_start_time;//寮�濮嬩笅杞界殑鏂囦欢鐨勬椂闂�
     int n_duration;//姣忔涓嬭浇鐨勬椂闂撮暱搴︼紝鍗曚綅锛氬皬鏃�
     QString str_brand;//鍝佺墝
-    QString str_reserved;//棰勭暀
+    QString str_reserved;//鎴浘鍦板潃
 };
 
 struct Record_Cam_Dev
@@ -251,7 +252,8 @@
         n_web_pic_port = 0;
         str_es_pic_ip = "";
         n_es_pic_port = 0;
-        n_cut_max_duration = 0;
+        n_cut_max_duration = 20;
+        n_cut_min_duration = 5;
         n_dev_type = 0;
         str_reserved = "";
         dev_id = "";
@@ -265,6 +267,7 @@
     QString str_es_pic_ip;//ES绔浘鐗囨湇鍔″櫒ip
     int n_es_pic_port;//ES绔浘鐗囨湇鍔″櫒绔彛
     int n_cut_max_duration;//瑁佸壀瑙嗛鏈�闀�
+    int n_cut_min_duration;//瑁佸壀瑙嗛鏈�duan
     int n_dev_type;//0:no dev; 1:storage; 2:camera
     QString str_reserved;//棰勭暀
     QString dev_id;
@@ -275,50 +278,75 @@
 {
     LActRuleWeekRecord()
     {
-        m_nCamId=0;
+        m_strCamId="";
+        m_nSdkType=0;
         m_nType = 0;
         m_strBegin = "";
         m_strEnd = "";
     }
-    int m_nCamId;
+    QString m_strCamId;
+    int m_nSdkType;
     int m_nType; //鍛ㄥ嚑
     QString m_strBegin;
     QString m_strEnd;
 };
-struct ActRule
+
+
+struct SdkRule
 {
-    ActRule()
+    SdkRule()
     {
-        nCamId = 0;
+        nIsRun=0;
+        nSdkType = 0 ;
+        strCamId = "";
         strAreas = "";
         strLine = "";
         strImageUrl = "";
-        nTriggertolerance = 0;
+        nTriggerTolerance = 0;
         nTriggerDelay=0;
-        fSensitivity = 0.5;
-        nAlarmPeopleNum = 0;
+        nQuality=0;
+        nThreshold=0;
+        nAlarmNumUpperLimit = 0;
+        nAlarmNumLowerLimit = 0;
+        fSensitivity=0;
         strExAreas="";
         strLine="";
+        strAddr="";
     }
-    int nCamId;
+    int nSdkType;
+    QString strCamId;
     QString strAreas; //鐩戞祴鍖哄煙
     QString strExAreas;
     QString strLine; //鍒嗗壊绾�
     QString strExLine;
     QString strImageUrl; //鍒掑尯鍩熺殑鍥剧墖璺緞
-    int nTriggertolerance;
+    QString strBroadcast;
+    QString strAddr;
+    int nTriggerTolerance;
     int nTriggerDelay; //寤惰繜鏃堕棿锛堢锛�
-    float fSensitivity;//鐏垫晱搴�
-    int nAlarmPeopleNum; //鎶ヨ浜烘暟锛堜汉鍛樻嫢鎸わ級
+    int nQuality;
+    int nThreshold;//闃堝��
+    float fSensitivity;
+    int nAlarmNumUpperLimit; //鎶ヨ浜烘暟锛堜汉鍛樻嫢鎸わ級
+    int nAlarmNumLowerLimit;
+    int nIsRun;
+
+    std::vector<LActRuleWeekRecord> weekRuleVec;
 };
-struct RuleCfg
+typedef std::map<int,SdkRule> SdkRuleMap;
+enum SdkType
 {
-
-    QVector<LActRuleWeekRecord> weekRuleVec;
-    ActRule actRule;
-    std::string strCamId;
-    std::string strRtsp;
-    std::string strAdrr;
+    SdkTypeStart=0,
+    FaceSdk,
+    CarSdk,
+    YoloSdk,   //浜轰綋
+    PerimeterSdk,
+    CrowdSdk,  //浜哄憳鎷ユ尋
+    KeepRightSdk,
+    PerHubSdk,    //浜哄憳寮傚父7
+    PerStaticSdk,  //涓綋闈欐8
+    SdkTypeEnd
 
 };
+
 #endif // DBCONNECTSTRUCT

--
Gitblit v1.8.0