修改信息结构

pansen

2019-04-02 a2673edc68a502f9a88ddf8e42f4aded9a8d94ef

修改信息结构

 QiaoJiaSystem/DataManagerServer/CMakeLists.txt

@@ -54,6 +54,7 @@
    ../../../BasicPlatForm/basic/util/app/

    #nsq
    ../../../BasicPlatForm/libs/EvnsqTool/
    ../../../BasicPlatForm/libs/EvnsqTool/include
    ../../../BasicPlatForm/libs/libevent/include

@@ -113,14 +114,14 @@
    ../../../BasicPlatForm/basic/timer_counter/Clocktimer.cpp



    ../../syncDBTool/ErlangDbTool.cpp
    #
    ../LocalDBTool/GetUUId.cpp
    ../LocalDBTool/SqliteFaceEncap.cpp
    ../../../BasicPlatForm/basic/db/sqlite/sqliteEncapsulation.cpp
    ../../../BasicPlatForm/basic/db/sqlite/sqliteEncapsulation.h
        vss/dao/BaseDao.cpp)
    vss/dao/BaseDao.cpp
    )

target_link_libraries(DataWebServer
    glog

 QiaoJiaSystem/DataManagerServer/http_configserver.cpp

@@ -34,7 +34,7 @@
using namespace std;

devHttpServer_c::devHttpServer_c()
    : _HttpSrvRetRecieve("0.0.0.0", 8083, 1), erlangDbTool(nullptr), m_SqliteFaceEncap("LocalDataDB"){
    : _HttpSrvRetRecieve("0.0.0.0", 8083, 1), erlangDbTool(nullptr), m_SqliteFaceEncap("LocalDataDB") {
    init();
}

@@ -1534,10 +1534,12 @@
    }

    if (ret) {
        //todo
        //todo VideoToImageMulth
        {
            std::string topic = "cut_dura_edit";
            std::string msg = content;
            std::string topic = "VideoToImageMulth";
            Json::Value json_cfg;
            json_cfg["cut_dura_edit"] = content;
            std::string msg = json_cfg.toStyledString();
            DBG("msg:" << msg);
            nsqMsgProducer->Publish(topic, (void *) (&msg));
        }

 QiaoJiaSystem/DataManagerServer/http_configserver.h

@@ -19,7 +19,8 @@
#include <atomic>
#include "../FaceSearchServer/CasiaFaceWrapper/CasiaFaceWrapperN.h"
#include "AppPipeController.h"
#include "NsqMsgTool.hpp"

#include <NsqMsgTool.hpp>

typedef std::shared_ptr<HttpServer::Response> PResponse;

@@ -108,11 +109,8 @@

    std::string loadFaceFeaData(std::string ip, unsigned int port, std::string content, PResponse &response);

  

    std::string getAlarmImageFromVideoFile(std::string ip, unsigned int port, std::string content, PResponse &response);


   


    std::string getRecordVideoPath(std::string ip, unsigned int port, std::string content, PResponse &response);
@@ -186,7 +184,7 @@
                              unsigned char *serialNumber = NULL) const;

    bool createDevId(const int &dev_batch, const int &dev_sequence);
    


    std::vector<std::string> forEachFile(const std::string &dir_name);

@@ -194,12 +192,12 @@


    //根据PicDate获取报警图
    std::string getAlarmImageByPicDateAndDevId(const std::string& picDate,const std::string& devId,
                                                        PResponse &response);
    std::string getAlarmImageByPicDateAndDevId(const std::string &picDate, const std::string &devId,
                                               PResponse &response);

    //根据ImgKey获取报警图
    std::string getAlarmImageByImageKeyAndDevId(const std::string& imgKey,const std::string& devId,
                                                        PResponse &response);
    std::string getAlarmImageByImageKeyAndDevId(const std::string &imgKey, const std::string &devId,
                                                PResponse &response);

    //根据PicData获取视频路径
    std::string getVideoPathByPicDate(const std::string &picDate, const std::string &camId, qint64 &sub);
@@ -211,7 +209,7 @@
    std::vector<std::string> forEachFileByImgKey(const std::string &dir_name);

    //根据ImgKey获取视频名
    std::string GetVideoNameByImgKey(const std::string& imgKey,const std::string& strPath);
    std::string GetVideoNameByImgKey(const std::string &imgKey, const std::string &strPath);

};


 QiaoJiaSystem/DataManagerServer/main.cpp

@@ -9,7 +9,7 @@
using namespace cv;

