Merge branch 'yw.1.2.fixbug' of http://192.168.1.226:10010/r/development/c+...

xuxiuxi

2019-03-09 8d360f16e340015a18efa6783a792686b443c076

 syncDBTool/SyncDB.hpp

@@ -21,6 +21,8 @@
        update_time,
        img,
        idcard,
        enable,
        monLevel,
        evEnd
    };

@@ -36,6 +38,8 @@
        map_Fea_InfoString2Values["update_time"] = Feature_InfoStringValue::update_time;
        map_Fea_InfoString2Values["img"] = Feature_InfoStringValue::img;
        map_Fea_InfoString2Values["idcard"] = Feature_InfoStringValue::idcard;
        map_Fea_InfoString2Values["enable"] = Feature_InfoStringValue::enable;
        map_Fea_InfoString2Values["monitorLevel"] = Feature_InfoStringValue::monLevel;
        map_Fea_InfoString2Values["end"] = evEnd;
    }

@@ -81,6 +85,12 @@
                    case Feature_InfoStringValue::idcard:
                        idcard = value;
                        break;
                    case Feature_InfoStringValue::enable:
                        enable = value;
                        break;
                    case Feature_InfoStringValue::monLevel:
                        monLevel = value;
                        break;
                    default:
                        ERR(key << " is an invalid string. s_mapStringValues now contains "
                                << map_Fea_InfoString2Values.size() << " entries.");
@@ -102,6 +112,9 @@
        std::string update_time;
        std::string img;
        std::string idcard;
        std::string enable;
        std::string monLevel;


//        value is a atom: atomSize:19, atomValue:test@192.168.50.216
//        value is a list:2018-08-08 20:17:11
@@ -271,6 +284,9 @@
        tab_uuid,
        tab_startTime,
        tab_endTime,
        tab_uploadFlag,
        tab_cmpThreshold,
        tab_enabled,
        tab_evEnd
    };

@@ -290,6 +306,9 @@
        map_Tab_InfoString2Values["uuid"] = Table_InfoStringValue::tab_uuid;
        map_Tab_InfoString2Values["startTime"] = Table_InfoStringValue::tab_startTime;
        map_Tab_InfoString2Values["endTime"] = Table_InfoStringValue::tab_endTime;
        map_Tab_InfoString2Values["uploadFlag"] = Table_InfoStringValue::tab_uploadFlag;
        map_Tab_InfoString2Values["cmpThreshold"] = Table_InfoStringValue::tab_cmpThreshold;
        map_Tab_InfoString2Values["enabled"] = Table_InfoStringValue::tab_enabled;
        map_Tab_InfoString2Values["end"] = Table_InfoStringValue::tab_evEnd;
    }

@@ -299,8 +318,8 @@
    struct Table_Info {
    public:
        Table_Info() :
            create_by(""), create_time(""), del_flag(""), tableDesc(""), tableName(""), tableType(""),
            update_time(""), uuid(""), bwType(""), startTime(""), endTime("") {
            create_by(""), create_time(""), del_flag(""), tableDesc(""), tableName(""), tableType(""), update_time(""),
            uuid(""), bwType(""), startTime(""), endTime(""), uploadFlag(""), cmpThreshold(""), enabled("") {
//            Initialize();
        }

@@ -351,6 +370,15 @@
                    case Table_InfoStringValue::tab_endTime:
                        endTime = value;
                        break;
                    case Table_InfoStringValue::tab_uploadFlag:
                        uploadFlag = value;
                        break;
                    case Table_InfoStringValue::tab_cmpThreshold:
                        cmpThreshold = value;
                        break;
                    case Table_InfoStringValue::tab_enabled:
                        enabled = value;
                        break;
                    default:
                        ERR(key << " is an invalid string. s_mapStringValues now contains "
                                << map_Fea_InfoString2Values.size() << " entries.");
@@ -376,6 +404,9 @@
        std::string bwType;
        std::string startTime;
        std::string endTime;
        std::string uploadFlag;
        std::string cmpThreshold;
        std::string enabled;

    private:
    };