Browse Source

超速超时添加日志

lixioayao 6 years ago
parent
commit
26ed2cf916

+ 2 - 2
module_service/area_business_count_checker.cpp

@@ -95,7 +95,7 @@ void area_business_count_checker::on_leave(const std::shared_ptr<area_hover>&a,
 		curVal = a->m_area->m_person_count.load();
 		tmp_event = a->m_area->m_event_person_count;
 		ev = a->m_area->is_mine()?EVENT_TYPE::ET_OVER_COUNT_PERSON : EVENT_TYPE::ET_AREA_OVER_COUNT_PERSON ;
-		if(tmp_event && curVal < limitVal)
+		if(tmp_event && curVal <= limitVal)
 		{
 			a->m_area->m_event_person_count = false;
 			log_info("area_business_count_checker::on_leave :Cancel Event OVER_COUNT=%d AreaId=%d,Limit=%d,CurNum=%d"
@@ -110,7 +110,7 @@ void area_business_count_checker::on_leave(const std::shared_ptr<area_hover>&a,
 		curVal = a->m_area->m_vehicle_count.load();
 		tmp_event = a->m_area->m_event_vehicle_count;
 		ev = a->m_area->is_mine()?EVENT_TYPE::ET_OVER_COUNT_VEHICLE : EVENT_TYPE::ET_AREA_OVER_COUNT_VEHICLE ;
-		if(tmp_event && curVal < limitVal)
+		if(tmp_event && curVal <= limitVal)
 		{
 			a->m_area->m_event_vehicle_count = false;
 			log_info("area_business_count_checker::on_leave :Cancel Event OVER_COUNT=%d AreaId=%d,Limit=%d,CurNum=%d"

+ 6 - 6
module_service/area_business_speed_checker.cpp

@@ -65,11 +65,11 @@ void area_business_speed_checker::on_hover(const std::shared_ptr<area_hover>&are
 
     auto ptr_temp = static_cast<over_speed_data*>(ptr.get());
     double limit = ptr_temp->m_limit_speed;
-
+    int _id = area_hover_ptr->id();
     if(limit < card_ptr->m_speed)//超速
     {
         ptr_temp->m_normal_speed_count=0;
-        log_info("[speed_checker:on_hover_1]%d %.2f,%.2f",card_ptr->m_id,limit,card_ptr->m_speed);
+        log_info("[speed_checker:on_hover_1]%d %.2f,%.2f areaid:%d",card_ptr->m_id,limit,card_ptr->m_speed,_id);
         if(!ptr_temp->m_is_warning && ++ptr_temp->m_over_speed_count>=SPEED_COUNT_LIMIT)
         {
             EVENT_TYPE ev_type =area_hover_ptr->m_area->is_mine()?ET_CARD_OVER_SPEED: ET_CARD_AREA_OVER_SPEED;
@@ -77,14 +77,14 @@ void area_business_speed_checker::on_hover(const std::shared_ptr<area_hover>&are
             card_ptr->set_event_flag(ev_type);
             uint64_t id = tool_other::type_id_to_u64(card_ptr->m_type, card_ptr->m_id);
             event_tool::instance()->handle_event(OT_CARD, ev_type, id, limit, card_ptr->m_speed, true);
-            log_info("[speed_checker:on_hover_true]%d",card_ptr->m_id);
+            log_info("[speed_checker:on_hover_true]%d,id:%d",card_ptr->m_id,_id);
         }
 
     }
     else//速度正常
     {
         ptr_temp->m_over_speed_count=0;
-        log_info("[speed_checker:on_hover_2]%d %.2f,%.2f",card_ptr->m_id,limit,card_ptr->m_speed);
+        log_info("[speed_checker:on_hover_2]%d %.2f,%.2f id:%d",card_ptr->m_id,limit,card_ptr->m_speed,_id);
         if(ptr_temp->m_is_warning && ++ptr_temp->m_normal_speed_count>=SPEED_COUNT_LIMIT)
         {
             EVENT_TYPE ev_type =area_hover_ptr->m_area->is_mine()?ET_CARD_OVER_SPEED: ET_CARD_AREA_OVER_SPEED;
@@ -92,7 +92,7 @@ void area_business_speed_checker::on_hover(const std::shared_ptr<area_hover>&are
             card_ptr->set_event_flag(ev_type,0);
             uint64_t id = tool_other::type_id_to_u64(card_ptr->m_type, card_ptr->m_id);
             event_tool::instance()->handle_event(OT_CARD, ev_type, id, limit, card_ptr->m_speed, false);
-            log_info("[speed_checker:on_hover_false]%d",card_ptr->m_id);
+            log_info("[speed_checker:on_hover_false]%d id:%d",card_ptr->m_id,_id);
         }
     }
 
@@ -117,7 +117,7 @@ void area_business_speed_checker::on_leave(const std::shared_ptr<area_hover>&are
         double limit = ptr_temp ->m_limit_speed;
         uint64_t id = tool_other::type_id_to_u64(card_ptr->m_type, card_ptr->m_id);
         event_tool::instance()->handle_event(OT_CARD, ev_type, id, limit, card_ptr->m_speed, ptr_temp->m_is_warning=false);
-        log_info("[speed_checker:on_leave_false]%d",card_ptr->m_id);
+        log_info("[speed_checker:on_leave_false]%d,id:%d",card_ptr->m_id,area_hover_ptr->id());
     }
 }