Forráskód Böngészése

开启默认最低3000N的保持力报警

git-svn-id: https://202.107.226.68:8443/svn/Services/ResistanceMonitor@73 a05970a1-87b9-9d4f-9ee5-fa77e2ec115b
shenchunzhong 1 éve
szülő
commit
d4d75557d2
1 módosított fájl, 5 hozzáadás és 3 törlés
  1. 5 3
      4.Data/ResistAlarm.cpp

+ 5 - 3
4.Data/ResistAlarm.cpp

@@ -3362,8 +3362,7 @@ BOOL CResistAlarmMng::LoadAlarmSet()
 		}
 	} while (true);
 
-	//2024年7月18日 取消默认开启
-	/*
+	//2024年8月23日 开启默认开启最低3000N报警
 	const auto& mapInfo = CMonitorObjectMng::Instance()->m_mapMoMpInfo;
 	for (auto& it : mapInfo)
 	{
@@ -3375,6 +3374,8 @@ BOOL CResistAlarmMng::LoadAlarmSet()
 		{
 			auto pInfo = new RETENSION_FORCE_DROP;
 			pInfo->no = (uint8_t)eSuoBiPosi::SB_FIX;
+			pInfo->enable = true;
+			pInfo->dw_alarm_low_drop = 3000;
 			sprintf_s(pInfo->momp, 20, "%s.%s", it.second->mo.c_str(), it.second->mp.c_str());
 			Insert(it.second->mo, it.second->mp, pInfo->no, (uint8_t)eZL_ALARMTYPE::RETENSION_FORCE, pInfo);
 		}
@@ -3387,11 +3388,12 @@ BOOL CResistAlarmMng::LoadAlarmSet()
 		{
 			auto pInfo = new RETENSION_FORCE_DROP;
 			pInfo->no = (uint8_t)eSuoBiPosi::SB_INVERT;
+			pInfo->enable = true;
+			pInfo->dw_alarm_low_drop = 3000;
 			sprintf_s(pInfo->momp, 20, "%s.%s", it.second->mo.c_str(), it.second->mp.c_str());
 			Insert(it.second->mo, it.second->mp, pInfo->no, (uint8_t)eZL_ALARMTYPE::RETENSION_FORCE, pInfo);
 		}
 	}
-	*/
 
 	CSimpleLog::Info(fmt::format("一共加载到{}条报警规则:{}", m_alarm_set.size(), sql).c_str());
 	return TRUE;