Merge remote-tracking branch 'origin/1.3nsq' into 1.3nsq

pansen

2019-04-22 4d1c2ee860222138fc7932225ea6d91e7483646a

 QiaoJiaSystem/VideoServer/QiaoJia/DB/LDBTool.cpp

@@ -2688,6 +2688,7 @@
    rec.setValue("is_run", sdkRule.nIsRun);
    rec.setValue("img_threshold", sdkRule.nThreshold);
    rec.setValue("img_quality", sdkRule.nQuality);
    rec.setValue("perimeter_obj_type", sdkRule.strPerimeterObjType);

    int rowCount = pModel.rowCount();
    if (rowCount == 0) {
@@ -2734,6 +2735,7 @@
        rule.nAlarmNumUpperLimit = rec.value("alarm_num_upper").toInt();
        rule.nAlarmNumLowerLimit = rec.value("alarm_num_lower").toInt();
        rule.strBroadcast = rec.value("broadcast_area").toString();
        rule.strPerimeterObjType = rec.value("perimeter_obj_type").toString();
        rule.nIsRun = rec.value("is_run").toInt();
        rule.nSdkType = rec.value("sdk_type").toInt();
        ruleMap[rule.nSdkType] = rule;