From 51a5443baed67eed39dc26a0f8bff546650ab6d8 Mon Sep 17 00:00:00 2001 From: pans <pansen626@sina.com> Date: 星期二, 16 四月 2019 17:12:51 +0800 Subject: [PATCH] 添加注释 --- QiaoJiaSystem/DataManagerServer/http_configserver.cpp | 8 ++++++++ 1 files changed, 8 insertions(+), 0 deletions(-) diff --git a/QiaoJiaSystem/DataManagerServer/http_configserver.cpp b/QiaoJiaSystem/DataManagerServer/http_configserver.cpp index e6b8e72..d387046 100644 --- a/QiaoJiaSystem/DataManagerServer/http_configserver.cpp +++ b/QiaoJiaSystem/DataManagerServer/http_configserver.cpp @@ -2140,9 +2140,12 @@ // auto resType = erlangDbTool->findAllTypeInfo(); string json = "["; for (auto &item : resDB) { + //-------------------maybe delete ?------------------------ if (item.second.tableName.find("lt_") == 0) { continue; } + //-------------------maybe delete end---------------------- + string subJson = "{ "; subJson.append("\"uuid\":\"" + item.second.uuid + "\","); subJson.append("\"tableName\":\"" + item.second.tableName + "\","); @@ -3333,6 +3336,10 @@ 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 +3416,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; -- Gitblit v1.8.0