修改刷新底图的ip变量重名问题。

pansen

2019-03-15 d883ec2891210b7e9361557b11e435c892528901

 QiaoJiaSystem/DataManagerServer/http_configserver.cpp

@@ -22,6 +22,14 @@
#include <time.h>
#include <dirent.h>
#include "basic/pipe_element/ffmpeg/basic_struct_for_video_image.h"

#include "vss/controller/VssDevTblController.h"
#include "vss/controller/VssChannelTblController.h"
#include "vss/controller/VssDomainUnitTblController.h"
#include "vss/controller/VssLocalSettingTblController.h"
#include "vss/controller/VssUpperSvrTblController.h"
#include "vss/controller/CamDevController.h"

using namespace std;

devHttpServer_c::devHttpServer_c()
@@ -70,7 +78,7 @@
    m_batch = strDevId.substr(5, 2);
    m_SerialNumber = strDevId.substr(7, 2);

    DBG("DevID: "<<strDevId<<" Batch: "<<m_batch <<" SerNum: "<<m_SerialNumber);
    DBG("DevID: " << strDevId << " Batch: " << m_batch << " SerNum: " << m_SerialNumber);

    fdfsClient.rwLock.wrlock();
    fdfsClient.fastFds = new FastFds("WebFDSClient.conf");
@@ -242,6 +250,16 @@
                                         std::placeholders::_3, std::placeholders::_4));


    BaseDao::initConnection();
    BaseSqliteDao::setLDBTool(&db_c);
    VssDevTblController::instance()->registerHttpServices(_HttpSrvRetRecieve);
    VssChannelTblController::instance()->registerHttpServices(_HttpSrvRetRecieve);
    VssDomainUnitTblController::instance()->registerHttpServices(_HttpSrvRetRecieve);
    VssLocalSettingTblController::instance()->registerHttpServices(_HttpSrvRetRecieve);
    CamDevController::instance()->registerHttpServices(_HttpSrvRetRecieve);
    VssUpperSvrTblController::instance()->registerHttpServices(_HttpSrvRetRecieve);


    _HttpSrvRetRecieve.start();
    _HttpSrvRetRecieve.waitForShutDown();
}
@@ -397,7 +415,7 @@
    /*sdk login*/
    ulRet = IMOS_MW_Login(username, passwd, ip, 0, szUserID);
    if (ERR_COMMON_SUCCEED != ulRet) {
         (VOID) IMOS_MW_Cleanup();
        (VOID) IMOS_MW_Cleanup();
        printf("Login error ulRet[%lu]", ulRet);
        return false;
    }
@@ -951,8 +969,10 @@

void devHttpServer_c::killVideoAnalysFromHCApp() const {
    string local_passwd = appConfig.getStringProperty("localPasswd");
    string cmd_kill = "echo \"" + local_passwd + "\" | sudo -S pkill -9 VideoAnalys";
    system(cmd_kill.c_str());
    string cmd_kill_VideoAnalys = "echo \"" + local_passwd + "\" | sudo -S pkill -9 VideoAnalys";
    system(cmd_kill_VideoAnalys.c_str());
    string cmd_kill_VideoToIma = "echo \"" + local_passwd + "\" | sudo -S pkill -9 VideoToIma";
    system(cmd_kill_VideoToIma.c_str());
    DBG("system(\"sudo -S pkill -9 VideoAnalysFromHC\");");
}

@@ -983,11 +1003,24 @@
        elem["str_latitude"] = iter->str_latitude.toStdString();
        elem["str_ip"] = iter->str_ip.toStdString();
        elem["n_port"] = iter->n_port;
        elem["type"] = iter->type;
        elem["str_username"] = iter->str_username.toStdString();
        elem["str_password"] = iter->str_password.toStdString();
        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();
@@ -1002,8 +1035,10 @@
    std::string out = value.size() > 0 ? value.toStyledString() : "[]";
    return out;
}

#define ADD_CAMERA 0
#define EDIT_CAMERA 1

