Merge branch 'master' of http://local.beijingyongan.com:3000/linux-dev/ya-serv

Makefile.am

@@ -5,12 +5,13 @@ SRC_MONKEYCAR= monkey_car/monkeycar_area.cpp monkey_car/monkeycar_bus.cpp monkey
 
 SRC_MODULE_SERVICE= module_service/area_business_car_attendance.cpp module_service/area_business_card_enter_or_leave.cpp \
 					module_service/area_business_count_checker.cpp module_service/area_business_forbid.cpp \
-					module_service/area_business_person_dwell_checker.cpp module_service/area_business_post_area.cpp \
+					module_service/area_business_geofault.cpp module_service/area_business_motionless_persion.cpp \
+					module_service/area_business_person_attendance.cpp module_service/area_business_person_dwell_checker.cpp \
+					module_service/area_business_post_area.cpp module_service/area_business_speed_checker.cpp \
 					module_service/module_meta_date_changed.cpp module_service/module_web.cpp \
-					module_service/area_business_speed_checker.cpp module_service/area_business_speed_checker.h module_service/area_business_geofault.cpp\
-					module_service/area_business_person_attendance.cpp\
 					module_service/module_call.cpp module_service/module_call_help.cpp module_service/module_mgr.cpp module_service/module_other_alarm.cpp
 
+
 SRC_MAIN= ant.cpp area.cpp base64.cpp bindmorecard.cpp mine_business.cpp card_area.cpp card_base.cpp card_car.cpp \
     	  card.cpp card_message_handle.cpp cardMgr.cpp card_path.cpp card_person.cpp crc.cpp geo_hash.cpp \
 		  landmark.cpp line_fit.cpp loc_point.cpp loc_tool.cpp message.cpp message_file.cpp mine.cpp \

area_business.cpp

@@ -10,6 +10,7 @@
 #include "area_business_person_attendance.h"
 #include "area_business_post_area.h"
 #include "area_business_speed_checker.h"
+
 struct area_business_factory
 {
 	void regist(int type,area_business* ab)

area_business.h

@@ -13,13 +13,13 @@ struct area_hover;
 struct card_location_base;
 struct area_business
 {
-	virtual int area_business_type();
+	virtual int area_business_type()=0;
 
 	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){}
 	virtual void on_hover(const std::shared_ptr<area_hover>&a,const std::shared_ptr<card_location_base>&c,std::shared_ptr<business_data> ptr){}
 	virtual void on_leave(const std::shared_ptr<area_hover>&a,const std::shared_ptr<card_location_base>&c,std::shared_ptr<business_data> ptr){}
 
-	virtual ~area_business(){}
+	virtual ~area_business(){};
 
 	static std::vector<area_business*> get_instance_list(int business_type);
 };

module_service/area_business_car_attendance.cpp

@@ -91,12 +91,11 @@ void area_business_car_attendance::on_leave(const std::shared_ptr<area_hover>&a,
     //        db_tool::save_attendance(card_ptr, ptr_temp->m_is_attendance, ptr_temp->m_attendance_start_time);
     //    }
 }
+#if 0
 
 //void area_business_car_attendance::init_attendance_area_from_db()
 //{
-//    const char *sql = "select a.area_id, a.att_rule_id,  vt.vehicle_type_id \
-//            from dat_att_rule_area a, dat_att_rule_vehicle_type  vt, dat_att_rule r\
-//            where a.att_rule_id=vt.att_rule_id and a.att_rule_id=r.att_rule_id;";
+//    const char *sql = "select a.area_id, a.att_rule_id,  vt.vehicle_type_id \ from dat_att_rule_area a, dat_att_rule_vehicle_type  vt, dat_att_rule r\ where a.att_rule_id=vt.att_rule_id and a.att_rule_id=r.att_rule_id;";
 //    std::string Error;
 //    YADB::CDBResultSet DBRes;
 //    sDBConnPool.Query(sql,DBRes,Error);
@@ -126,6 +125,8 @@ void area_business_car_attendance::on_leave(const std::shared_ptr<area_hover>&a,
 //    }
 //}
 
+#endif
+
 ///area_hover_ptr==nullptr 表示接收到 web的删除卡命令
 void area_business_car_attendance::save_attendance(const std::shared_ptr<card_location_base>& card_ptr,
                                                   const std::shared_ptr<area_hover> area_hover_ptr)

module_service/area_business_geofault.cpp

@@ -23,6 +23,9 @@ struct geofault_data:business_data
     int m_far_geofault_count;
 };
 
+std::unordered_map<int, std::vector<point>> area_business_geofault::_area_geofault_map;
+int area_business_geofault::_geofault_count_limit;
+
 void area_business_geofault::on_enter(const std::shared_ptr<area_hover>&area_hover_ptr,
                                                        const std::shared_ptr<card_location_base>&card_ptr,std::shared_ptr<business_data>& ptr)
 {

module_service/area_business_motionless_persion.cpp

@@ -24,6 +24,8 @@ struct motionless_data:business_data
 //    time_t m_acc_start_time;
 };
 
+int area_business_motionless_persion::_acc_0count_limit;
+
 void area_business_motionless_persion::on_enter(const std::shared_ptr<area_hover>&a,
                                  const std::shared_ptr<card_location_base>&card_ptr,std::shared_ptr<business_data>&ptr)
 {

module_service/area_business_speed_checker.cpp

@@ -8,6 +8,8 @@
 #include"area.h"
 #include "card.h"
 
+std::unordered_map<int,double> area_business_speed_checker::_vehicle_category_map;
+
 struct over_speed_data:business_data
 {
     over_speed_data()
@@ -170,5 +172,7 @@ void area_business_speed_checker::init_vehicle_category_from_db()
         std_debug("dat_vehicle_category:category_id:%d--over_speed:%.2f",p.first,p.second);
 }
 
+std::unordered_map<int,double> area_business_speed_checker::_vehicle_category_map;
+