From 291dbcd9331cd0df41addef74defa4654ee034fb Mon Sep 17 00:00:00 2001
From: chenshijun <csj_sky@126.com>
Date: 星期一, 22 四月 2019 15:59:20 +0800
Subject: [PATCH] 增加人员异常的参数处理

---
 QiaoJiaSystem/StructureApp/PerimeterElement.cpp |   23 ++++++++++++++++-------
 1 files changed, 16 insertions(+), 7 deletions(-)

diff --git a/QiaoJiaSystem/StructureApp/PerimeterElement.cpp b/QiaoJiaSystem/StructureApp/PerimeterElement.cpp
index 5345549..af7c063 100644
--- a/QiaoJiaSystem/StructureApp/PerimeterElement.cpp
+++ b/QiaoJiaSystem/StructureApp/PerimeterElement.cpp
@@ -127,17 +127,26 @@
             //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");
+            DBG("nAlarmNumLowerLimit:" << m_sdkRule.nAlarmNumLowerLimit
+            << " nAlarmNumUpperLimit:" << m_sdkRule.nAlarmNumUpperLimit
+            << " mRealNum:" << mRealNum);
+            if(m_sdkRule.nAlarmNumUpperLimit == -1){
+                state = num >= m_sdkRule.nAlarmNumLowerLimit && num !=mRealNum;
+            }else if(m_sdkRule.nAlarmNumLowerLimit == -1){
+                state = num <= m_sdkRule.nAlarmNumUpperLimit && num !=mRealNum;
+            } else {
+                state = num >= m_sdkRule.nAlarmNumLowerLimit && num <= m_sdkRule.nAlarmNumUpperLimit && num != mRealNum;
+            }
+//            INFO("SDK Type: PerHubSdk");
 
 //         if(m_sdkRule.nAlarmNumLowerLimit>=0)
 //         {
@@ -293,8 +302,8 @@
         } else {
             mPolygon << (QPoint(x, y));
         }
-        DBG("width=" << sizeW);
-        DBG("height=" << sizeH);
+//        DBG("width="<<sizeW);
+//        DBG("height="<<sizeH);
 
 
     }
@@ -303,7 +312,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();

--
Gitblit v1.8.0