区域超员代码优化

module_service/area_business_count_checker.cpp

@@ -14,36 +14,28 @@
 //服务器重启加载数据
 void area_business_count_checker::on_load_his(const std::shared_ptr<area_hover>&a,const std::shared_ptr<card_location_base>&c,std::shared_ptr<business_data>&ptr)
 {
-	if (nullptr == a->m_area )//|| !a->m_area->is_mine())
-	{
-		return ;
-	}
-	if (c->is_person())
-	{
-		a->m_area->m_person_count ++ ;
-		if (a->m_area->m_person_count > a->m_area->m_limit_person_count && !a->m_area->m_event_person_count)
-		{
-			EVENT_TYPE ev = a->m_area->is_mine()?EVENT_TYPE::ET_OVER_COUNT_PERSON : EVENT_TYPE::ET_AREA_OVER_COUNT_PERSON ;
-			auto ev_ptr_temp = event_list::instance()->get_event_area(a->m_area->id(),ev);
-			if (ev_ptr_temp && !ev_ptr_temp->is_end())
-			{
-				a->m_area->m_event_person_count = true;
-			}
-		}
-	}
-	else if (c->is_vehicle())
-	{
-		a->m_area->m_vehicle_count ++ ;
-		if (a->m_area->m_vehicle_count > a->m_area->m_limit_vehicle_count && !a->m_area->m_event_vehicle_count)
-		{
-			EVENT_TYPE ev = a->m_area->is_mine()?EVENT_TYPE::ET_OVER_COUNT_VEHICLE : EVENT_TYPE::ET_AREA_OVER_COUNT_VEHICLE ;
-			auto ev_ptr_temp = event_list::instance()->get_event_area(a->m_area->id(),ev);
-			if (ev_ptr_temp && !ev_ptr_temp->is_end())
-			{
-				a->m_area->m_event_vehicle_count = true;
-			}
-		}
-	}
+    if (nullptr == a->m_area )//|| !a->m_area->is_mine())
+    {
+        return ;
+    }
+    if (c->is_person() && !a->m_area->m_event_person_count)
+    {
+        EVENT_TYPE ev = a->m_area->is_mine()?EVENT_TYPE::ET_OVER_COUNT_PERSON : EVENT_TYPE::ET_AREA_OVER_COUNT_PERSON ;
+        auto ev_ptr_temp = event_list::instance()->get_event_area(a->m_area->id(),ev);
+        if (ev_ptr_temp && !ev_ptr_temp->is_end())
+            a->m_area->m_event_person_count = true;
+
+    }
+    else if (c->is_vehicle() && !a->m_area->m_event_vehicle_count)
+    {
+        EVENT_TYPE ev = a->m_area->is_mine()?EVENT_TYPE::ET_OVER_COUNT_VEHICLE : EVENT_TYPE::ET_AREA_OVER_COUNT_VEHICLE ;
+        auto ev_ptr_temp = event_list::instance()->get_event_area(a->m_area->id(),ev);
+        if (ev_ptr_temp && !ev_ptr_temp->is_end())
+        {
+            a->m_area->m_event_vehicle_count = true;
+        }
+    }
+    on_enter(a,c,ptr);
 }
 
 //增加计数,并进行判断
