From cdfb8eb2a956d25d688033be735f4741b2ab58bd Mon Sep 17 00:00:00 2001
From: xuxiuxi <554325746@qq.com>
Date: 星期五, 15 三月 2019 09:48:42 +0800
Subject: [PATCH] Merge branch 'yw.1.2.fixbug' of http://192.168.1.226:10010/r/development/c++ into yw.1.2.fixbug
---
QiaoJiaSystem/VideoServer/QiaoJia/DB/DBStruct.h | 98 +++++++++++++++++++++---------------------------
1 files changed, 43 insertions(+), 55 deletions(-)
diff --git a/QiaoJiaSystem/VideoServer/QiaoJia/DB/DBStruct.h b/QiaoJiaSystem/VideoServer/QiaoJia/DB/DBStruct.h
index 64e0d36..44e7822 100644
--- a/QiaoJiaSystem/VideoServer/QiaoJia/DB/DBStruct.h
+++ b/QiaoJiaSystem/VideoServer/QiaoJia/DB/DBStruct.h
@@ -7,10 +7,9 @@
#include <QDateTime>
#include <QVector>
#include <map>
-struct Record_Storage_Dev
-{
- Record_Storage_Dev()
- {
+
+struct Record_Storage_Dev {
+ Record_Storage_Dev() {
n_id = 0;
str_storage_dev_id = "";
str_dev_name = "";
@@ -44,13 +43,11 @@
QDateTime tim_start_time;//寮�濮嬩笅杞界殑鏂囦欢鐨勬椂闂�
int n_duration;//姣忔涓嬭浇鐨勬椂闂撮暱搴︼紝鍗曚綅锛氬皬鏃�
QString str_brand;//鍝佺墝
- QString str_reserved;//棰勭暀
+ QString str_reserved;//鎴浘鍦板潃
};
-struct Record_Cam_Dev
-{
- Record_Cam_Dev()
- {
+struct Record_Cam_Dev {
+ Record_Cam_Dev() {
n_id = 0;
str_name = "";
str_addr = "";
@@ -63,6 +60,8 @@
str_password = "";
str_brand = "";
str_reserved = "";
+ n_type = -1;
+ type = -1;
}
int n_id;//鑷id
@@ -77,13 +76,13 @@
QString str_password;//鎽勫儚鏈哄瘑鐮�
QString str_brand;//鎽勫儚鏈哄搧鐗�
QString str_reserved;//棰勭暀
+ int n_type;//棰勭暀
+ int type;// 0 rtsp, 1 gb28181
};
-struct Record_Cam_Chn
-{
+struct Record_Cam_Chn {
- Record_Cam_Chn()
- {
+ Record_Cam_Chn() {
n_id = 0;
str_storage_dev_id = "";
n_chn = 0;
@@ -121,8 +120,7 @@
QString str_reserved;//棰勭暀
};
-struct Record_Load_File_info
-{
+struct Record_Load_File_info {
// Record_Load_File_info()
// {
@@ -146,8 +144,7 @@
QString str_reserved;//棰勭暀
};
-struct Record_Cut_Video_info
-{
+struct Record_Cut_Video_info {
// Record_Cut_Video_info()
// {
@@ -173,8 +170,7 @@
QString str_reserved;//棰勭暀
};
-struct Record_Sdk_Hdl_info
-{
+struct Record_Sdk_Hdl_info {
// Record_Sdk_Hdl_info()
// {
@@ -196,11 +192,9 @@
QString str_reserved;//棰勭暀
};
-struct Record_Chn_Sdk
-{
+struct Record_Chn_Sdk {
- Record_Chn_Sdk()
- {
+ Record_Chn_Sdk() {
n_id = 0;
str_storage_dev_id = "";
n_chn = 0;
@@ -221,11 +215,9 @@
QString str_reserved;//棰勭暀
};
-struct Record_Cam_Sdk
-{
+struct Record_Cam_Sdk {
- Record_Cam_Sdk()
- {
+ Record_Cam_Sdk() {
n_id = 0;
str_cam_dev_id = "";
str_sdks = "";
@@ -242,10 +234,8 @@
QString str_reserved;//棰勭暀
};
-struct Record_Config
-{
- Record_Config()
- {
+struct Record_Config {
+ Record_Config() {
str_alarm_ip = "";
n_alarm_port = 0;
str_web_pic_ip = "";
@@ -257,7 +247,7 @@
n_dev_type = 0;
str_reserved = "";
dev_id = "";
- dev_name= "";
+ dev_name = "";
}
QString str_alarm_ip;//鎶ヨ鏈嶅姟鍣╥p
@@ -274,16 +264,15 @@
QString dev_name;
};
-struct LActRuleWeekRecord
-{
- LActRuleWeekRecord()
- {
- m_strCamId="";
- m_nSdkType=0;
+struct LActRuleWeekRecord {
+ LActRuleWeekRecord() {
+ m_strCamId = "";
+ m_nSdkType = 0;
m_nType = 0;
m_strBegin = "";
m_strEnd = "";
}
+
QString m_strCamId;
int m_nSdkType;
int m_nType; //鍛ㄥ嚑
@@ -292,27 +281,26 @@
};
-struct SdkRule
-{
- SdkRule()
- {
- nIsRun=0;
- nSdkType = 0 ;
+struct SdkRule {
+ SdkRule() {
+ nIsRun = 0;
+ nSdkType = 0;
strCamId = "";
strAreas = "";
strLine = "";
strImageUrl = "";
nTriggerTolerance = 0;
- nTriggerDelay=0;
- nQuality=0;
- nThreshold=0;
+ nTriggerDelay = 0;
+ nQuality = 0;
+ nThreshold = 0;
nAlarmNumUpperLimit = 0;
nAlarmNumLowerLimit = 0;
- fSensitivity=0;
- strExAreas="";
- strLine="";
- strAddr="";
+ fSensitivity = 0;
+ strExAreas = "";
+ strLine = "";
+ strAddr = "";
}
+
int nSdkType;
QString strCamId;
QString strAreas; //鐩戞祴鍖哄煙
@@ -333,10 +321,10 @@
std::vector<LActRuleWeekRecord> weekRuleVec;
};
-typedef std::map<int,SdkRule> SdkRuleMap;
-enum SdkType
-{
- SdkTypeStart=0,
+
+typedef std::map<int, SdkRule> SdkRuleMap;
+enum SdkType {
+ SdkTypeStart = 0,
FaceSdk,
CarSdk,
YoloSdk, //浜轰綋
--
Gitblit v1.8.0