int main(int argc, char **argv) {
    std::cout<<__DATE__<<std::endl;
    std::cout << __DATE__ << std::endl;
    ENABLEGLOG(GET_STR_CONFIG("logPath").c_str());

//    unsigned char gateway_addr[15] = {0};

 QiaoJiaSystem/DataManagerServer/web-server½Ó¿Ú.txt

@@ -287,8 +287,8 @@
//视频时长设置 cut_dura_edit
下发：
{
    "cut_max_duration" : 3
        "cut_min_duration" : 3
    "cut_max_duration" : 3,
    "cut_min_duration" : 3
}
返回：标准返回值


 QiaoJiaSystem/FaceDetectServer/CMakeLists.txt

@@ -53,7 +53,7 @@
    ../../../BasicPlatForm/libs/Casia_Face/FaceSdk/lib/gpu

    #nsq
    ../../../BasicPlatForm/basic/mq/EvnsqTool/lib
    ../../../BasicPlatForm/libs/EvnsqTool/lib
    ../../../BasicPlatForm/libs/libevent/lib
)


 QiaoJiaSystem/VideoToImageMulth/RtspAnalysManager.cpp

@@ -16,7 +16,8 @@

    //nsq   set callback func
    DBG("NsqMsgConsumer Init");
    nsqMsgConsumer = new BasicMsg::Nsq::NsqMsgConsumer("127.0.0.1", "4150", "cut_dura_edit", to_string(appPref.getIntData("RpcVTIMPort")));
    nsqMsgConsumer = new BasicMsg::Nsq::NsqMsgConsumer("127.0.0.1", "4150", "cut_dura_edit",
                                                       to_string(appPref.getIntData("RpcVTIMPort")));
    nsqMsgConsumer->setMessageCallback(std::bind(&OnMsgFunc, std::placeholders::_1, this));
    nsqMsgConsumer->init();
    DBG("NsqMsgConsumer Init END!!");