@@ -54,45 +46,35 @@ void area_business_count_checker::on_enter(const std::shared_ptr<area_hover>&a,
     {
         return ;
     }
-	EVENT_TYPE ev = EVENT_TYPE::ET_OVER_COUNT_PERSON;
-	int limitVal = 0;
-	int curVal = 0;
-	//uint64_t key = tool_other::type_id_to_u64(c->m_id,c->m_type);
 	if (c->is_person())
 	{
 		a->m_area->m_person_count ++ ;
-		limitVal = a->m_area->m_limit_person_count;
-		curVal = a->m_area->m_person_count;
-		ev = a->m_area->is_mine()?EVENT_TYPE::ET_OVER_COUNT_PERSON : EVENT_TYPE::ET_AREA_OVER_COUNT_PERSON ;
+		if (!a->m_area->m_event_person_count && a->m_area->m_person_count > a->m_area->m_limit_person_count)
+        {
+            a->m_area->m_event_person_count = true;
+            EVENT_TYPE ev = a->m_area->is_mine()?EVENT_TYPE::ET_OVER_COUNT_PERSON : EVENT_TYPE::ET_AREA_OVER_COUNT_PERSON ;
+            event_tool::instance()->handle_event(OT_AREA,ev,a->m_area->id(),a->m_area->m_limit_person_count,a->m_area->m_person_count,true);
+            log_info("area_business_count_checker::on_enter : Event OVER_COUNT=%d AreaId=%d,Limit=%d,CurNum=%d"
+            ,ev,a->m_area->id(),a->m_area->m_limit_person_count,(int)a->m_area->m_person_count);
+        }
 	}
 	else if (c->is_vehicle())
 	{
-		a->m_area->m_vehicle_count ++ ;
-		limitVal = a->m_area->m_limit_vehicle_count;
-		curVal = a->m_area->m_vehicle_count;
-		ev = a->m_area->is_mine()?EVENT_TYPE::ET_OVER_COUNT_VEHICLE : EVENT_TYPE::ET_AREA_OVER_COUNT_VEHICLE ;
-	}
-	if(curVal > limitVal)
-	{
-		if (c->is_vehicle())
-		{
-			a->m_area->m_event_vehicle_count = true;
-		}
-		else
-		{
-			a->m_area->m_event_person_count = true;
-		}
-		event_tool::instance()->handle_event(OT_AREA,ev,a->m_area->id(),limitVal,curVal,true);
-		log_info("area_business_count_checker::on_enter : Event OVER_COUNT=%d AreaId=%d,Limit=%d,CurNum=%d"
-		            ,ev,a->m_area->id(),limitVal,curVal);
+        a->m_area->m_vehicle_count ++ ;
+        if (a->m_area->m_vehicle_count > a->m_area->m_limit_vehicle_count && !a->m_area->m_event_vehicle_count)
+        {
+            a->m_area->m_event_vehicle_count = true;
+            EVENT_TYPE ev = a->m_area->is_mine()?EVENT_TYPE::ET_OVER_COUNT_PERSON : EVENT_TYPE::ET_AREA_OVER_COUNT_PERSON ;
+            event_tool::instance()->handle_event(OT_AREA,ev,a->m_area->id(),a->m_area->m_limit_vehicle_count,a->m_area->m_vehicle_count,true);
+            log_info("area_business_count_checker::on_enter : Event OVER_COUNT=%d AreaId=%d,Limit=%d,CurNum=%d"
+            ,ev,a->m_area->id(),a->m_area->m_limit_vehicle_count,(int)a->m_area->m_vehicle_count);
+        }
 	}
 }
 
 void area_business_count_checker::on_hover(const std::shared_ptr<area_hover>&a,
 						const std::shared_ptr<card_location_base>&c,std::shared_ptr<business_data> ptr)
 {
-
-
 }
 
 	//减少计数
@@ -114,6 +96,13 @@ void area_business_count_checker::on_leave(const std::shared_ptr<area_hover>&a,
 		curVal = a->m_area->m_person_count;
 		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)
+        {
+            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"
+            ,ev,a->m_area->id(),limitVal,curVal);
+            event_tool::instance()->handle_event(OT_AREA,ev,a->m_area->id(),limitVal,curVal,false);
+        }
 	}
 	else if (c->is_vehicle())
 	{
@@ -122,23 +111,13 @@ void area_business_count_checker::on_leave(const std::shared_ptr<area_hover>&a,
 		curVal = a->m_area->m_vehicle_count;
 		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 ;
-	}
-	else{
-		return ;
-	}
-	if(tmp_event && curVal < limitVal)
-	{
-		if (c->is_vehicle())
-		{
-			a->m_area->m_event_vehicle_count = false;
-		}
-		else
-		{
-			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"
-        ,ev,a->m_area->id(),limitVal,curVal);
-		event_tool::instance()->handle_event(OT_AREA,ev,a->m_area->id(),limitVal,curVal,false);
+        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"
+            ,ev,a->m_area->id(),limitVal,curVal);
+            event_tool::instance()->handle_event(OT_AREA,ev,a->m_area->id(),limitVal,curVal,false);
+        }
 	}
 }