|
@@ -170,20 +170,17 @@ void Module::OnSubData(std::string table,std::string val)
|
|
std::vector<std::string>::iterator itr;
|
|
std::vector<std::string>::iterator itr;
|
|
for( itr = m_szOutputs.begin(); itr != m_szOutputs.end(); ++itr )
|
|
for( itr = m_szOutputs.begin(); itr != m_szOutputs.end(); ++itr )
|
|
{
|
|
{
|
|
- if( m_mpRangeConfig[szDataName].nStatus != 0)
|
|
|
|
- {
|
|
|
|
- QString szJson;
|
|
|
|
- szJson += "{";
|
|
|
|
- szJson += QString("\"occurTime\":\"%1\",").arg(QDateTime::currentDateTime().toString("yyyy-MM-dd hh:mm:ss.zzz"));
|
|
|
|
- szJson += QString("\"status\":%1,").arg(nStatus != 0 ? 0 : 2);
|
|
|
|
- szJson += QString("\"content\":\"%1 %2\",").arg(szDataName.c_str()).arg(m_mpRangeConfig[szDataName].szOperator.c_str());
|
|
|
|
- szJson += QString("\"alarmRuleId\":\"%1\",").arg(m_mpRangeConfig[szDataName].alarmRuleId.c_str());
|
|
|
|
- szJson += QString("\"alarmRuleVersion\":%1,").arg(m_mpRangeConfig[szDataName].alarmRuleVersion);
|
|
|
|
- szJson += QString("\"level\":%1,").arg(m_mpRangeConfig[szDataName].level);
|
|
|
|
- szJson += QString("\"object\":\"%1\"").arg(m_mpRangeConfig[szDataName].object.c_str());
|
|
|
|
- szJson += "}";
|
|
|
|
- m_pDataConsumer->OnData(*itr,QVariant(szJson));
|
|
|
|
- }
|
|
|
|
|
|
+ QString szJson;
|
|
|
|
+ szJson += "{";
|
|
|
|
+ szJson += QString("\"occurTime\":\"%1\",").arg(QDateTime::currentDateTime().toString("yyyy-MM-dd hh:mm:ss.zzz"));
|
|
|
|
+ szJson += QString("\"status\":%1,").arg(nStatus != 0 ? 0 : 2);
|
|
|
|
+ szJson += QString("\"content\":\"%1 %2\",").arg(szDataName.c_str()).arg(m_mpRangeConfig[szDataName].szOperator.c_str());
|
|
|
|
+ szJson += QString("\"alarmRuleId\":\"%1\",").arg(m_mpRangeConfig[szDataName].alarmRuleId.c_str());
|
|
|
|
+ szJson += QString("\"alarmRuleVersion\":%1,").arg(m_mpRangeConfig[szDataName].alarmRuleVersion);
|
|
|
|
+ szJson += QString("\"level\":%1,").arg(m_mpRangeConfig[szDataName].level);
|
|
|
|
+ szJson += QString("\"object\":\"%1\"").arg(m_mpRangeConfig[szDataName].object.c_str());
|
|
|
|
+ szJson += "}";
|
|
|
|
+ m_pDataConsumer->OnData(*itr,QVariant(szJson));
|
|
}
|
|
}
|
|
|
|
|
|
m_mpRangeConfig[szDataName].nStatus = nStatus;
|
|
m_mpRangeConfig[szDataName].nStatus = nStatus;
|