From 2b1a3988c9fd35c39e3e43d0382d65a13c45efee Mon Sep 17 00:00:00 2001 From: xuxiuxi <554325746@qq.com> Date: 星期四, 14 三月 2019 10:38:27 +0800 Subject: [PATCH] Merge branch 'yw.1.2.fixbug' of http://192.168.1.226:10010/r/development/c++ into yw.1.2.fixbug --- QiaoJiaSystem/DataManagerServer/http_configserver.cpp | 12 ++++++++++++ 1 files changed, 12 insertions(+), 0 deletions(-) diff --git a/QiaoJiaSystem/DataManagerServer/http_configserver.cpp b/QiaoJiaSystem/DataManagerServer/http_configserver.cpp index 0e6af41..cf0298a 100644 --- a/QiaoJiaSystem/DataManagerServer/http_configserver.cpp +++ b/QiaoJiaSystem/DataManagerServer/http_configserver.cpp @@ -1008,6 +1008,18 @@ elem["str_brand"] = iter->str_brand.toStdString(); elem["str_reserved"] = iter->str_reserved.toStdString(); + SdkRuleMap ruleMap = db_c.searchSdkRuleByCamId(iter->str_cam_dev_id); + + int count = ruleMap.size(); + elem["nSdkTypes"] = Json::arrayValue; + + if (count > 0) { + for (auto rule:ruleMap) { + if (rule.second.nIsRun == 1) { + elem["nSdkTypes"].append(rule.second.nSdkType); + } + } + } // Record_Cam_Sdk rec_sdk = db_c.searchCamSdkTableByCamId(iter->str_cam_dev_id); // elem["str_sdks"] = rec_sdk.str_sdks.toStdString(); // elem["str_det_thr"] = rec_sdk.str_det_thr.toStdString(); -- Gitblit v1.8.0