chenshijun
2019-04-16 f946a62d3921e86b44ff8e2973138304b9cd53cd
QiaoJiaSystem/StructureApp/PerimeterElement.cpp
@@ -25,8 +25,7 @@
    m_bIsMask(true),
    m_bSetWH(false),
    pointArray(nullptr),
    m_rpcClient("RtspAnalysServer", "127.0.0.1",appPref.getIntData("RpcVTIMPort"),"tcp")
{
    m_rpcClient("RtspAnalysServer", "127.0.0.1", appPref.getIntData("RpcVTIMPort"), "tcp") {
    pManagerEsDB = new EsDBTool(appPref.getStringData("ipAdd"), appPref.getIntData("ipPort"));
}
@@ -36,8 +35,7 @@
        delete pManagerEsDB;
        pManagerEsDB = nullptr;
    }
    if(pointArray)
    {
    if (pointArray) {
//        delete[] pointArray[0];
        delete[] pointArray;
    }
@@ -62,7 +60,7 @@
    m_recVec.clear();
//    DBG("Objs="<<mObjs.size()<<" fSensitivity="<<m_sdkRule.fSensitivity<<" nThreshold"<<m_sdkRule.nThreshold);
    for (auto obj:mObjs) {
    for (auto &obj:mObjs) {
        if (obj.score < m_sdkRule.fSensitivity)continue;
@@ -74,9 +72,8 @@
            // DBG("picDate="<<picDate);
        }
        if(imgKey.empty())
        {
            imgKey =obj.properties["imgKey"];
        if (imgKey.empty()) {
            imgKey = obj.properties["imgKey"];
        }
        if (m_sdkRule.nSdkType == PerimeterSdk)
        {
@@ -124,17 +121,17 @@
            //state = num > 0 ;
            state =( num !=mRealNum);
          //  DBG("num="<<num<< "time="<< picDate);
            INFO("SDK Type: PerimeterSdk");
//            INFO("SDK Type: PerimeterSdk");
            break;
        case CrowdSdk:
            state = num > m_sdkRule.nAlarmNumLowerLimit && num !=mRealNum;
            INFO("SDK Type: CrowdSdk");
//            INFO("SDK Type: CrowdSdk");
            break;
        case PerHubSdk:
            state = num > m_sdkRule.nAlarmNumLowerLimit && num < m_sdkRule.nAlarmNumUpperLimit && num !=mRealNum;
            INFO("SDK Type: PerHubSdk");
//            INFO("SDK Type: PerHubSdk");
//         if(m_sdkRule.nAlarmNumLowerLimit>=0)
//         {
@@ -166,7 +163,7 @@
        default:
            break;
    }
    INFO("State:"<<state<<" Num:"<<num<<" mRealNum:"<<mRealNum<<" LowerLimit :"<<m_sdkRule.nAlarmNumLowerLimit<<" HightLimit: "<<m_sdkRule.nAlarmNumUpperLimit);
//    INFO("State:"<<state<<" Num:"<<num<<" mRealNum:"<<mRealNum<<" LowerLimit :"<<m_sdkRule.nAlarmNumLowerLimit<<" HightLimit: "<<m_sdkRule.nAlarmNumUpperLimit);
    m_triggerElement.setState(state);
    m_triggerElement.triggerOnce();
    if (m_triggerElement.getTriggerState())
@@ -194,7 +191,7 @@
            std::string imgUrl = uploadImgToFdfs(image);
            saveInfoToEs(imgUrl, picDate,imgKey);
        }
        DBG("num=" << num << " lastnum=" << mRealNum);
//        DBG("num=" << num << " lastnum=" << mRealNum);
        mRealNum = num;
        //todo 重置报警trigger
@@ -285,8 +282,8 @@
        {
             mPolygon << (QPoint(x, y));
        }
        DBG("width="<<sizeW);
        DBG("height="<<sizeH);
//        DBG("width="<<sizeW);
//        DBG("height="<<sizeH);
    }
@@ -295,7 +292,7 @@
QJsonArray PerimeterElement::getJsonArrayFromQString(const QString &strJson) {
    QJsonDocument jsonDocument = QJsonDocument::fromJson(strJson.toLocal8Bit());
    if (jsonDocument.isNull()) {
        DBG("please check the string" << strJson.toStdString());
        ERR("please check the string" << strJson.toStdString());
        return QJsonArray();
    }
    QJsonArray jsonArray = jsonDocument.array();