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

chenshijun

2019-04-15 ad8ee0872802ba5d0194458bf215a6cc89f4d0d0

 QiaoJiaSystem/DataManagerServer/http_configserver.cpp

@@ -3333,6 +3333,11 @@
        rule.strExAreas = value["strExAreas"].asCString();
        rule.strLine = value["strLine"].asCString();
        rule.strExLine = value["strExLine"].asCString();

        if(!value["strPerimeterObjType"].empty())
        {
            rule.strPerimeterObjType = value["strPerimeterObjType"].asCString();
        }
        if (rule.strCamId.isEmpty()) {
            return "{\"ret_status\":\"内容有误，请检查！\"}";
        }
@@ -3409,6 +3414,7 @@
                obj["strExAreas"] = rule.second.strExAreas.toStdString();
                obj["strLine"] = rule.second.strLine.toStdString();
                obj["strExLine"] = rule.second.strExLine.toStdString();
                obj["strPerimeterObjType"] = rule.second.strPerimeterObjType.toStdString();
                Json::Value weekRuleArray;