From 25eae971d34c0d0f7a5fc9dd70e98711fc950006 Mon Sep 17 00:00:00 2001
From: test <pansen626@sina.com>
Date: 星期一, 22 四月 2019 09:49:55 +0800
Subject: [PATCH] 修改人员异常的大于小于设置，并使用-1作为不生效以应对单边限制
---
QiaoJiaSystem/StructureApp/PerimeterElement.cpp | 11 ++++++++++-
1 files changed, 10 insertions(+), 1 deletions(-)
diff --git a/QiaoJiaSystem/StructureApp/PerimeterElement.cpp b/QiaoJiaSystem/StructureApp/PerimeterElement.cpp
index 7276844..e7b70ef 100644
--- a/QiaoJiaSystem/StructureApp/PerimeterElement.cpp
+++ b/QiaoJiaSystem/StructureApp/PerimeterElement.cpp
@@ -130,7 +130,16 @@
break;
case PerHubSdk:
- state = num > m_sdkRule.nAlarmNumLowerLimit && num < m_sdkRule.nAlarmNumUpperLimit && num !=mRealNum;
+ 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)
--
Gitblit v1.8.0