修复冲突

area.cpp

@@ -69,7 +69,7 @@ struct special_area:area
 area::area(int id,int limit_count_person, int limit_time_person,double scale,int32_t mapid,int32_t type)
      :m_id(id)
      ,m_area_type(type)
-     ,m_limit_person_second(limit_time_person)
+     ,m_limit_person_min(limit_time_person)
      ,m_limit_person_count(limit_count_person)
      ,m_scale(scale)
      ,m_mapid(mapid)
@@ -433,7 +433,7 @@ void area_list::init_from_db(int id/*=-1*/)
         if(-1 == id)
         {
             std::shared_ptr<area> ap = create(area_type_id,area_id,over_count_person,over_time_person, scale,map_id,b_type);
-            ap->m_limit_vehicle_second = over_time_vehicle;
+            ap->m_limit_vehicle_min = over_time_vehicle;
             ap->m_limit_vehicle_count = over_count_vehicle;
             ap->m_speed=std::move(map_);
             ap->m_is_work_area = is_work_area;

area.h

@@ -54,12 +54,12 @@ struct area
                      int32_t type,int limit_count_vehicle, int limit_time_vehicle)
     {
         m_area_type=type;
-        m_limit_person_second=limit_time_person;
+        m_limit_person_min=limit_time_person;
         m_limit_person_count=limit_count_person;
         m_scale=scale;
         m_mapid=mapid;
         m_limit_vehicle_count=limit_count_vehicle;
-        m_limit_vehicle_second=limit_time_vehicle;
+        m_limit_vehicle_min=limit_time_vehicle;
     }
 public:
 	std::vector<area_business*> m_area_business_list;
@@ -106,14 +106,14 @@ public:
     int m_area_type;
 
 	//人卡超时及超员数量(阀值)
-    int m_limit_person_second;
+    int m_limit_person_min;
     int m_limit_person_count;
     //是否人卡超员已有告警
     bool m_event_person_count;
     bool m_event_person_show_count;
 
 	//人卡超时及超员数量(阀值)
-    int m_limit_vehicle_second;
+    int m_limit_vehicle_min;
     int m_limit_vehicle_count;
     //是否人卡超员已有告警
     bool m_event_vehicle_count;

card.cpp

@@ -24,7 +24,7 @@ void card_list::init_staffer(const std::string & lszId64)
 
 	std::unordered_map<uint64_t,std::shared_ptr<card_location_base>> 
 		map=std::move(db_card::load_person(lszId64,strategy));
-
+	
 	if(map.empty())
 	{
 		log_error("增加或修改失败，数据库中找不到: card_id=%", lszId64.c_str());

worker.cpp

@@ -102,6 +102,8 @@ struct worker_thread: zloop<task*> ,visitor<std::shared_ptr<card_location_base>>
 	{
 		m_local_card_list.clear();
 		card_list::instance()->accept(*this);
+
+		log_info("update local cards,count=%d",m_local_card_list.size());
 	}
 
 	void do_task(task&t)