|
|
@@ -8,6 +8,7 @@
|
|
|
#include "MGWSServer.h"
|
|
|
#include "ResistAlarm.h"
|
|
|
#include <315ClientManager.h>
|
|
|
+#include "AlarmDefine.h"
|
|
|
|
|
|
using namespace rapidjson;
|
|
|
|
|
|
@@ -1210,24 +1211,24 @@ BOOL CLNHandle::HandlePushOnline(const rapidjson::Document& doc, const char* ime
|
|
|
|
|
|
|
|
|
// 不做报警处理，记录数据库中
|
|
|
- /*
|
|
|
+
|
|
|
//报警发送
|
|
|
if (bNew)
|
|
|
{
|
|
|
//存入数据库
|
|
|
- CResistAlarmMng::Instance()->GeneralAlarm(mo, mp, idx, eZL_ALARMTYPE::SENSOR_ABNORMAL, 1, stNow);
|
|
|
+ //CResistAlarmMng::Instance()->GeneralAlarm(mo, mp, idx, eZL_ALARMTYPE::SENSOR_ABNORMAL, 1, stNow);
|
|
|
//上送报警 传感器异常暂时屏蔽 等待放开
|
|
|
- //g_p315ClientManager->GetTcpClient()->SendAlarmData(CMonitorObjectMng::Instance()->GetZZJNO(mo + '.' + mp), 1, CTime(stNow).GetTime(), 0xFFFFFFFF,
|
|
|
- // eZL_ALARMTYPE::SENSOR_ABNORMAL, eDaoChaPosi::DCP_UNKNOWN, 0, 0, TIEDA_ACQ_VALUE(INT_MIN), TIEDA_ACQ_VALUE(INT_MIN), 0);
|
|
|
+ g_p315ClientManager->GetTcpClient()->SendAlarmData(CMonitorObjectMng::Instance()->GetZZJNO(mo + '.' + mp), 1, CTime(stNow).GetTime(), 0xFFFFFFFF,
|
|
|
+ eZL_ALARMTYPE::SENSOR_ABNORMAL, eDaoChaPosi::DCP_UNKNOWN, 0, eLowHigh::LH_UNKNOWN, TIEDA_ACQ_VALUE(INT_MIN), TIEDA_ACQ_VALUE(INT_MIN), 0);
|
|
|
}
|
|
|
else if (bConver)
|
|
|
{
|
|
|
- CResistAlarmMng::Instance()->RecoverAlarm(mo, mp, idx, eZL_ALARMTYPE::SENSOR_ABNORMAL, 1, stNow);
|
|
|
+ //CResistAlarmMng::Instance()->RecoverAlarm(mo, mp, idx, eZL_ALARMTYPE::SENSOR_ABNORMAL, 1, stNow);
|
|
|
|
|
|
- //g_p315ClientManager->GetTcpClient()->SendAlarmData(CMonitorObjectMng::Instance()->GetZZJNO(mo + '.' + mp), 2, CTime(stNow).GetTime(), CTime(stNow).GetTime(),
|
|
|
- // eZL_ALARMTYPE::SENSOR_ABNORMAL, eDaoChaPosi::DCP_UNKNOWN, 0, 0, TIEDA_ACQ_VALUE(INT_MIN), TIEDA_ACQ_VALUE(INT_MIN), 0);
|
|
|
+ g_p315ClientManager->GetTcpClient()->SendAlarmData(CMonitorObjectMng::Instance()->GetZZJNO(mo + '.' + mp), 2, CTime(stNow).GetTime(), CTime(stNow).GetTime(),
|
|
|
+ eZL_ALARMTYPE::SENSOR_ABNORMAL, eDaoChaPosi::DCP_UNKNOWN, 0, eLowHigh::LH_UNKNOWN, TIEDA_ACQ_VALUE(INT_MIN), TIEDA_ACQ_VALUE(INT_MIN), 0);
|
|
|
}
|
|
|
- */
|
|
|
+
|
|
|
}
|
|
|
}
|
|
|
|
chenyu