pansen
2019-04-03 f4bedfe12a099da62cc1e8b0eca67ee2bad2cc4a
VideoAnalysFromHC 中修改sdkrule的处理等同于编辑摄像机
3个文件已修改
20 ■■■■ 已修改文件
QiaoJiaSystem/DataManagerServer/http_configserver.cpp 16 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
QiaoJiaSystem/VideoAnalysFromHC/RtspAnalysElement.cpp 2 ●●● 补丁 | 查看 | 原始文档 | blame | 历史
QiaoJiaSystem/VideoToImageMulth/RtspAnalysManager.cpp 2 ●●● 补丁 | 查看 | 原始文档 | blame | 历史
QiaoJiaSystem/DataManagerServer/http_configserver.cpp
@@ -3309,11 +3309,19 @@
        if (db_c.updateSdkRule(rule)) {
//            if(rule.nIsRun==1)
            killVideoAnalysFromHCApp();
            sleep(1);
            runAllApp();
//            killVideoAnalysFromHCApp();
//            sleep(1);
//            runAllApp();
            {
                std::string topic = "VideoAnalysFromHC";
                Json::Value json_cfg;
                json_cfg["editSdkRule"] = content;
                std::string msg = json_cfg.toStyledString();
                DBG("msg:" << msg);
                usleep(1000);
                nsqMsgProducer->Publish(topic, (void *) (&msg));
            }
            return "{\"ret_status\": \"ok_ack\"}";
        } else {
            return "{\"ret_status\":\"内容有误,请检查!\"}";
QiaoJiaSystem/VideoAnalysFromHC/RtspAnalysElement.cpp
@@ -92,7 +92,7 @@
        for (auto itor_json = value.begin(); itor_json != itor_json_end; ++itor_json) {
            //#todo 使用策略模式?发送端多个指令累积后发送?
            if (itor_json->isString() && reader.parse(itor_json->asString(), cfg_val)) {
                if (itor_json.name() == "cam_edit") {
                if (itor_json.name() == "cam_edit" || itor_json.name() == "editSdkRule") {
                    string cam_idx = cfg_val["str_cam_dev_id"].asString();
                    if (pthis->controllers.find(cam_idx) != pthis->controllers.end()) {
                        if (pthis->m_GB28181_Enable) {
QiaoJiaSystem/VideoToImageMulth/RtspAnalysManager.cpp
@@ -78,7 +78,7 @@
                            item.second->SetVideoMinMaxSeconds(cut_min_duration, cut_max_duration);
                        }
                    }
                } else if (itor_json.name() == "cam_edit") {
                } else if (itor_json.name() == "cam_edit" ) {
                    string cam_idx = cfg_val["str_cam_dev_id"].asString();
                    if (pthis->m_GB28181_Enable) {
                        if (pthis->m_controllers_videoCapElem.find(cam_idx) !=