|
@@ -76,11 +76,11 @@ void car::handle_over_speed()
|
|
|
m_speeds.push_back(m_speed);
|
|
|
|
|
|
bool status = true;
|
|
|
- if(m_speed.size() < 30){
|
|
|
+ if(m_speeds.size() < 30){
|
|
|
status = false;
|
|
|
}else{
|
|
|
for(size_t i = 0;i < m_speeds.size();i++){
|
|
|
- if(v < 35){
|
|
|
+ if(m_speed < 35){
|
|
|
status = false;
|
|
|
}
|
|
|
}
|
|
@@ -88,19 +88,19 @@ void car::handle_over_speed()
|
|
|
|
|
|
if(status){
|
|
|
// 产生告警
|
|
|
- event_tool::instance()->handle_event(OT_CARD, ET_CARD_OVER_SPEED, id, 0, 0, status);
|
|
|
+ event_tool::instance()->handle_event(OT_CARD, ET_CARD_OVER_SPEED, m_id, 0, 0, status);
|
|
|
}
|
|
|
|
|
|
status = true;
|
|
|
- if(m_speed.size() == 30){
|
|
|
+ if(m_speeds.size() == 30){
|
|
|
for(size_t i = 20;i < m_speeds.size();i++){
|
|
|
- if(v>35){
|
|
|
+ if(m_speed>35){
|
|
|
status = false;
|
|
|
}
|
|
|
}
|
|
|
if(status){
|
|
|
// 结束告警
|
|
|
- event_tool::instance()->handle_event(OT_CARD, ET_CARD_OVER_SPEED, id, 0, 0, false);
|
|
|
+ event_tool::instance()->handle_event(OT_CARD, ET_CARD_OVER_SPEED, m_id, 0, 0, false);
|
|
|
}
|
|
|
}
|
|
|
|