@@ -30,83 +31,99 @@
    Json::Reader reader;
    Json::Value value;
    if (reader.parse(msg->body.ToString(), value)) {
        int cut_max_duration = value["cut_max_duration"].asInt();
        int cut_min_duration = value["cut_min_duration"].asInt();
        DBG("cut_max_duration: " << cut_max_duration << "   cut_min_duration: " << cut_min_duration);
        appPref.setIntData("n_cut_max_duration", cut_max_duration);
        appPref.setIntData("n_cut_min_duration", cut_min_duration);
        auto itor_json_end = value.end();
        Json::Value cfg_val;
        for (auto itor_json = value.begin(); itor_json != itor_json_end; ++itor_json) {
            if (itor_json->isString() && reader.parse(itor_json->asString(), cfg_val)) {
                if (itor_json.name() == "cut_dura_edit") {
                    int cut_max_duration = cfg_val["cut_max_duration"].asInt();
                    int cut_min_duration = cfg_val["cut_min_duration"].asInt();
                    DBG("cut_max_duration: " << cut_max_duration << "   cut_min_duration: " << cut_min_duration);
                    appPref.setIntData("n_cut_max_duration", cut_max_duration);
                    appPref.setIntData("n_cut_min_duration", cut_min_duration);

        DBG("cut_max_duration: " << cut_max_duration << "   cut_min_duration: " << cut_min_duration);
                    DBG("cut_max_duration: " << cut_max_duration << "   cut_min_duration: " << cut_min_duration);
//        m_GB28181_Enable = appPref.getIntData("GB28181_Enable");
        //#todo GB28181
        if (pthis->m_GB28181_Enable) {
            DBG("searchCamDevTableByType before");
            auto lst = pthis->m_lDBTool->searchCamDevTableByType(1);
            DBG("searchCamDevTableByType size:" << lst.size());
//*****************************#todo extract to func ************************************
                    //#todo GB28181
                    if (pthis->m_GB28181_Enable) {
                        DBG("searchCamDevTableByType before");
                        auto lst = pthis->m_lDBTool->searchCamDevTableByType(1);
                        DBG("searchCamDevTableByType size:" << lst.size());
                        if (lst.size() > 0) {
                            int startCamNO = appPref.getIntData("CamStartNO");
                            int CamCount = appPref.getIntData("CamEndNO") - appPref.getIntData("CamStartNO") + 1;
                            INFO("StartCamNO: " << startCamNO << " CamCount: " << CamCount);
                            auto itor = lst.begin();

            if (lst.size() > 0) {
                int startCamNO = appPref.getIntData("CamStartNO");
                int CamCount = appPref.getIntData("CamEndNO") - appPref.getIntData("CamStartNO") + 1;
                INFO("StartCamNO: " << startCamNO << " CamCount: " << CamCount);
                auto itor = lst.begin();
                            if (startCamNO >= lst.size()) {
                                ERR("startCamNO > lst.size()");
                                return;
                            }

                if (startCamNO >= lst.size()) {
                    ERR("startCamNO > lst.size()");
                    return;
                }
                            for (int i = 0; i < startCamNO; i++) {
                                itor++;
                            }
                            for (int i = 0; i < CamCount; i++) {
                                if (itor == lst.end()) {
                                    ERR("itor == lst.end()");
                                    return;
                                }
                                std::string t_camIdex = itor->str_cam_dev_id.toStdString();
                                DBG("-----camID:" << t_camIdex << "min:" << cut_min_duration << "max:"
                                                  << cut_max_duration);
                                pthis->m_controllers_videoCapElem[t_camIdex]->SetVideoMinMaxSeconds(cut_min_duration,
                                                                                                    cut_max_duration);
                                itor++;
                            }
                        } else {
                            ERR("searchCamDevTableByType size is 0");
                        }
                    } else {
                        auto lst = pthis->m_lDBTool->searchCamDevTableByType(0);
                        if (lst.size() > 0) {
                            int startCamNO = appPref.getIntData("CamStartNO");
                            int CamCount = appPref.getIntData("CamEndNO") - appPref.getIntData("CamStartNO") + 1;
                            INFO("StartCamNO: " << startCamNO << " CamCount: " << CamCount);
                            auto itor = lst.begin();

                for (int i = 0; i < startCamNO; i++) {
                    itor++;
                }
                            if (startCamNO >= lst.size()) {
                                ERR("startCamNO > lst.size()");
                                return;
                            }

                for (int i = 0; i < CamCount; i++) {
                    if (itor == lst.end()) {
                        ERR("itor == lst.end()");
                        return;
                            for (int i = 0; i < startCamNO; i++) {
                                itor++;
                            }

                            for (int i = 0; i < CamCount; i++) {
                                if (itor == lst.end()) {
                                    ERR("itor == lst.end()");
                                    return;
                                }
                                std::string t_camIdex = itor->str_cam_dev_id.toStdString();
                                DBG("-----camID:" << t_camIdex << "min:" << cut_min_duration << "max:"
                                                  << cut_max_duration);
                                pthis->m_controllers[t_camIdex]->SetVideoMinMaxSeconds(cut_min_duration,
                                                                                       cut_max_duration);
                                itor++;
                            }

                        } else {
                            ERR("searchCamDevTableByType size is 0");
                        }
                    }
                    std::string t_camIdex = itor->str_cam_dev_id.toStdString();
                    DBG("-----camID:" << t_camIdex << "min:" << cut_min_duration << "max:" << cut_max_duration);
                    pthis->m_controllers_videoCapElem[t_camIdex]->SetVideoMinMaxSeconds(cut_min_duration, cut_max_duration);
                    itor++;
                }
            } else {
                ERR("searchCamDevTableByType size is 0");
            }

        } else {
            auto lst = pthis->m_lDBTool->searchCamDevTableByType(0);

            if (lst.size() > 0) {
                int startCamNO = appPref.getIntData("CamStartNO");
                int CamCount = appPref.getIntData("CamEndNO") - appPref.getIntData("CamStartNO") + 1;
                INFO("StartCamNO: " << startCamNO << " CamCount: " << CamCount);
                auto itor = lst.begin();

                if (startCamNO >= lst.size()) {
                    ERR("startCamNO > lst.size()");
                    return;
                }

                for (int i = 0; i < startCamNO; i++) {
                    itor++;
                }

                for (int i = 0; i < CamCount; i++) {
                    if (itor == lst.end()) {
                        ERR("itor == lst.end()");
                        return;
                    }
                    std::string t_camIdex = itor->str_cam_dev_id.toStdString();
                    DBG("-----camID:" << t_camIdex << "min:" << cut_min_duration << "max:" << cut_max_duration);
                    pthis->m_controllers[t_camIdex]->SetVideoMinMaxSeconds(cut_min_duration, cut_max_duration);
                    itor++;
//***************************************************************************************
                }

            } else {
                ERR("searchCamDevTableByType size is 0");
            }

                DBG("itor value is not string ");
                continue;
            }
        }


    } else {
        ERR("Error Message!!");
    }
@@ -289,7 +306,8 @@
//                25, 0, 0, this);

            m_controllers_videoCapElem[index] = new PushStreamAppPipeController(const_cast<string &>(index),
                                                                                25, 0, appPref.getIntData("gpu.index"), this);
                                                                                25, 0, appPref.getIntData("gpu.index"),
                                                                                this);
            m_controllers_videoCapElem[index]->SetVideoMinMaxSeconds(lst_dev.n_cut_min_duration,
                                                                     lst_dev.n_cut_max_duration);
            m_controllers_videoCapElem[index]->start();