代码格式化及部分bug修改

pansen

2019-03-05 ed223aee5fe5f3b222488549597976f34c679c3d

 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,7 @@
        str_password = "";
        str_brand = "";
        str_reserved = "";
        n_type = -1;
    }

    int n_id;//自增id
@@ -77,13 +75,12 @@
    QString str_password;//摄像机密码
    QString str_brand;//摄像机品牌
    QString str_reserved;//预留
    int n_type;//预留
};

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 +118,7 @@
    QString str_reserved;//预留
};

struct Record_Load_File_info
{
struct Record_Load_File_info {

//    Record_Load_File_info()
//    {
@@ -146,8 +142,7 @@
    QString str_reserved;//预留
};

struct Record_Cut_Video_info
{
struct Record_Cut_Video_info {

//    Record_Cut_Video_info()
//    {
@@ -173,8 +168,7 @@
    QString str_reserved;//预留
};

struct Record_Sdk_Hdl_info
{
struct Record_Sdk_Hdl_info {

//    Record_Sdk_Hdl_info()
//    {
@@ -196,11 +190,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 +213,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 +232,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 +245,7 @@
        n_dev_type = 0;
        str_reserved = "";
        dev_id = "";
        dev_name= "";
        dev_name = "";
    }

    QString str_alarm_ip;//报警服务器ip
@@ -274,16 +262,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 +279,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 +319,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,   //人体