1.0.9.14实时数据报警线由后台判断是否开启

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

4.Data/MGDataHandler.cpp

@@ -452,7 +452,7 @@ int CMGDataHandler::HandleConfRead(string tag, string type, yyjson_mut_doc* doc,
 					{
 						int nNo = atoi(no.c_str()) - 1;
 						auto pBase = CResistAlarmMng::Instance()->Find(mo, mp, nNo, eZL_ALARMTYPE::MAX_OVER_LIMIT);
-						if (pBase)
+						if (pBase && pBase->enable)
 						{
 							string name1, name2, name3;
 							CMonitorObjectMng::Instance()->GetNameByMoMp(mo + "." + mp, name1, name2, name3);
@@ -579,7 +579,7 @@ int CMGDataHandler::HandleConfRead(string tag, string type, yyjson_mut_doc* doc,
 						int nNo = atoi(no.c_str()) - 1;
 						if (nNo != 2) return 400;
 						auto pBase = CResistAlarmMng::Instance()->Find(mo, mp, nNo, eZL_ALARMTYPE::FRICTION_OVER_LIMIT);
-						if (pBase)
+						if (pBase && pBase->enable)
 						{
 							assert(pBase->type == eZL_ALARMTYPE::FRICTION_OVER_LIMIT);
 							auto pInfo = (FRICTION_OVER_LIMIT_INFO*)pBase;