VideoToImageMulth和VideoAnalyFromHC支持RPC的端口设置

miyanhui

2019-02-18 c8e6fb13202d18e3c1ada38578d2a5cc3c184198

 QiaoJiaSystem/DataManagerServer/http_configserver.cpp

@@ -2078,6 +2078,12 @@
                    img_str.append(fdfsClient.fastFds->getIp() + "/").append(img_tmp);
                    img_url.swap(img_str);
                }
            } else {
                std::string img_str = "http://";
                if (fdfsClient.fastFds != nullptr) {
                    img_str.append(fdfsClient.fastFds->getIp() + "/").append(img_url);
                    img_url.swap(img_str);
                }
            }

            auto t_results = m_curlDownloadImg.download_jpeg(const_cast<char *>(img_url.c_str()));
@@ -2528,7 +2534,7 @@
            std::string picDate = value["picDate"].asString();
            std::string imgKey = value["imgKey"].asString();
            //兼容旧版本
            if(imgKey=="undefined")
            if(imgKey=="undefined" || imgKey.empty())
            {
                return getAlarmImageByPicDateAndDevId(picDate,devId,response);
            }   
@@ -2554,7 +2560,7 @@



std::string devHttpServer_c::getAlarmImageByImageKeyAndDevId(const std::string& devId,const std::string& imgKey,
std::string devHttpServer_c::getAlarmImageByImageKeyAndDevId(const std::string& imgKey,const std::string& devId,
                                                        PResponse &response)  {
    try {
        if (!devId.empty() && !imgKey.empty()) {
@@ -2644,7 +2650,7 @@
        std::string path;

        //兼容旧版本
        if(imgKey=="undefined")
        if(imgKey=="undefined"||imgKey.empty())
        {
            qint64 sub;
            path = getVideoPathByPicDate(picDate,devId,sub);
@@ -2825,7 +2831,7 @@
        auto videoParseResult = VideoName_s_t::fromString(item);
        if (videoParseResult.Valid()) {
            if (videoParseResult.m_startFrameId <= imgSt.m_frameId &&
                imgSt.m_frameId < videoParseResult.m_endFrameId) {
                imgSt.m_frameId <= videoParseResult.m_endFrameId) {
                auto imgTm = AppUtil::ParseFromHypenTimeStr(imgSt.m_timeStamp);
                auto videoTm = AppUtil::ParseFromHypenTimeStr(videoParseResult.m_timeStamp);
                if (AppUtil::IsRightAfterLeft(imgTm, videoTm)) {
@@ -2858,10 +2864,10 @@
}

//新的根据图片名称获取路径的方法
std::string devHttpServer_c::getVideoPathByImgKey(const std::string &strImageName, const std::string &camId)
std::string devHttpServer_c::getVideoPathByImgKey(const std::string &imgKey, const std::string &camId)
{
    INFO("GetVideoFor: "<<strImageName<<" CamID:"<<camId);
    ImageName_s_t imgSt= ImageName_s_t::fromString(strImageName);
    INFO("GetVideoFor: "<<imgKey<<" CamID:"<<camId);
    ImageName_s_t imgSt= ImageName_s_t::fromString(imgKey);

    struct tm imgTime = AppUtil::ParseFromHypenTimeStr(imgSt.m_timeStamp);
    char curFolder[128]={0};
@@ -2871,7 +2877,7 @@
                                  imgTime.tm_year+1900,imgTime.tm_mon+1,imgTime.tm_mday,imgTime.tm_hour);
    std::string t_FilePath = appConfig.getStringProperty("cutPath");
    std::string videoPath = t_FilePath+"/"+camId+"/"+std::string(curFolder);
    return GetVideoNameByImgKey(strImageName,videoPath);
    return GetVideoNameByImgKey(imgKey,videoPath);
}