1.1.8.22保持力异常无效告警bug。

git-svn-id: https://202.107.226.68:8443/svn/Services/ResistanceMonitor@68 a05970a1-87b9-9d4f-9ee5-fa77e2ec115b

4.Data/ResistAlarm.cpp

@@ -1325,14 +1325,13 @@ void CResistAlarmMng::JudgeAlarm(CResistAlarmMng* pService, RETENSION_FORCE_DROP
 
 		}
 	}
-	ASSERT(pConstRetensionForceWaveInfo);
 	if (pConstRetensionForceWaveInfo->enable == false) return;
 	if (nOldVal == INT_MIN)
 		return;
 	eLowHigh loworhigh = eLowHigh::LH_UNKNOWN;
 	int alarm_refer = 0, alarm_value = 0;
 	bool bAlarm = false, bWarn = false;
-	if (nOldVal < pConstRetensionForceWaveInfo->dw_alarm_low_drop)
+	if (show_val < pConstRetensionForceWaveInfo->dw_alarm_low_drop) //当前值小于预警值
 	{
 		bWarn = true;
 		alarm_refer = pConstRetensionForceWaveInfo->dw_alarm_low_drop;
@@ -1343,14 +1342,16 @@ void CResistAlarmMng::JudgeAlarm(CResistAlarmMng* pService, RETENSION_FORCE_DROP
 	{
 		int nRatio = show_val * 100 / nOldVal;
 		//下降20%或上升40% 进行预警
-		if (nRatio <= (100 - pConstRetensionForceWaveInfo->alarm_low_percent))
+		if (pConstRetensionForceWaveInfo->alarm_low_percent > 0 && 
+			nRatio <= (100 - pConstRetensionForceWaveInfo->alarm_low_percent))
 		{
 			bWarn = true;
 			loworhigh = eLowHigh::LH_LOW;
 			alarm_value = show_val;
 			alarm_refer = nOldVal * (100 - pConstRetensionForceWaveInfo->alarm_low_percent) / 100;
 		}
-		else if (nRatio >= (100 + pConstRetensionForceWaveInfo->alarm_high_percent))
+		else if (pConstRetensionForceWaveInfo->alarm_high_percent > 0 && 
+			nRatio >= (100 + pConstRetensionForceWaveInfo->alarm_high_percent))
 		{
 			bWarn = true;
 			loworhigh = eLowHigh::LH_HIGH;