Browse Source

修改 area_business 接口,添加 m_business_type 属性

zzj 6 years ago
parent
commit
8fecf823c6

+ 3 - 1
area_business.cpp

@@ -21,13 +21,15 @@ struct area_business_factory
 	void regist(int type,area_business* ab)
 	{
 		type-=1;
+
+		ab->m_business_type=type;
+
 		if(type>=(int)m_check_list.size())
 		{
 			m_check_list.resize(type+1);
 		}
 
 		assert(!m_check_list[type]);
-
 		m_check_list[type].reset(ab);
 	}
 

+ 5 - 1
area_business.h

@@ -13,7 +13,11 @@ struct area_hover;
 struct card_location_base;
 struct area_business
 {
-	virtual int area_business_type()=0;
+	int m_business_type=0;
+	int area_business_type()
+	{
+		return m_business_type;
+	}
 
 	virtual void on_load_his(const std::shared_ptr<area_hover>&a,const std::shared_ptr<card_location_base>&c,std::shared_ptr<business_data>&ptr){}
 	virtual void on_enter(const std::shared_ptr<area_hover>&a,const std::shared_ptr<card_location_base>&c,std::shared_ptr<business_data>&ptr){}

+ 0 - 5
module_service/area_business_car_attendance.h

@@ -11,11 +11,6 @@ class area_business_car_attendance:public area_business
 public:
     area_business_car_attendance();
 
-    virtual int area_business_type()
-    {
-        return 6;
-    }
-
     void on_load_his(const std::shared_ptr<area_hover>&a,const std::shared_ptr<card_location_base>&c,std::shared_ptr<business_data>&ptr);
 
     //记录进入时间等信息,结束考勤,根据离开的时间和距离,判断是否记录一条新的考勤记录

+ 0 - 5
module_service/area_business_card_enter_or_leave.h

@@ -5,11 +5,6 @@
 
 struct area_business_card_enter_or_leave:area_business
 {
-	int area_business_type()
-	{
-		return 9;
-	}
-
     void on_load_his(const std::shared_ptr<area_hover>&a,const std::shared_ptr<card_location_base>&c,std::shared_ptr<business_data>&ptr);
 
 	//进入区域则入库操作

+ 0 - 6
module_service/area_business_count_checker.h

@@ -10,12 +10,6 @@
 */
 struct area_business_count_checker:area_business
 {
-
-	int area_business_type()
-	{
-		return 3;
-	
-	}
 	//服务器重启加载数据
 	void on_load_his(const std::shared_ptr<area_hover>&a,const std::shared_ptr<card_location_base>&c,std::shared_ptr<business_data>&ptr);
 	//增加计数,并进行判断

+ 0 - 4
module_service/area_business_forbid.h

@@ -6,10 +6,6 @@
 class area_business_forbid : public area_business
 {
 public:
-    virtual int area_business_type()
-    {
-        return 7;
-    }
     void on_load_his(const std::shared_ptr<area_hover>&a,const std::shared_ptr<card_location_base>&c,std::shared_ptr<business_data>&ptr);
     //记录进入时间等信息,生成告警
     void on_enter(const std::shared_ptr<area_hover>&a,const std::shared_ptr<card_location_base>&c,std::shared_ptr<business_data>&ptr);

+ 0 - 5
module_service/area_business_geofault.h

@@ -21,11 +21,6 @@ struct area;
 class area_business_geofault:public area_business
 {
 public:
-    int area_business_type()
-    {
-        return 11;
-    }
-
     void on_load_his(const std::shared_ptr<area_hover>&a,const std::shared_ptr<card_location_base>&c,std::shared_ptr<business_data>&ptr);
 
     void on_enter(const std::shared_ptr<area_hover>&a,const std::shared_ptr<card_location_base>&c,std::shared_ptr<business_data>&ptr);

+ 0 - 4
module_service/area_business_motionless_persion.h

@@ -41,10 +41,6 @@ private:
     static int _acc_0count_limit;
 
 public:
-    int area_business_type()
-    {
-        return 10;
-    }
     static void init(config_file& config);
 
     void on_load_his(const std::shared_ptr<area_hover>&a,const std::shared_ptr<card_location_base>&c,std::shared_ptr<business_data>&ptr);

+ 0 - 6
module_service/area_business_person_attendance.h

@@ -9,12 +9,6 @@
 
 struct area_business_person_attendance:area_business
 {
-    int area_business_type()
-    {
-        return 5;
-    }
-
-
     //记录进入时间等信息,开始考勤
     void on_enter(const std::shared_ptr<area_hover>&a,const std::shared_ptr<card_location_base>&c,std::shared_ptr<business_data>&ptr);
 

+ 0 - 4
module_service/area_business_person_dwell_checker.h

@@ -10,10 +10,6 @@
 */
 struct area_business_person_dwell_checker:area_business
 {
-	int area_business_type()
-	{
-		return 2;
-	}
 	//服务器重启加载数据
 	virtual void on_load_his(const std::shared_ptr<area_hover>&a,const std::shared_ptr<card_location_base>&c,std::shared_ptr<business_data>&ptr);
 	//进入区域,记录进入时间

+ 0 - 4
module_service/area_business_post_area.h

@@ -8,10 +8,6 @@
 */
 struct area_business_post_area:area_business
 {
-	int area_business_type()
-	{
-		return 1;
-	}
 	virtual void on_load_his(const std::shared_ptr<area_hover>&a,const std::shared_ptr<card_location_base>&c,std::shared_ptr<business_data>&ptr);
 	//将推送区域信息加入人员数据
 	void on_enter(const std::shared_ptr<area_hover>&a,const std::shared_ptr<card_location_base>&c,std::shared_ptr<business_data>&ptr);

+ 0 - 5
module_service/area_business_speed_checker.h

@@ -7,11 +7,6 @@
 class area_business_speed_checker : public area_business
 {
 public:
-    virtual int area_business_type()
-    {
-        return 4;
-    }
-
     void on_load_his(const std::shared_ptr<area_hover>&a,const std::shared_ptr<card_location_base>&c,std::shared_ptr<business_data>&ptr);
     void on_enter(const std::shared_ptr<area_hover>&a,const std::shared_ptr<card_location_base>&c,std::shared_ptr<business_data>&ptr);
     void on_hover(const std::shared_ptr<area_hover>&a,const std::shared_ptr<card_location_base>&c,std::shared_ptr<business_data> ptr);

+ 0 - 5
module_service/area_business_work_rate.h

@@ -9,11 +9,6 @@
 class area_business_work_rate:public area_business
 {
 public:
-    int area_business_type()
-    {
-        return 12;
-    }
-
     void on_load_his(const std::shared_ptr<area_hover>&a,const std::shared_ptr<card_location_base>&c,std::shared_ptr<business_data>&ptr);
 
     void on_enter(const std::shared_ptr<area_hover>&a,const std::shared_ptr<card_location_base>&c,std::shared_ptr<business_data>&ptr);