//编辑摄像机
std::string devHttpServer_c::cam_edit(std::string ip, unsigned int port, std::string content, PResponse &response) {
    DBG("ip:" << ip << "; port:" << port);
@@ -1015,7 +1050,7 @@
    Record_Cam_Dev rec;
    Record_Cam_Sdk rec_sdk_old;
    Record_Cam_Sdk rec_sdk;
    int type=-1;
    int type = -1;
    int dev_type = db_c.searchDevTypeFromConfigTable();
    if (DEV_STORAGE == dev_type) {
        return "{\"ret_status\": \"内容有误，请检查！\"}";
@@ -1030,7 +1065,7 @@
        if ((!ret) || (serialnumber[0] == 0)) {
            return "{\"ret_status\": \"内容有误，请检查！\"}";
        }

        rec.type = 0;
        rec.str_cam_dev_id = QString::fromLatin1((const char *) serialnumber);//摄像机id cam_mac
        rec.str_name = QString::fromStdString(value["str_name"].asString());
        rec.str_addr = QString::fromStdString(value["str_addr"].asString());
@@ -1041,45 +1076,35 @@
        rec.str_username = QString::fromStdString(value["str_username"].asString());
        rec.str_password = QString::fromStdString(value["str_password"].asString());
        rec.str_brand = QString::fromStdString(value["str_brand"].asString());
        type=value["n_type"].asInt();
        rec.str_reserved = QString::fromStdString(value["str_reserved"].asString());
        type = value["n_type"].asInt();
//        rec_sdk_old = db_c.searchCamSdkTableByCamId(rec.str_cam_dev_id);

//        rec_sdk.str_cam_dev_id = rec.str_cam_dev_id;
//        rec_sdk.str_sdks = QString::fromStdString(value["str_sdks"].asString());
//        rec_sdk.str_det_thr = QString::fromStdString(value["str_det_thr"].asString());
//        rec_sdk.str_cmp_thr = QString::fromStdString(value["str_cmp_thr"].asString());
        bool is_exist=db_c.searchCamDevByCamId(rec.str_cam_dev_id);
        if(ADD_CAMERA == type )
        {
           if(is_exist)
           {
               return "{\"ret_status\": \"请勿重复添加!\"}";
           }
           else
           {
               ret =db_c.insertCamDevTable(rec);
               if (!ret) {
                   return "err_db_content";
               }
           }
        }
        else if(EDIT_CAMERA == type )
        {
            if(is_exist)
            {
                ret = db_c.updateCamDevTable(rec);
        bool is_exist = db_c.searchCamDevByCamId(rec.str_cam_dev_id);
        if (ADD_CAMERA == type) {
            if (is_exist) {
                return "{\"ret_status\": \"请勿重复添加!\"}";
            } else {
                ret = db_c.insertCamDevTable(rec);
                if (!ret) {
                    return "err_db_content";
                }
            }
            else
            {
                 return "{\"ret_status\": \"内容有误，请检查！\"}";
        } else if (EDIT_CAMERA == type) {
            if (is_exist) {
                ret = db_c.updateCamDevTable(rec);
                if (!ret) {
                    return "err_db_content";
                }
            } else {
                return "{\"ret_status\": \"内容有误，请检查！\"}";
            }
        }
        else
        {
             return "{\"ret_status\": \"内容有误，请检查！\"}";
        } else {
            return "{\"ret_status\": \"内容有误，请检查！\"}";
        }


@@ -1091,7 +1116,7 @@
        db_c.updateConfigTableByDevType(DEV_CAMERA);
        runAllApp();
    }
    //edit camera's sdks
        //edit camera's sdks
    else/* if ((rec_sdk_old.str_sdks != rec_sdk.str_sdks) ||
             (rec_sdk_old.str_det_thr != rec_sdk.str_det_thr) ||
             (rec_sdk_old.str_cmp_thr != rec_sdk.str_cmp_thr)) */
@@ -1260,26 +1285,35 @@

    Json::Reader reader;
    Json::Value value_reader;

    std::string out;
    if (!reader.parse(content, value_reader)) {
        return "{\"ret_status\": \"传输错误，请检查！\"}";
    }
    Json::Value value;
    if (value_reader.isMember("id")) {
        if (value_reader["id"].isNull()) return "{\"ret_status\": \"id内容有误，请检查！\"}";
        value["connect_status"] = "True";
        std::string rtmp_url = appConfig.getStringProperty("srsAddr");
        rtmp_url.append("cam").append(value_reader["id"].asCString());
        value["video_url"] = rtmp_url;
        out = value.toStyledString();

    //TODO
    //调用rtsp流rtsp://admin:a1234567@192.168.1.215:554/h264/ch1/main/av_stream
    } else {
        //TODO
        //调用rtsp流rtsp://admin:a1234567@192.168.1.215:554/h264/ch1/main/av_stream
//    std::string rtsp_url = "rtsp://" + username + ":" + passwd + "@" + ip + ":"  + std::to_string(port) + "/h264/ch1/main/av_stream";
    bool ret = cam_connect_video_start(value_reader["str_ip"].asString(), value_reader["n_port"].asInt(), \
        bool ret = cam_connect_video_start(value_reader["str_ip"].asString(), value_reader["n_port"].asInt(), \
                            value_reader["str_username"].asString(), value_reader["str_password"].asString(), \
                            value_reader["str_brand"].asString());
    if (!ret) {
        return "{\"ret_status\": \"内容有误，请检查！\"}";
    }
        if (!ret) {
            return "{\"ret_status\": \"内容有误，请检查！\"}";
        }

    std::string rtmp_url = m_rtmp[value_reader["str_ip"].asCString()].appPC->getRtmp();
    Json::Value value;
    value["connect_status"] = "True";
    value["video_url"] = rtmp_url;
    std::string out = value.toStyledString();
        std::string rtmp_url = m_rtmp[value_reader["str_ip"].asCString()].appPC->getRtmp();
        value["connect_status"] = "True";
        value["video_url"] = rtmp_url;
        out = value.toStyledString();
    }

    return out;
}
@@ -1435,12 +1469,12 @@
                fdfsClient.rwLock.unlock();
            }

            //# http client 127.0.0.1:9999/resetFdfs
            std::string http_cmd = "http://127.0.0.1:9999/resetFdfs";
            HttpRequestWithCrul httpRequestWithCrul;
            std::string response_bak = "";
            std::string postParams_bak = "";
            httpRequestWithCrul.curl_post_req("http://127.0.0.1:9999/resetFdfs", postParams_bak, response_bak);
//            //# http client 127.0.0.1:9999/resetFdfs
//            std::string http_cmd = "http://127.0.0.1:9999/resetFdfs";
//            HttpRequestWithCrul httpRequestWithCrul;
//            std::string response_bak = "";
//            std::string postParams_bak = "";
//            httpRequestWithCrul.curl_post_req("http://127.0.0.1:9999/resetFdfs", postParams_bak, response_bak);
        }
    } else {
        return "{\"ret_status\": \"传输错误，请检查！\"}";
@@ -1865,30 +1899,87 @@
//    bool ret = false;

    if (reader.parse(content, value)) {
        std::string Uuid = value["uuid"].asString();
        std::string TableType = value["TableType"].asString();
        std::string TableName = value["TableName"].asString();
        int SyncType = atoi(value["SyncType"].asCString());
        std::string BwType = value["BwType"].asString();
        std::string StartTime = value["StartTime"].asString();
        std::string EndTime = value["EndTime"].asString();

        std::string UploadFlag = value["IsSync"].asString();
        UploadFlag = UploadFlag.empty() ? "0" : UploadFlag;
        std::string CmpThreshold = value["threshold"].asString();
        CmpThreshold = CmpThreshold.empty() ? "60" : CmpThreshold;
        std::string Enabled = value["enabled"].asString();
        Enabled = Enabled.empty() ? "1" : Enabled;

        std::string createBy = value["createBy"].asString();

        string str_uuid;
        uuid_t t_uuid;
        char str[36];
        uuid_generate(t_uuid);
        uuid_unparse(t_uuid, str);
        str_uuid = str;
        Uuid = Uuid.empty() ? str_uuid : Uuid;
//        if (createBy == "analyDev") {
//            Uuid = Uuid.empty() ? str_uuid : Uuid;
//        } else if (createBy == "conCemter") {
//            if (Uuid.empty()) {
//                response->write(SimpleWeb::StatusCode::client_error_bad_request, "{\"error\":\"参数错误！ \"}");
//                return "";
//            }
//        }


        bool ret = false;
        if (SyncType == 1) {
            //同步库
            ret = erlangDbTool->createDatabase(TableType, TableName, SyncType, BwType, StartTime, EndTime);
        } else if (SyncType == 0) {
            TableName.insert(0, "lt_");
            //本地库
            FieldValues fieldValues;
            fieldValues.insert(std::make_pair("uuid", GetUUId::getUUID()));
            fieldValues.insert(std::make_pair("tableName", TableName));
            fieldValues.insert(std::make_pair("tableDesc", "ceshi"));
            fieldValues.insert(std::make_pair("tableType", TableType));
            fieldValues.insert(std::make_pair("bwType", BwType));
            fieldValues.insert(std::make_pair("startTime", StartTime));
            fieldValues.insert(std::make_pair("endTime", EndTime));
            fieldValues.insert(std::make_pair("create_by", "who"));
            ret = m_SqliteFaceEncap.createTable(TableName, fieldValues);
        FieldValues fieldValues;
        fieldValues.insert(std::make_pair("uuid", Uuid));
        fieldValues.insert(std::make_pair("tableName", TableName));
        fieldValues.insert(std::make_pair("tableDesc", "ceshi"));
        fieldValues.insert(std::make_pair("tableType", TableType));
        fieldValues.insert(std::make_pair("bwType", BwType));
        fieldValues.insert(std::make_pair("startTime", StartTime));
        fieldValues.insert(std::make_pair("endTime", EndTime));
//        #todo
        fieldValues.insert(std::make_pair("create_by", createBy));

        fieldValues.insert(std::make_pair("uploadFlag", UploadFlag));
        fieldValues.insert(std::make_pair("cmpThreshold", CmpThreshold));
        fieldValues.insert(std::make_pair("enabled", Enabled));


        if (TableType == "person") {
            if (SyncType == 1) {
                //同步库
                ret = erlangDbTool->createDatabase(Uuid, fieldValues);
            } else if (SyncType == 0) {
                TableName.insert(0, "lt_");
                fieldValues["tableName"] = TableName;
                //本地库
                ret = m_SqliteFaceEncap.createTable(TableName, fieldValues);
            }
        } else if (TableType == "car") {
            ERR(" not not_implemented");
            response->write(SimpleWeb::StatusCode::server_error_not_implemented, "{\"error\":\"类型错误，未实现！ \"}");
            return "";
        } else {
            response->write(SimpleWeb::StatusCode::server_error_not_implemented, "{\"error\":\"类型错误，未识别！ \"}");
            return "";
        }


////            #todo 上传。仅黑名单。
////            #TODO 根据createBy判断是否需要上传
//        if (createBy == "analyDev" && BwType == "1") {
////            string &Uuid, string &TableName, string &SyncType, string &StartTime,string &EndTime,
////            string &UploadFlag, string &CmpThreshold, string &Enabled
//            string str_SyncType(to_string(SyncType));
//            UploadTaskToMonitorCenter(Uuid, TableName, str_SyncType, StartTime, EndTime, UploadFlag, CmpThreshold,
//                                      Enabled);
//        }


        erlangDbTool->sendMessage();
        std::string str_result = std::string("{\"result\":").append("\"" + std::to_string(ret) + "\"}");
@@ -2340,26 +2431,27 @@
        std::string BwType = value["BwType"].asString();
        std::string StartTime = value["StartTime"].asString();
        std::string EndTime = value["EndTime"].asString();

        //#更新底库管理表
        FieldValues fieldValues;
        fieldValues.insert(std::make_pair("uuid", Uuid));
        fieldValues.insert(std::make_pair("tableName", TableName));
//            fieldValues.insert(std::make_pair("tableDesc", "ceshi2"));
        fieldValues.insert(std::make_pair("tableType", TableType));
        fieldValues.insert(std::make_pair("bwType", BwType));
        fieldValues.insert(std::make_pair("startTime", StartTime));
        fieldValues.insert(std::make_pair("endTime", EndTime));
//            fieldValues.insert(std::make_pair("create_by", "who"));
        bool ret = false;
        if (SyncType == 1) {
            //同步库
            ret = erlangDbTool->updateDatabase(Uuid, TableType, TableName, SyncType, BwType, StartTime, EndTime);
            ret = erlangDbTool->updateDatabase("sys_o_tables", fieldValues);
        } else if (SyncType == 0) {
            //本地库
            //#更新底库管理表
            FieldValues fieldValues;
            fieldValues.insert(std::make_pair("uuid", Uuid));
            if (TableName.find("lt_") != 0) {
                TableName.insert(0, "lt_");
            }
            fieldValues.insert(std::make_pair("tableName", TableName));
//            fieldValues.insert(std::make_pair("tableDesc", "ceshi2"));
            fieldValues.insert(std::make_pair("tableType", TableType));
            fieldValues.insert(std::make_pair("bwType", BwType));
            fieldValues.insert(std::make_pair("startTime", StartTime));
            fieldValues.insert(std::make_pair("endTime", EndTime));
//            fieldValues.insert(std::make_pair("create_by", "who"));
            fieldValues["tableName"] = TableName;

            ret = m_SqliteFaceEncap.updateTable("sys_o_tables", fieldValues);
        }

@@ -2408,11 +2500,10 @@
}


std::string devHttpServer_c::getAlarmImageByPicDateAndDevId(const std::string& picDate,const std::string& devId,
                                                        PResponse &response) {
std::string devHttpServer_c::getAlarmImageByPicDateAndDevId(const std::string &picDate, const std::string &devId,
                                                            PResponse &response) {
    try {
        if(!devId.empty() && !picDate.empty())    
        {   
        if (!devId.empty() && !picDate.empty()) {
            std::string videoPath;
            qint64 sub;
            std::string path = getVideoPathByPicDate(picDate, devId, sub);
@@ -2522,9 +2613,8 @@
}



std::string devHttpServer_c::getAlarmImageFromVideoFile(std::string ip, unsigned int port, std::string content,
                                                        PResponse &response)  {
                                                        PResponse &response) {
    INFO("ip:" << ip << "; port:" << port << "content: " << content);
    Json::Reader reader;
    Json::Value value;
@@ -2534,16 +2624,14 @@
            std::string picDate = value["picDate"].asString();
            std::string imgKey = value["imgKey"].asString();
            //兼容旧版本
            if(imgKey=="undefined" || imgKey.empty())
            {
                return getAlarmImageByPicDateAndDevId(picDate,devId,response);
            }   
            else
            {
                return getAlarmImageByImageKeyAndDevId(imgKey,devId,response);
            }    
        }
        else{
            if (imgKey == "undefined" || imgKey.empty()) {
                DBG("getAlarmImageByPicDateAndDevId " << imgKey);
                return getAlarmImageByPicDateAndDevId(picDate, devId, response);
            } else {
                DBG("getAlarmImageByImageKeyAndDevId " << imgKey);
                return getAlarmImageByImageKeyAndDevId(imgKey, devId, response);
            }
        } else {
            response->write(SimpleWeb::StatusCode::server_error_not_implemented, "{\"error\":\"传输错误，请检查！\"}");
            ERR("ImageURL:传输错误，请检查");
            return "";
@@ -2553,21 +2641,20 @@
        std::string message = "{\"error\":\"异常错误！";
        message.append(const_cast<char *>(ex.what())).append("\"}");
        response->write(SimpleWeb::StatusCode::server_error_not_implemented, message);
        ERR("ImageURL:异常错误   "<<ex.what());
        ERR("ImageURL:异常错误   " << ex.what());
        return "";
    }
}



std::string devHttpServer_c::getAlarmImageByImageKeyAndDevId(const std::string& imgKey,const std::string& devId,
                                                        PResponse &response)  {
std::string devHttpServer_c::getAlarmImageByImageKeyAndDevId(const std::string &imgKey, const std::string &devId,
                                                             PResponse &response) {
    try {
        if (!devId.empty() && !imgKey.empty()) {
            std::string videoPath;
            std::string path = getVideoPathByImgKey(imgKey, devId);
            if (path.empty()) {
                ERR("Not Find Path: "<<path);
                ERR("Not Find Path: " << path);
                return "{\"error\":\"未查到视频路径\"}";
            }
            videoPath.clear();
@@ -2579,17 +2666,17 @@
            //#todo 按照时间命名
            std::string str_imgName(AppUtil::getTimeString() + ".jpg");// = "test.jpg";

            auto frameIdDiff = imgSt.m_frameId-videoSt.m_startFrameId;
            char selectExpBuff[32]={0};
            std::string strSelectTemplate=R"#( -vf "select=eq(n\,%d)")#";
            sprintf(selectExpBuff,strSelectTemplate.c_str(),frameIdDiff-1);
            if(videoSt.Valid() && imgSt.Valid() ) {
                std::string cmd("ffmpeg -i '" + videoPath+"'"+std::string(selectExpBuff)+" -vframes 1" +" -y '" + str_imgName + "'");
                INFO("Video To Image Cmd: "<<cmd);
            auto frameIdDiff = imgSt.m_frameId - videoSt.m_startFrameId;
            char selectExpBuff[32] = {0};
            std::string strSelectTemplate = R"#( -vf "select=eq(n\,%d)")#";
            sprintf(selectExpBuff, strSelectTemplate.c_str(), frameIdDiff - 1);
            if (videoSt.Valid() && imgSt.Valid()) {
                std::string cmd("ffmpeg -i '" + videoPath + "'" + std::string(selectExpBuff) + " -vframes 1" + " -y '" +
                                str_imgName + "'");
                INFO("Video To Image Cmd: " << cmd);
                system(cmd.c_str());
            }
            else {
                ERR("Parse Video and Image Failed Path: "<<path <<" ImageId: "<<imgKey);
            } else {
                ERR("Parse Video and Image Failed Path: " << path << " ImageId: " << imgKey);
                return "{\"error\":\"未查到视频路径\"}";
            }

@@ -2607,7 +2694,7 @@
                std::string t_strImg = "";
                if (!fdfsClient.fastFds->uploadFile(buffer, t_strImg, "jpg")) {
                    img_url = "upload image fail";
                    ERR("Upload Image Failed "<<str_imgName);
                    ERR("Upload Image Failed " << str_imgName);
                } else {
                    std::string str_tmp_cmd("rm -f '" + str_imgName + "'");
                    system(str_tmp_cmd.c_str());
@@ -2618,7 +2705,7 @@
            }
            fdfsClient.rwLock.unlock();
            std::string result("{\"img_url\":\"" + img_url + "\"}");
            INFO("ImageURL:"<<img_url);
            INFO("ImageURL:" << img_url);
            return result;
        } else {
            response->write(SimpleWeb::StatusCode::server_error_not_implemented, "{\"error\":\"传输错误，请检查！\"}");
@@ -2630,7 +2717,7 @@
        std::string message = "{\"error\":\"异常错误！";
        message.append(const_cast<char *>(ex.what())).append("\"}");
        response->write(SimpleWeb::StatusCode::server_error_not_implemented, message);
        ERR("ImageURL:异常错误   "<<ex.what());
        ERR("ImageURL:异常错误   " << ex.what());
        return "";
    }
}
@@ -2642,7 +2729,7 @@
    Json::Reader reader;
    Json::Value value;

    INFO("REQ From: "<<ip<<":"<<port<<" Content:"<<content);
    INFO("REQ From: " << ip << ":" << port << " Content:" << content);
    if (reader.parse(content, value)) {
        std::string devId = value["videoNum"].asString();
        std::string picDate = value["picDate"].asString();
@@ -2650,29 +2737,26 @@
        std::string path;

        //兼容旧版本
        if(imgKey=="undefined"||imgKey.empty())
        {
        if (imgKey == "undefined" || imgKey.empty()) {
            qint64 sub;
            path = getVideoPathByPicDate(picDate,devId,sub);
        }
        else
        {
            path = getVideoPathByImgKey(imgKey,devId);
            path = getVideoPathByPicDate(picDate, devId, sub);
        } else {
            path = getVideoPathByImgKey(imgKey, devId);
        }
        //std::string path = getVideoPathByImgKey(imgKey, devId, sub);
        ERR("VideoNum: "<<devId <<"  PicDate: "<<picDate<<" imgKey: "<<imgKey);
        ERR("VideoNum: " << devId << "  PicDate: " << picDate << " imgKey: " << imgKey);
        if (path.empty()) {
            std::string strRsp =  "{\"ret_status\":\"内容有误，请检查！\"}";
            ERR("RSP:"<< strRsp);
            std::string strRsp = "{\"ret_status\":\"内容有误，请检查！\"}";
            ERR("RSP:" << strRsp);
            return strRsp;
        } else {
            std::string result = "{\"file_path\":\"" + path + "\"}";
            INFO("RSP:"<<result);
            INFO("RSP:" << result);
            return result;
        }
    } else {
        std::string strRsp="{\"ret_status\":\"传输错误，请检查！\"}";
        ERR("RSP:"<< strRsp);
        std::string strRsp = "{\"ret_status\":\"传输错误，请检查！\"}";
        ERR("RSP:" << strRsp);
        return strRsp;
    }
}
@@ -2816,14 +2900,13 @@
}


std::string devHttpServer_c::GetVideoNameByImgKey(const std::string& imgKey,const std::string& strPath) {
std::string devHttpServer_c::GetVideoNameByImgKey(const std::string &imgKey, const std::string &strPath) {
    static std::mutex g_mutex;
    std::lock_guard<std::mutex> lock(g_mutex);
    std::vector<std::string> vec = forEachFileByImgKey(strPath);
    ImageName_s_t imgSt = ImageName_s_t::fromString(imgKey);
    if(!imgSt.Valid())
    {
        ERR("ParseImageName Failed : "<<imgKey);
    if (!imgSt.Valid()) {
        ERR("ParseImageName Failed : " << imgKey);
        return "";
    }
    std::vector<VideoName_s_t> videoStVec;
@@ -2840,8 +2923,9 @@
                } else {
                    ERR("Image " << imgKey << "   Video: " << item << " Not Match");
                }
            } else{
                ERR("ImageID: "<<imgSt.m_frameId <<" VideoRange: "<<videoParseResult.m_startFrameId<<" , "<<videoParseResult.m_endFrameId);
            } else {
                ERR("ImageID: " << imgSt.m_frameId << " VideoRange: " << videoParseResult.m_startFrameId << " , "
                                << videoParseResult.m_endFrameId);
            }

        } else {
@@ -2851,35 +2935,32 @@

    if (videoStVec.size() >= 1) {
        std::string strVideoName = strPath + videoStVec[0].ToVideoName();
        INFO("ImageName: "<<imgKey<<"  SingleMatchVideo: "<<strVideoName);
        INFO("ImageName: " << imgKey << "  SingleMatchVideo: " << strVideoName);
        return strVideoName;
    } else {
        ERR("ImageName: "<<imgKey<<"  MatchVideoCount: "<<videoStVec.size());
        for(auto& item:vec)
        {
            ERR("VideoName: "<<item);
        ERR("ImageName: " << imgKey << "  MatchVideoCount: " << videoStVec.size());
        for (auto &item:vec) {
            ERR("VideoName: " << item);
        }
        return "";
    }
}

//新的根据图片名称获取路径的方法
std::string devHttpServer_c::getVideoPathByImgKey(const std::string &imgKey, const std::string &camId)
{
    INFO("GetVideoFor: "<<imgKey<<" CamID:"<<camId);
    ImageName_s_t imgSt= ImageName_s_t::fromString(imgKey);
std::string devHttpServer_c::getVideoPathByImgKey(const std::string &imgKey, const std::string &camId) {
    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};
    char curFolder[128] = {0};
    // 201901/26/2019012614 ---- 201901/26/2019012615 {年月}/{日}/{年月日时}/
    sprintf(curFolder,"%04d%02d/%02d/%04d%02d%02d%02d/",imgTime.tm_year+1900,imgTime.tm_mon+1,
                                  imgTime.tm_mday,
                                  imgTime.tm_year+1900,imgTime.tm_mon+1,imgTime.tm_mday,imgTime.tm_hour);
    sprintf(curFolder, "%04d%02d/%02d/%04d%02d%02d%02d/", imgTime.tm_year + 1900, imgTime.tm_mon + 1,
            imgTime.tm_mday,
            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(imgKey,videoPath);
    std::string videoPath = t_FilePath + "/" + camId + "/" + std::string(curFolder);
    return GetVideoNameByImgKey(imgKey, videoPath);
}



qint64 devHttpServer_c::getVideoTime(/*const std::string &videoPath,*/std::string &str_tmpTime) {
@@ -3261,18 +3342,22 @@
    Json::Value value;

    if (reader.parse(content, value)) {

        std::string ip = value["str_ip"].asString();
        std::string str_imgName = "";
        std::string rtsp_ip = value["str_ip"].asString();
//        int port= value["n_port"].asInt();
        int port = 554;
        std::string username = value["str_username"].asString();
        std::string pass = value["str_password"].asString();
        std::string brand = value["str_brand"].asString();
        std::string rtsp_url = rtspAddrBuild(ip, port, username, pass, brand);
        if (rtsp_url.empty() )
        {
            return "{\"ret_status\":\"内容有误，请检查！\"}";
        }
        std::string rtsp_url = rtspAddrBuild(rtsp_ip, port, username, pass, brand);

        if (value.isMember("id")) {
            if (value["id"].isNull()) return "{\"ret_status\": \"id内容有误，请检查！\"}";
            str_imgName.append("./").append(value["id"].asString()).append(".jpg");
        } else {
            if (rtsp_url.empty()) {
                return "{\"ret_status\":\"内容有误，请检查！\"}";
            }
//        unsigned char serialnumber[SERIALNO_LEN] = {0};
//        int ret = getDevSerialNumber(ip.c_str(), port,username.c_str(),pass.c_str(),brand.c_str(),serialnumber);

@@ -3284,18 +3369,22 @@

//        std::string str_cam_dev_id = std::string((char *) serialnumber);//摄像机id cam_mac

        std::string str_imgName = appConfig.getStringProperty("cutPath");
        if (str_imgName.back() != '/') {
            str_imgName.push_back('/');
        }
        str_imgName +=ip;
        str_imgName +="-";
        str_imgName += "snapshot.jpg";
        //admin:a1234567@192.168.1.201:554/h264/ch1/main/av_stream -r 1/25 -f image2 -s 1920*1080 /home/basic/work_src/a.jpg
        std::string cmd("ffmpeg -i " + rtsp_url + " -vf select='eq(pict_type\\,I)',setpts='N/(25*TB)' -f image2 -s 1920*1080 -y " + str_imgName);
            str_imgName = appConfig.getStringProperty("cutPath");
            if (str_imgName.back() != '/') {
                str_imgName.push_back('/');
            }
            str_imgName += rtsp_ip;
            str_imgName += "-";
            str_imgName += "snapshot.jpg";
            //admin:a1234567@192.168.1.201:554/h264/ch1/main/av_stream -r 1/25 -f image2 -s 1920*1080 /home/basic/work_src/a.jpg
            std::string cmd(
                "ffmpeg -i " + rtsp_url +
                " -vf select='eq(pict_type\\,I)',setpts='N/(25*TB)' -f image2 -s 1920*1080 -y " +
                str_imgName);
//        std::string cmd("ffmpeg -i " + rtsp_url + " -r 1/25  -f image2 -s 1920*1080 -y " + str_imgName);
        DBG(cmd);
        system(cmd.c_str());
            DBG(cmd);
            system(cmd.c_str());
        }

        cv::Mat img = cv::imread(str_imgName);

@@ -3310,14 +3399,14 @@
            CvUtil::cvMat2Buffer(img, buffer);
            std::string strImgUrlTmp = "";
            fdfsClient.fastFds->uploadFile(buffer, strImgUrlTmp, "jpg");
          //  strImgUrl.append(fdfsClient.fastFds->getIp() + "/" + strImgUrlTmp);
            //  strImgUrl.append(fdfsClient.fastFds->getIp() + "/" + strImgUrlTmp);
            strImgUrl.clear();
            strImgUrl = strImgUrlTmp;
        }
        fdfsClient.rwLock.unlock();
        Json::Value result;
        result["imgUrl"] = strImgUrl;
        db_c.updateCamDevSnapshot(QString::fromStdString(ip),QString::fromStdString(strImgUrl));
        db_c.updateCamDevSnapshot(QString::fromStdString(rtsp_ip), QString::fromStdString(strImgUrl));

        return result.toStyledString();